- Update to 1.1.2

PR:		115767
Submitted by:	Wesley Shields <wxs@atarininja.org> (maintainer)

3 files changed, 35 insertions, 8 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 996f5a19aef0..f5396d2ac298 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
@@ -21,10 +21,10 @@ MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		ftp://ftp.pl.silcnet.org/pub/silc/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/
 MASTER_SITE_SUBDIR=	client/sources
-PKGNAMESUFFIX=	-client
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+PKGNAMESUFFIX=	${IRSSI_PLUGIN}-client
+DISTNAME=	${PORTNAME}-client-${PORTVERSION}
 
-MAINTAINER=	wxs@atarininja.org
+MAINTAINER?=	wxs@atarininja.org
 COMMENT=	Secure Internet Live Conferencing (SILC) network client
 
 USE_BZIP2=	yes
@@ -35,7 +35,6 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--with-perl=no \
 		--without-libtoolfix
-MAN1=	silc.1
 
 .ifndef(WITH_PTHREADS)
 CONFIGURE_ARGS+=	--without-pthreads
@@ -43,6 +42,17 @@ CONFIGURE_ARGS+=	--without-pthreads
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
 .endif
 
+.ifdef(IRSSI_PLUGIN)
+CONFIGURE_ARGS+=	--with-silc-plugin=${PREFIX}/lib/irssi \
+			--without-silc-includes
+CFLAGS+=	-fPIC
+RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
+# We don't want to install the man page and configuration file for this case
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-apps__irssi__Makefile.in
+.else
+MAN1=		silc.1
+.endif
+
 pre-everything::
 .ifndef(WITHOUT_IPV6)
 	@${ECHO_MSG} '===> Define WITHOUT_IPV6 to disable IPv6 support'
@@ -67,9 +77,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/^MODULESDIR="$$silc_prefix/MODULESDIR="$$silc_prefix\/share\/silc/' ${WRKSRC}/configure
 
 post-install:
+.ifndef(IRSSI_PLUGIN)
 	@if [ ! -f ${PREFIX}/etc/silc.conf ]; then \
 		${CP} -p ${PREFIX}/etc/silc.conf.sample ${PREFIX}/etc/silc.conf ; \
 	fi
+.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index 505c42e020cf..10e8573b7b46 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1,3 +1,3 @@
-MD5 (silc-client-1.1.1.tar.bz2) = 68756a29c6b0a7e57bfb2ee114837832
-SHA256 (silc-client-1.1.1.tar.bz2) = f523003f1fca84ca191cb1deac832e6d4f2d8ade94aa1f747cb03fbfbb17d473
-SIZE (silc-client-1.1.1.tar.bz2) = 1620522
+MD5 (silc-client-1.1.2.tar.bz2) = 6e440bbfd9a746cf33c020c31ab95a30
+SHA256 (silc-client-1.1.2.tar.bz2) = 6c03bf28c87eef31c2058acfa132542cc088ae819f2233d520b042eb916d89f4
+SIZE (silc-client-1.1.2.tar.bz2) = 1622496
diff --git a/net/silc-client/files/extra-patch-apps__irssi__Makefile.in b/net/silc-client/files/extra-patch-apps__irssi__Makefile.in
new file mode 100644
index 000000000000..96b6fe7bfd32
--- /dev/null
+++ b/net/silc-client/files/extra-patch-apps__irssi__Makefile.in
@@ -0,0 +1,15 @@
+--- apps/irssi/Makefile.in.orig	2007-09-11 15:02:59.619586995 +0000
++++ apps/irssi/Makefile.in	2007-09-11 15:03:10.654592840 +0000
+@@ -829,10 +829,8 @@
+ 	  fi; \
+ 	fi
+ 
+-install-data-hook: 		\
+-	install-dirs-client	\
+-	doc-install-client	\
+-	$(ETCINSTALL)
++install-data-hook:
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: