ports/118244: [MAINTAINER]: Update net/silc-client

[Wesley Shields]

>Number:         118244
>Category:       ports
>Synopsis:       [MAINTAINER]: Update net/silc-client
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 25 16:20:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Wesley Shields
>Release:        FreeBSD 6.2-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD syn.csh.rit.edu 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #8: Mon Oct 8 13:38:09 EDT 2007 root at syn.csh.rit.edu:/usr/obj/usr/src/sys/SMP amd64

>Description:
net/silc-client has a new version out.  The attached patch updates the
port.  It also removes PORTREVISION from net/silc-irssi-plugin (the
patch is relative to $PORTSDIR/net).

The patch also converts silc-client to use OPTIONS.

>How-To-Repeat:
N/A

>Fix:

Index: silc-client/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/silc-client/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- silc-client/Makefile	17 Sep 2007 15:21:25 -0000	1.49
+++ silc-client/Makefile	24 Nov 2007 03:16:52 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
@@ -36,11 +36,9 @@
 		--with-perl=no \
 		--without-libtoolfix
 
-.ifndef(WITH_PTHREADS)
-CONFIGURE_ARGS+=	--without-pthreads
-.else
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
-.endif
+OPTIONS=	PTHREADS "Enable pthreads support" off \
+		IPV6 "Enable IPv6 support" on \
+		OPTIMIZED_ASM "Use assembler optimizations (i386 only)" on
 
 .ifdef(IRSSI_PLUGIN)
 CONFIGURE_ARGS+=	--with-silc-plugin=${PREFIX}/lib/irssi \
@@ -53,17 +51,6 @@
 MAN1=		silc.1
 .endif
 
-pre-everything::
-.ifndef(WITHOUT_IPV6)
-	@${ECHO_MSG} '===> Define WITHOUT_IPV6 to disable IPv6 support'
-.endif
-.ifndef(WITHOUT_OPTIMIZED_ASM)
-	@${ECHO_MSG} '===> Define WITHOUT_OPTIMIZED_ASM to disable assembler optimizations'
-.endif
-.ifndef(WITH_PTHREADS)
-	@${ECHO_MSG} '===> Define WITH_PTHREADS to enable pthreads support'
-.endif
-
 post-patch:
 # install neither documentation nor silc server, we have ports for those
 	@${REINPLACE_CMD} -e 's/-D_THREAD_SAFE//' ${WRKSRC}/${CONFIGURE_SCRIPT}
@@ -89,12 +76,18 @@
 WITHOUT_OPTIMIZED_ASM=	yes
 .endif
 
-.ifndef(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.ifdef(WITHOUT_OPTIMIZED_ASM)
+.if defined(WITHOUT_OPTIMIZED_ASM)
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
+.if defined(WITH_PTHREADS)
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+.else
+CONFIGURE_ARGS+=	--without-pthreads
+.endif
+
 .include <bsd.port.post.mk>
Index: silc-client/distinfo
===================================================================
RCS file: /home/ncvs/ports/net/silc-client/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- silc-client/distinfo	17 Sep 2007 15:21:25 -0000	1.24
+++ silc-client/distinfo	24 Nov 2007 03:16:52 -0000
@@ -1,3 +1,3 @@
-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
+MD5 (silc-client-1.1.3.tar.bz2) = e34d0af3c795ba0167d465904b9ba120
+SHA256 (silc-client-1.1.3.tar.bz2) = efc9ae70250f8e06c88e5b0416a9c38dca9476dc8955ee917c7a9366e2390ea8
+SIZE (silc-client-1.1.3.tar.bz2) = 1626208
Index: silc-irssi-plugin/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/silc-irssi-plugin/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- silc-irssi-plugin/Makefile	11 Nov 2007 22:34:54 -0000	1.2
+++ silc-irssi-plugin/Makefile	24 Nov 2007 03:16:52 -0000
@@ -5,7 +5,6 @@
 # $FreeBSD: ports/net/silc-irssi-plugin/Makefile,v 1.2 2007/11/11 22:34:54 vanilla Exp $
 #
 
-PORTREVISION=	1
 CATEGORIES=	net irc
 
 COMMENT=	SILC plugin for IRSSI
>Release-Note:
>Audit-Trail:
>Unformatted: