Convert net-im/libpurple (and slave ports net-im/finch and net-im/pidgin)

to "USES=libtool tar:bzip2".  Bump PORTREVISION on all dependent ports
and modernise them as well (USES, LIB_DEPENDS, staging).

audio/pidgin-musictracker:
- Replace LIBS with LDFLAGS.
- Disable static plugin.

net/online-desktop: Remove obsolete patches.

net-im/mbpurple:
- Drop pkgconf dependency.
- Replace post-patch with MAKE_ARGS.
- Use standard do-build.

net-im/pidgin-audacious-remote: Disable static plugin.

net-im/pidgin-birthday-reminder: Disable static plugin.

net-im/pidgin-fetion: Replace pkg-plist with PLIST_FILES.

net-im/pidgin-guifications:
- Drop USE_GNOME=gnomeprefix.
- Replace LIBS with LDFLAGS.

net-im/pidgin-hotkeys:
- Drop CFLAGS=-fPIC.
- Fix build on systems without gcc.

net-im/pidgin-libnotify:
- Use option helpers.
- Drop references to PTHREAD_CFLAGS and PTHREAD_LIBS.

net-im/pidgin-manualsize: Fix build on systems without gcc.

net-im/pidgin-privacy-please:
- Replace a patch with CPPFLAGS and LDFLAGS.
- Don't use USE_LDCONFIG for a plugin.

net-im/pidgin-sipe:
- Don't use USE_LDCONFIG for a plugin.
- Drop PORTDOCS that don't contain useful documentation.
- Patch configure with s/LDLAGS/LDFLAGS/ so LDFLAGS can replace LIBS.
- Use option helpers and fix Kerberos option.
- Remove obsolete CONFIGURE_ENV.

security/pidgin-encryption:
- Drop references to PTHREAD_CFLAGS and PTHREAD_LIBS.
- Disable static plugin.
- Use option helpers.

security/pidgin-otr:
- Drop redundant comment about PORTREVISION.
- Add USE_GNOME=gtk20.
- Drop references to PTHREAD_CFLAGS and PTHREAD_LIBS.
- Port uses stack protector unconditionally so link with -lssp_nonshared
  when necessary like Mk/bsd.ssp.mk does.

Approved by:	portmgr (PORTREVISION bump on unstaged port)

2 files changed, 23 insertions, 38 deletions

diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index 01c1ff93fc54..ffab4b1c2728 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -3,62 +3,48 @@
 
 PORTNAME=	pidgin-sipe
 PORTVERSION=	1.18.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF/sipe/sipe/${DISTNAME}
 
 MAINTAINER=	john.c.prather@gmail.com
-COMMENT=	A plugin for Pidgin to provide LCS/OCS connectivity
+COMMENT=	Plugin for Pidgin to provide LCS/OCS connectivity
 
-LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss \
-		purple.10:${PORTSDIR}/net-im/libpurple
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
+		libpurple.so:${PORTSDIR}/net-im/libpurple
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20
-USE_LDCONFIG=	${PREFIX}/lib/pidgin
-PORTDOCS=	AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README TODO VERSION
+PORTDOCS=	AUTHORS ChangeLog HACKING NEWS README TODO
 
-CFLAGS+=	-I/${LOCALBASE}/include
-LIBS+=		-L/${LOCALBASE}/lib -lgssapi_krb5
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		OCS2005 KRB5 DOCS NLS
+OPTIONS_SUB=		yes
+
 OSC2005_DESC=		Message timeout for OCS2005
+OSC2005_CONFIGURE_ENABLE=	ocs2005-message-hack
 KRB5_DESC=		With Kerberos5
+KRB5_CONFIGURE_WITH=	krb5
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 CONFIGURE_ARGS+=	--enable-purple \
 			--disable-telepathy
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOSC2005}
-CONFIGURE_ARGS+=	--enable-ocs2005-message-hack
-.endif
+post-patch:
+	@${REINPLACE_CMD} 's/LDLAGS/LDFLAGS/' ${WRKSRC}/configure
 
-.if ${PORT_OPTIONS:MKRB5}
-CONFIGURE_ARGS+=	--without-krb5
-.endif
-
-CONFIGURE_ENV+=	LIBS="${LIBS}" \
-		COM_ERR_CFLAGS="-I/usr/include" \
-		COM_ERR_LIBS="-L/usr/lib -lcom_err"
-
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-sipe/pkg-plist b/net-im/pidgin-sipe/pkg-plist
index f694d8fc57db..3d3bc915180b 100644
--- a/net-im/pidgin-sipe/pkg-plist
+++ b/net-im/pidgin-sipe/pkg-plist
@@ -1,4 +1,3 @@
-lib/purple-2/libsipe.la
 lib/purple-2/libsipe.so
 %%NLS%%share/locale/ar/LC_MESSAGES/pidgin-sipe.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pidgin-sipe.mo
@@ -31,7 +30,7 @@ share/pixmaps/pidgin/protocols/24/sipe.png
 share/pixmaps/pidgin/protocols/32/sipe.png
 share/pixmaps/pidgin/protocols/48/sipe.png
 share/pixmaps/pidgin/protocols/scalable/sipe.svg
-@dirrm share/pixmaps/pidgin/protocols/32
-@dirrm share/pixmaps/pidgin/protocols/24
+@dirrmtry share/pixmaps/pidgin/protocols/32
+@dirrmtry share/pixmaps/pidgin/protocols/24
 @dirrm share/locale/fr_CA/LC_MESSAGES
 @dirrm share/locale/fr_CA