svn commit: r482467 - in branches/2018Q4/irc/irssi: . files

[Antoine Brodin]

Author: antoine
Date: Sat Oct 20 05:41:38 2018
New Revision: 482467
URL: https://svnweb.freebsd.org/changeset/ports/482467

Log:
  MFH: r482051
  
  Fix configure with openssl 1.1.1
  
  PR:		231970

Added:
  branches/2018Q4/irc/irssi/files/patch-configure.ac
     - copied unchanged from r482051, head/irc/irssi/files/patch-configure.ac
Modified:
  branches/2018Q4/irc/irssi/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/irc/irssi/Makefile
==============================================================================
--- branches/2018Q4/irc/irssi/Makefile	Sat Oct 20 05:40:29 2018	(r482466)
+++ branches/2018Q4/irc/irssi/Makefile	Sat Oct 20 05:41:38 2018	(r482467)
@@ -12,7 +12,7 @@ COMMENT=	Modular IRC client with many features
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe gettext-runtime gmake libtool ncurses pkgconfig tar:xz
+USES=		autoreconf cpe gettext-runtime gmake gnome libtool ncurses pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_GNOME=	glib20
@@ -47,11 +47,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e 's|/etc|${PREFIX}&|' \
 		${WRKSRC}/docs/irssi.1
 
-post-configure:
-	@${MV} ${WRKSRC}/irssi.conf ${WRKSRC}/irssi.conf.sample
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
+	@${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
 
 post-install-PERL-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so

Copied: branches/2018Q4/irc/irssi/files/patch-configure.ac (from r482051, head/irc/irssi/files/patch-configure.ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q4/irc/irssi/files/patch-configure.ac	Sat Oct 20 05:41:38 2018	(r482467, copy of r482051, head/irc/irssi/files/patch-configure.ac)
@@ -0,0 +1,15 @@
+--- configure.ac.orig	2018-10-06 15:40:00 UTC
++++ configure.ac
+@@ -307,7 +307,11 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], 
+ 	AC_CHECK_LIB([ssl], [SSL_library_init], [
+ 		LIBS="$LIBS -lssl -lcrypto"
+ 	], [
++		AC_CHECK_LIB([ssl], [OPENSSL_init_ssl], [
++			LIBS="$LIBS -lssl -lcrypto"
++		], [
++			AC_MSG_ERROR([The OpenSSL library was not found])
++		])
+-		AC_MSG_ERROR([The OpenSSL library was not found])
+ 	])
+ ])
+