[Midnightbsd-cvs] mports [16550] trunk/irc/bitlbee: bitlbee 3.2.2

[laffer1 at midnightbsd.org]

Revision: 16550
          http://svnweb.midnightbsd.org/mports/?rev=16550
Author:   laffer1
Date:     2014-08-22 22:09:47 -0400 (Fri, 22 Aug 2014)
Log Message:
-----------
bitlbee 3.2.2

Modified Paths:
--------------
    trunk/irc/bitlbee/Makefile
    trunk/irc/bitlbee/distinfo
    trunk/irc/bitlbee/pkg-plist

Modified: trunk/irc/bitlbee/Makefile
===================================================================
--- trunk/irc/bitlbee/Makefile	2014-08-23 02:05:47 UTC (rev 16549)
+++ trunk/irc/bitlbee/Makefile	2014-08-23 02:09:47 UTC (rev 16550)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	bitlbee
-PORTVERSION=	3.2
+PORTVERSION=	3.2.2
 PORTREVISION=	0
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
@@ -14,14 +14,11 @@
 LICENSE=	gpl2
 
 SUB_FILES=	pkg-message
-#MAN5=		bitlbee.conf.5
-#MAN8=		bitlbee.8
 PORTDOCS=	AUTHORS CHANGES CREDITS FAQ README
 PORTEXAMPLES=	bitlbee.conf motd.txt
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	glib20
 USE_RC_SUBR=	bitlbee
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -34,7 +31,7 @@
 OPTIONS_MULTI=		PROTO
 OPTIONS_MULTI_PROTO=	JABBER LIBPURPLE MSN OSCAR TWITTER YAHOO
 
-OTR_DESC=		Off-the-Record Messaging support
+OTR_DESC=		Off-the-Record Messaging support (Requires GnuTLS)
 LIBPURPLE_DESC=		Use libpurple for protocol support
 MSN_DESC=		Microsoft Messenger support
 OSCAR_DESC=		OSCAR (ICQ, AIM) support
@@ -50,6 +47,10 @@
 
 .include <bsd.mport.options.mk>
 
+.if ${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MOTR}
+IGNORE=Off-the-Record Messaging support requires GnuTLS support
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--debug=1
 .else
@@ -66,13 +67,13 @@
 CONFIGURE_ARGS+=--ssl=openssl
 .elif ${PORT_OPTIONS:MGNUTLS}
 CONFIGURE_ARGS+=--ssl=gnutls
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 .endif
 
 .if ${PORT_OPTIONS:MOTR}
 CONFIGURE_ARGS+=--otr=1
-LIB_DEPENDS+=	otr.4:${PORTSDIR}/security/libotr3
+LIB_DEPENDS+=	libotr.so:${PORTSDIR}/security/libotr
 .else
 CONFIGURE_ARGS+=--otr=0
 .endif
@@ -109,7 +110,7 @@
 
 .if ${PORT_OPTIONS:MLIBPURPLE}
 CONFIGURE_ARGS+=--purple=1
-LIB_DEPENDS+=	purple:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS+=	libpurple.so:${PORTSDIR}/net-im/libpurple
 .else
 CONFIGURE_ARGS+=--purple=0
 .endif
@@ -116,7 +117,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e "s|^EFLAGS=|EFLAGS=${LDFLAGS}|" \
+		-e "s|^\(EFLAGS=.*\)|\1 ${LDFLAGS}|" \
 		${WRKSRC}/configure
 
 	@${REINPLACE_CMD} \
@@ -128,6 +129,7 @@
 		${WRKSRC}/doc/bitlbee.8
 
 post-install:
+	${STRIP_CMD} ${PREFIX}/sbin/bitlbee
 	${MKDIR} ${PREFIX}/etc/bitlbee
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
@@ -137,6 +139,5 @@
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${EXAMPLESDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: trunk/irc/bitlbee/distinfo
===================================================================
--- trunk/irc/bitlbee/distinfo	2014-08-23 02:05:47 UTC (rev 16549)
+++ trunk/irc/bitlbee/distinfo	2014-08-23 02:09:47 UTC (rev 16550)
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.2.tar.gz) = 1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030
-SIZE (bitlbee-3.2.tar.gz) = 666404
+SHA256 (bitlbee-3.2.2.tar.gz) = ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e
+SIZE (bitlbee-3.2.2.tar.gz) = 661757

Modified: trunk/irc/bitlbee/pkg-plist
===================================================================
--- trunk/irc/bitlbee/pkg-plist	2014-08-23 02:05:47 UTC (rev 16549)
+++ trunk/irc/bitlbee/pkg-plist	2014-08-23 02:09:47 UTC (rev 16550)
@@ -1,3 +1,5 @@
+man/man5/bitlbee.conf.5.gz
+man/man8/bitlbee.8.gz
 sbin/bitlbee
 %%DATADIR%%/help.txt
 @dirrm %%DATADIR%%