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)

47 files changed, 173 insertions, 363 deletions

diff --git a/audio/pidgin-musictracker/Makefile b/audio/pidgin-musictracker/Makefile
index eee5b56a6d89..9ef08df14cce 100644
--- a/audio/pidgin-musictracker/Makefile
+++ b/audio/pidgin-musictracker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	musictracker
 PORTVERSION=	0.4.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	pidgin-
@@ -17,13 +17,12 @@ BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_BZIP2=	yes
-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-static
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-return-type
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	lib/pidgin/musictracker.a lib/pidgin/musictracker.la \
-		lib/pidgin/musictracker.so
+PLIST_FILES=	lib/pidgin/musictracker.so
 
 .include <bsd.port.mk>
diff --git a/comms/deforaos-phone/Makefile b/comms/deforaos-phone/Makefile
index 650486992923..d677d3c7f491 100644
--- a/comms/deforaos-phone/Makefile
+++ b/comms/deforaos-phone/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	phone
 PORTVERSION=	0.3.12
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.defora.org/os/download/download/4296/
 PKGNAMEPREFIX=	deforaos-
diff --git a/irc/minbif/Makefile b/irc/minbif/Makefile
index 7fb770e9c2d8..71024b4bac40 100644
--- a/irc/minbif/Makefile
+++ b/irc/minbif/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	minbif
 PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc net-im
 MASTER_SITES=	https://symlink.me/attachments/download/148/
 
diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index fb2927bfcfa2..a2040fbe48e6 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports-stable/net-im/gaim-consoleui-devel/Makefile,v 1.2 2006/10/29 18:55:28 marcus Exp $
 
 PORTNAME=	finch
-PORTREVISION=	2
+PORTREVISION=	3
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
diff --git a/net-im/finch/pkg-plist b/net-im/finch/pkg-plist
index 00506cbe9ca2..4d631be007ba 100644
--- a/net-im/finch/pkg-plist
+++ b/net-im/finch/pkg-plist
@@ -46,25 +46,17 @@ include/gnt/gntwidget.h
 include/gnt/gntwindow.h
 include/gnt/gntwm.h
 include/gnt/gntws.h
-lib/finch/gntclipboard.la
 lib/finch/gntclipboard.so
-lib/finch/gntgf.la
 lib/finch/gntgf.so
-lib/finch/gnthistory.la
 lib/finch/gnthistory.so
-lib/finch/gntlastlog.la
 lib/finch/gntlastlog.so
-lib/finch/gnttinyurl.la
 lib/finch/gnttinyurl.so
-lib/finch/grouping.la
 lib/finch/grouping.so
-lib/gnt/irssi.la
 lib/gnt/irssi.so
-lib/gnt/s.la
 lib/gnt/s.so
-lib/libgnt.la
 lib/libgnt.so
-lib/libgnt.so.8
+lib/libgnt.so.0
+lib/libgnt.so.0.8.10
 libdata/pkgconfig/finch.pc
 libdata/pkgconfig/gnt.pc
 man/man1/finch.1.gz
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index f49ad400b788..9c671c0e20ba 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.10.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -12,8 +12,7 @@ DISTNAME=	pidgin-${PORTVERSION}
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Pidgin multi-protocol messaging client
 
-USE_BZIP2=	yes
-USES=		gmake pkgconfig pathfix
+USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME?=	gnomeprefix intlhack glib20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
@@ -336,7 +335,7 @@ post-patch:
 			${WRKSRC}/libpurple/purple-url-handler
 .if defined(PIDGIN_SLAVE)
 	@${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[$$][(]top_builddir[)]/libpurple/libpurple.la|${LOCALBASE}/lib/libpurple.la|g'
+		's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|'
 .endif
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH}
 
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 2e168f697f58..1c1b3e27a613 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -75,88 +75,64 @@ include/libpurple/version.h
 include/libpurple/whiteboard.h
 include/libpurple/xmlnode.h
 lib/purple-2/autoaccept.a
-lib/purple-2/autoaccept.la
 lib/purple-2/autoaccept.so
 lib/purple-2/buddynote.a
-lib/purple-2/buddynote.la
 lib/purple-2/buddynote.so
 %%DBUS%%lib/purple-2/dbus-example.a
-%%DBUS%%lib/purple-2/dbus-example.la
 %%DBUS%%lib/purple-2/dbus-example.so
 lib/purple-2/idle.a
-lib/purple-2/idle.la
 lib/purple-2/idle.so
 lib/purple-2/joinpart.a
-lib/purple-2/joinpart.la
 lib/purple-2/joinpart.so
 %%OSCAR%%lib/purple-2/libaim.a
-%%OSCAR%%lib/purple-2/libaim.la
 %%OSCAR%%lib/purple-2/libaim.so
 %%OSCAR%%lib/purple-2/libicq.a
-%%OSCAR%%lib/purple-2/libicq.la
 %%OSCAR%%lib/purple-2/libicq.so
 %%BONJOUR%%lib/purple-2/libbonjour.a
-%%BONJOUR%%lib/purple-2/libbonjour.la
 %%BONJOUR%%lib/purple-2/libbonjour.so
 %%GG%%lib/purple-2/libgg.a
-%%GG%%lib/purple-2/libgg.la
 %%GG%%lib/purple-2/libgg.so
 %%IRC%%lib/purple-2/libirc.a
-%%IRC%%lib/purple-2/libirc.la
 %%IRC%%lib/purple-2/libirc.so
 %%JABBER%%lib/purple-2/libjabber.a
-%%JABBER%%lib/purple-2/libjabber.la
 %%JABBER%%lib/purple-2/libjabber.so
 %%JABBER%%lib/purple-2/libjabber.so.0
+%%JABBER%%lib/purple-2/libjabber.so.0.0.0
 %%MSN%%lib/purple-2/libmsn.a
-%%MSN%%lib/purple-2/libmsn.la
 %%MSN%%lib/purple-2/libmsn.so
 %%MYSPACE%%lib/purple-2/libmyspace.a
-%%MYSPACE%%lib/purple-2/libmyspace.la
 %%MYSPACE%%lib/purple-2/libmyspace.so
 %%NOVELL%%lib/purple-2/libnovell.a
-%%NOVELL%%lib/purple-2/libnovell.la
 %%NOVELL%%lib/purple-2/libnovell.so
 %%OSCAR%%lib/purple-2/liboscar.a
-%%OSCAR%%lib/purple-2/liboscar.la
 %%OSCAR%%lib/purple-2/liboscar.so
 %%OSCAR%%lib/purple-2/liboscar.so.0
+%%OSCAR%%lib/purple-2/liboscar.so.0.0.0
 %%SILC%%lib/purple-2/libsilcpurple.a
-%%SILC%%lib/purple-2/libsilcpurple.la
 %%SILC%%lib/purple-2/libsilcpurple.so
 %%SAMETIME%%lib/purple-2/libsametime.a
-%%SAMETIME%%lib/purple-2/libsametime.la
 %%SAMETIME%%lib/purple-2/libsametime.so
 %%SIMPLE%%lib/purple-2/libsimple.a
-%%SIMPLE%%lib/purple-2/libsimple.la
 %%SIMPLE%%lib/purple-2/libsimple.so
 %%JABBER%%lib/purple-2/libxmpp.a
-%%JABBER%%lib/purple-2/libxmpp.la
 %%JABBER%%lib/purple-2/libxmpp.so
 %%YAHOO%%lib/purple-2/libyahoo.a
-%%YAHOO%%lib/purple-2/libyahoo.la
 %%YAHOO%%lib/purple-2/libyahoo.so
 %%YAHOO%%lib/purple-2/libyahoojp.a
-%%YAHOO%%lib/purple-2/libyahoojp.la
 %%YAHOO%%lib/purple-2/libyahoojp.so
 %%YAHOO%%lib/purple-2/libymsg.a
-%%YAHOO%%lib/purple-2/libymsg.la
 %%YAHOO%%lib/purple-2/libymsg.so
 %%YAHOO%%lib/purple-2/libymsg.so.0
+%%YAHOO%%lib/purple-2/libymsg.so.0.0.0
 %%ZEPHYR%%lib/purple-2/libzephyr.a
-%%ZEPHYR%%lib/purple-2/libzephyr.la
 %%ZEPHYR%%lib/purple-2/libzephyr.so
 lib/purple-2/log_reader.a
-lib/purple-2/log_reader.la
 lib/purple-2/log_reader.so
 lib/purple-2/newline.a
-lib/purple-2/newline.la
 lib/purple-2/newline.so
 lib/purple-2/offlinemsg.a
-lib/purple-2/offlinemsg.la
 lib/purple-2/offlinemsg.so
 %%PERL:%%lib/purple-2/perl.a
-%%PERL:%%lib/purple-2/perl.la
 %%PERL:%%lib/purple-2/perl.so
 %%PERL:%%lib/purple-2/perl/Purple.pm
 %%PERL:%%lib/purple-2/perl/auto/Purple/.packlist
@@ -164,31 +140,25 @@ lib/purple-2/offlinemsg.so
 %%PERL:%%lib/purple-2/perl/auto/Purple/Purple.so
 %%PERL:%%lib/purple-2/perl/auto/Purple/autosplit.ix
 lib/purple-2/psychic.a
-lib/purple-2/psychic.la
 lib/purple-2/psychic.so
 %%GNUTLS%%lib/purple-2/ssl-gnutls.a
-%%GNUTLS%%lib/purple-2/ssl-gnutls.la
 %%GNUTLS%%lib/purple-2/ssl-gnutls.so
 %%NSS%%lib/purple-2/ssl-nss.a
-%%NSS%%lib/purple-2/ssl-nss.la
 %%NSS%%lib/purple-2/ssl-nss.so
 lib/purple-2/ssl.a
-lib/purple-2/ssl.la
 lib/purple-2/ssl.so
 lib/purple-2/statenotify.a
-lib/purple-2/statenotify.la
 lib/purple-2/statenotify.so
 %%TCL:%%lib/purple-2/tcl.a
-%%TCL:%%lib/purple-2/tcl.la
 %%TCL:%%lib/purple-2/tcl.so
 %%DBUS%%lib/libpurple-client.a
-%%DBUS%%lib/libpurple-client.la
 %%DBUS%%lib/libpurple-client.so
-%%DBUS%%lib/libpurple-client.so.10
+%%DBUS%%lib/libpurple-client.so.0
+%%DBUS%%lib/libpurple-client.so.0.10.9
 lib/libpurple.a
-lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.10
+lib/libpurple.so.0
+lib/libpurple.so.0.10.9
 libdata/pkgconfig/purple.pc
 %%CONSOLEUI%%man/man1/finch.1.gz
 %%GTKUI%%man/man1/pidgin.1.gz
diff --git a/net-im/mbpurple/Makefile b/net-im/mbpurple/Makefile
index 2c1d70e4d338..daa55af30845 100644
--- a/net-im/mbpurple/Makefile
+++ b/net-im/mbpurple/Makefile
@@ -2,33 +2,22 @@
 
 PORTNAME=	mbpurple
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+PROJECTHOST=	microblog-purple
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Integrate Twitter with Pidgin (AKA microblog-purple)
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
-		pkgconf>0:${PORTSDIR}/devel/pkgconf
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
 
-PROJECTHOST=	microblog-purple
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
+MAKE_ARGS=	PREFIX="${PREFIX}" LIBDIR="${PREFIX}/lib" \
+		PURPLE_DATAROOT_DIR="${PREFIX}/share"
 
-NO_STAGE=	yes
 post-patch:
-	@${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.Dist
-	@${SED} -e 's#make -C#gmake -C#' \
-		${WRKSRC}/Makefile.Dist > ${WRKSRC}/Makefile
-	@${CP} ${WRKSRC}/global.mak ${WRKSRC}/global.mak.Dist
-	@${SED} -e 's#^PREFIX :=.*#PREFIX = ${PREFIX}#' \
-		-e 's#^LIBDIR :=.*#LIBDIR = ${LOCALBASE}/lib#' \
-		-e 's#^PURPLE_PLUGIN_DIR :=.*#PURPLE_PLUGIN_DIR = ${PREFIX}/lib/purple-2#' \
-		-e 's#^PURPLE_CACERTS_DIR :=.*#PURPLE_CACERTS_DIR = ${PREFIX}/share/purple/ca-certs#' \
-		${WRKSRC}/global.mak.Dist > ${WRKSRC}/global.mak
-
-do-build:
-	cd ${WRKSRC} && ${GMAKE}
+	@${REINPLACE_CMD} 's/make -C/$$(MAKE) -C/' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/net-im/mbpurple/pkg-plist b/net-im/mbpurple/pkg-plist
index 44c79bc63d4a..4743582ef03d 100644
--- a/net-im/mbpurple/pkg-plist
+++ b/net-im/mbpurple/pkg-plist
@@ -13,11 +13,3 @@ share/pixmaps/pidgin/protocols/48/identica.png
 share/pixmaps/pidgin/protocols/48/statusnet.png
 share/pixmaps/pidgin/protocols/48/twitter.png
 share/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
-@dirrmtry lib/purple-2
-@dirrmtry share/pixmaps/pidgin/protocols/16
-@dirrmtry share/pixmaps/pidgin/protocols/22
-@dirrmtry share/pixmaps/pidgin/protocols/48
-@dirrmtry share/pixmaps/pidgin/protocols
-@dirrmtry share/pixmaps/pidgin
-@dirrmtry share/purple/ca-certs
-@dirrmtry share/purple
diff --git a/net-im/pidgin-audacious-remote/Makefile b/net-im/pidgin-audacious-remote/Makefile
index ff57239f81ee..d330611484d9 100644
--- a/net-im/pidgin-audacious-remote/Makefile
+++ b/net-im/pidgin-audacious-remote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin-audacious-remote
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://pidginaudacious.sourceforge.net/files/ \
 		ftp://ftp.lissyara.su/users/gx_ua/distfiles/
@@ -15,8 +15,9 @@ BUILD_DEPENDS=	audacious>=2.2:${PORTSDIR}/multimedia/audacious \
 		pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		tar:bzip2 pkgconfig
+USES=		libtool pkgconfig tar:bzip2
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-static
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-audacious-remote/pkg-plist b/net-im/pidgin-audacious-remote/pkg-plist
index bfed305eed7e..d74fd9a6bb23 100644
--- a/net-im/pidgin-audacious-remote/pkg-plist
+++ b/net-im/pidgin-audacious-remote/pkg-plist
@@ -1,5 +1,3 @@
-lib/pidgin/pidgin-audacious-remote.a
-lib/pidgin/pidgin-audacious-remote.la
 lib/pidgin/pidgin-audacious-remote.so
 share/pixmaps/pidgin/pidgin-audacious-remote/audacious.png
 share/pixmaps/pidgin/pidgin-audacious-remote/next.png
@@ -8,5 +6,3 @@ share/pixmaps/pidgin/pidgin-audacious-remote/play.png
 share/pixmaps/pidgin/pidgin-audacious-remote/previous.png
 share/pixmaps/pidgin/pidgin-audacious-remote/stop.png
 @dirrm share/pixmaps/pidgin/pidgin-audacious-remote
-@dirrmtry share/pixmaps/pidgin
-@dirrmtry lib/pidgin
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index 6bf5ae68ceba..9794a1959c9a 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -3,23 +3,23 @@
 
 PORTNAME=	pidgin-birthday-reminder
 PORTVERSION=	1.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	http://launchpadlibrarian.net/56075754/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The birthday reminder for Pidgin
+COMMENT=	Birthday reminder for Pidgin
 
-LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	intltool
+CONFIGURE_ARGS=	--disable-static
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-birthday-reminder/pkg-plist b/net-im/pidgin-birthday-reminder/pkg-plist
index 114467ebe479..c89f89f19b5c 100644
--- a/net-im/pidgin-birthday-reminder/pkg-plist
+++ b/net-im/pidgin-birthday-reminder/pkg-plist
@@ -1,6 +1,4 @@
 lib/pidgin/birthday_reminder.so
-lib/pidgin/birthday_reminder.la
-lib/pidgin/birthday_reminder.a
 share/locale/cs/LC_MESSAGES/pidgin-birthday-reminder.mo
 share/locale/de/LC_MESSAGES/pidgin-birthday-reminder.mo
 share/locale/es/LC_MESSAGES/pidgin-birthday-reminder.mo
@@ -25,8 +23,6 @@ share/pixmaps/pidgin/birthday_reminder/birthday7.png
 share/pixmaps/pidgin/birthday_reminder/birthday8.png
 share/pixmaps/pidgin/birthday_reminder/birthday9.png
 share/sounds/pidgin/birthday_reminder/birthday.wav
-@dirrmtry share/sounds/pidgin/birthday_reminder
+@dirrm share/sounds/pidgin/birthday_reminder
 @dirrmtry share/sounds/pidgin
-@dirrmtry share/pixmaps/pidgin/birthday_reminder
-@dirrmtry share/pixmaps/pidgin
-@dirrmtry lib/pidgin
+@dirrm share/pixmaps/pidgin/birthday_reminder
diff --git a/net-im/pidgin-bs/Makefile b/net-im/pidgin-bs/Makefile
index c27c7c9c1a3d..a5f1a6bca354 100644
--- a/net-im/pidgin-bs/Makefile
+++ b/net-im/pidgin-bs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin-bs
 PORTVERSION=	1.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/bot-sentry/${PORTVERSION}
 DISTNAME=	bot-sentry-${PORTVERSION}
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pkgconfig tar:bzip2
+USES=		gettext gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 USE_LDCONFIG=	${PREFIX}/lib/pidgin
 
diff --git a/net-im/pidgin-bs/pkg-plist b/net-im/pidgin-bs/pkg-plist
index 6164770bd19c..12ef41f1667c 100644
--- a/net-im/pidgin-bs/pkg-plist
+++ b/net-im/pidgin-bs/pkg-plist
@@ -1,5 +1,4 @@
 lib/purple-2/bot-sentry.so
-lib/purple-2/bot-sentry.la
 share/locale/ar/LC_MESSAGES/bot-sentry.mo
 share/locale/cs/LC_MESSAGES/bot-sentry.mo
 share/locale/de/LC_MESSAGES/bot-sentry.mo
@@ -7,4 +6,3 @@ share/locale/es/LC_MESSAGES/bot-sentry.mo
 share/locale/it/LC_MESSAGES/bot-sentry.mo
 share/locale/no/LC_MESSAGES/bot-sentry.mo
 share/locale/ru/LC_MESSAGES/bot-sentry.mo
-@dirrmtry lib/purple-2
diff --git a/net-im/pidgin-facebookchat/Makefile b/net-im/pidgin-facebookchat/Makefile
index ffb2eb4f6729..3f06ea99bf6c 100644
--- a/net-im/pidgin-facebookchat/Makefile
+++ b/net-im/pidgin-facebookchat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin-facebookchat
 PORTVERSION=	1.69
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PROJECTHOST}-source-${PORTVERSION}
diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile
index 0e51d4ac7d18..69c44e4a94bd 100644
--- a/net-im/pidgin-fetion/Makefile
+++ b/net-im/pidgin-fetion/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fetion
 PORTVERSION=	0.98.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.logvinov.ru/files/dist/fetion/ \
 		LOCAL/avl
@@ -12,15 +12,16 @@ PKGNAMEPREFIX=	pidgin-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fetion protocol plugin for libpurple
 
-LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		libtool pkgconfig tar:bzip2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+PLIST_FILES=	lib/purple-2/libfetion.so
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-fetion/pkg-plist b/net-im/pidgin-fetion/pkg-plist
deleted file mode 100644
index 87e0e6095806..000000000000
--- a/net-im/pidgin-fetion/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/purple-2/libfetion.la
-lib/purple-2/libfetion.so
-@dirrmtry lib/purple-2
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 649c702c27b8..1ad358054ce6 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin-guifications
 PORTVERSION=	2.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im
 MASTER_SITES=	https://www.mimar.rs/distfiles/
 
@@ -15,17 +15,15 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
-USE_BZIP2=	yes
-USES=		pathfix gettext gmake pkgconfig
-USE_GNOME=	gnomeprefix gtk20
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
 		-e 's#\([@(]\)PIDGIN_LIBDIR\([@)]\)#\1libdir\2#' \
 		-e 's#\([@(]\)PIDGIN_DATADIR\([@)]\)#\1datadir\2#'
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-guifications/pkg-plist b/net-im/pidgin-guifications/pkg-plist
index dbd4d063962c..ae0e8abbdf65 100644
--- a/net-im/pidgin-guifications/pkg-plist
+++ b/net-im/pidgin-guifications/pkg-plist
@@ -1,4 +1,3 @@
-lib/pidgin/guifications.la
 lib/pidgin/guifications.so
 share/pixmaps/pidgin/guifications/conf/item_icon_size_big.png
 share/pixmaps/pidgin/guifications/conf/item_icon_size_huge.png
diff --git a/net-im/pidgin-hotkeys/Makefile b/net-im/pidgin-hotkeys/Makefile
index d304c679dd0c..16c002af3fdc 100644
--- a/net-im/pidgin-hotkeys/Makefile
+++ b/net-im/pidgin-hotkeys/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	pidgin-hotkeys
 PORTVERSION=	0.2.4
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
-COMMENT=	A pidgin plugin that allows user to assign global hotkeys
+COMMENT=	Pidgin plugin that allows user to assign global hotkeys
 
 LICENSE=	GPLv2
 
@@ -15,12 +15,11 @@ LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
-USES=		pkgconfig
+USES=		libtool pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	lib/pidgin/hotkeys.so \
-		lib/pidgin/hotkeys.la
+PLIST_FILES=	lib/pidgin/hotkeys.so
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,X11/keysym.h,X11/X.h,' ${WRKSRC}/src/hotkeys.c
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 184fa16fcbeb..55b211725683 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	latex
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-im
 MASTER_SITES=	SF/pidgin-${PORTNAME}/pidgin-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
@@ -18,16 +18,15 @@ RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
 
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 
-CFLAGS+=	"-fPIC"
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:bzip2
 USE_TEX=	latex
 USE_GNOME=	gtk20
-USE_BZIP2=	yes
+MAKE_ARGS=	CC=${CC}
 
 PLIST_FILES=	lib/pidgin/LaTeX.so
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/LaTeX.so ${PREFIX}/lib/pidgin
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/pidgin
+	${INSTALL_LIB} ${WRKSRC}/LaTeX.so ${STAGEDIR}${PREFIX}/lib/pidgin
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 8499ea79f09f..4c4547d7b610 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libnotify
 PORTVERSION=	0.14
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net-im
 MASTER_SITES=	SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
@@ -14,35 +14,21 @@ COMMENT=	This plugin adds a libnotify interface to Pidgin
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
     		${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify
-LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
-		purple.10:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
+		libpurple.so:${PORTSDIR}/net-im/libpurple
 
 GNU_CONFIGURE=	yes
+USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USES=		pkgconfig
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 CONFIGURE_ARGS=	--disable-static
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-libnotify/pkg-plist b/net-im/pidgin-libnotify/pkg-plist
index 850a80593675..0f009171f441 100644
--- a/net-im/pidgin-libnotify/pkg-plist
+++ b/net-im/pidgin-libnotify/pkg-plist
@@ -1,3 +1,4 @@
+lib/purple-2/pidgin-libnotify.so
 %%NLS%%share/locale/bg/LC_MESSAGES/pidgin-libnotify.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pidgin-libnotify.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pidgin-libnotify.mo
@@ -14,5 +15,3 @@
 %%NLS%%share/locale/sl/LC_MESSAGES/pidgin-libnotify.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pidgin-libnotify.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pidgin-libnotify.mo
-lib/purple-2/pidgin-libnotify.so
-lib/purple-2/pidgin-libnotify.la
diff --git a/net-im/pidgin-manualsize/Makefile b/net-im/pidgin-manualsize/Makefile
index 53d44eef5f69..69ba9f88ec7e 100644
--- a/net-im/pidgin-manualsize/Makefile
+++ b/net-im/pidgin-manualsize/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	manualsize
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://issv.org.ru/oss/ \
 		http://wickedmachine.net/~jsa/FreeBSD/distfiles/
@@ -20,12 +20,14 @@ MAKEFILE=	makefile
 
 PLIST_FILES=	lib/pidgin/manualsize.so
 
-USES=		pkgconfig
-USE_BZIP2=	yes
+USES=		pkgconfig tar:bzip2
 ALL_TARGET=	manualsize.so
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's|-g root -m 755|-g wheel -m 755|g' ${WRKSRC}/makefile
+	@${REINPLACE_CMD} 's/gcc/$$(CC)/' ${WRKSRC}/makefile
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/pidgin
+	${INSTALL_LIB} ${WRKSRC}/manualsize.so ${STAGEDIR}${PREFIX}/lib/pidgin
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-osd/Makefile b/net-im/pidgin-osd/Makefile
index 2b136dac148d..d3b0ddad6caa 100644
--- a/net-im/pidgin-osd/Makefile
+++ b/net-im/pidgin-osd/Makefile
@@ -3,28 +3,22 @@
 
 PORTNAME=	pidgin-osd
 PORTVERSION=	0.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	https://babelize.org/download/pidgin-osd/
 
 MAINTAINER=	anikinsl@gmail.com
-COMMENT=	A pidgin plugin for displaying new messages on screen
+COMMENT=	Pidgin plugin for displaying new messages on screen
 
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
 		xosd>=2.2.12:${PORTSDIR}/misc/xosd
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
 		xosd>=2.2.12:${PORTSDIR}/misc/xosd
 
-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	glib20
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	lib/pidgin/pidgin-osd.so \
-		lib/pidgin/pidgin-osd.la
-NO_STAGE=	yes
-pre-configure:
-	# Module really needs xosd version 2.2.12 or greater.
-	${REINPLACE_CMD} -e 's,2\.2\.14,2.2.12,g' ${WRKSRC}/configure
+PLIST_FILES=	lib/pidgin/pidgin-osd.so
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index 718ef472b867..555f4b3fe0fc 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgimpd
 PORTVERSION=	1.1.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-im audio
 MASTER_SITES=	http://ayeon.org/projects/pidgimpd/
 PKGNAMEPREFIX=	pidgin-
@@ -11,18 +11,15 @@ PKGNAMEPREFIX=	pidgin-
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	PidgiMPD is a Pidgin plugin for monitoring/controlling MPD
 
-LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple \
-		mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple \
+		libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
-USE_BZIP2=	yes
+USES=		libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20
-USES=		pkgconfig iconv
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	lib/pidgin/pidgimpd.so \
-		lib/pidgin/pidgimpd.la
+PLIST_FILES=	lib/pidgin/pidgimpd.so
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-privacy-please/Makefile b/net-im/pidgin-privacy-please/Makefile
index 970ecc6b42bb..57cc6e6943fa 100644
--- a/net-im/pidgin-privacy-please/Makefile
+++ b/net-im/pidgin-privacy-please/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin-privacy-please
 PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	GOOGLE_CODE
 
@@ -17,8 +17,10 @@ BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	gtk20
-USE_LDCONFIG=	${PREFIX}/lib/pidgin
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-privacy-please/files/patch-po-Makefile.in.in b/net-im/pidgin-privacy-please/files/patch-po-Makefile.in.in
deleted file mode 100644
index fd6bc5f88e70..000000000000
--- a/net-im/pidgin-privacy-please/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	2011-08-13 04:58:38.000000000 +0200
-+++ po/Makefile.in.in	2012-05-02 20:59:29.000000000 +0200
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(datarootdir)/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
diff --git a/net-im/pidgin-privacy-please/pkg-plist b/net-im/pidgin-privacy-please/pkg-plist
index 72c81c7a541a..59de84177ac7 100644
--- a/net-im/pidgin-privacy-please/pkg-plist
+++ b/net-im/pidgin-privacy-please/pkg-plist
@@ -1,5 +1,3 @@
-libdata/ldconfig/pidgin-privacy-please
-lib/pidgin/libpidgin_pp.la
 lib/pidgin/libpidgin_pp.so
 share/locale/de/LC_MESSAGES/pidgin-privacy-please.mo
 share/locale/pl/LC_MESSAGES/pidgin-privacy-please.mo
diff --git a/net-im/pidgin-rhythmbox/Makefile b/net-im/pidgin-rhythmbox/Makefile
index bf5a28eb1fb0..772f5f29bcac 100644
--- a/net-im/pidgin-rhythmbox/Makefile
+++ b/net-im/pidgin-rhythmbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin-rhythmbox
 PORTVERSION=	2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-im audio
 MASTER_SITES=	http://jon.oberheide.org/pidgin-rhythmbox/downloads/
 
@@ -11,18 +11,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin to update your status with info from Rhythmbox
 
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
 		rhythmbox:${PORTSDIR}/audio/rhythmbox
 
-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	lib/pidgin/pidgin-rhythmbox.la \
-		lib/pidgin/pidgin-rhythmbox.so
+PLIST_FILES=	lib/pidgin/pidgin-rhythmbox.so
 
-NO_STAGE=	yes
 post-patch:
 		@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
 			-e 's#\([@(]\)PIDGIN_INSTALL\([@)]\)#\1libdir\2/pidgin#' \
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
diff --git a/net-im/pidgin-skype/Makefile b/net-im/pidgin-skype/Makefile
index 1c94b39db2d8..b9f905a452c9 100644
--- a/net-im/pidgin-skype/Makefile
+++ b/net-im/pidgin-skype/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pidgin-skype
 PORTVERSION=	0.0.0.664
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mandree
 DISTFILES=	pidgin-skype-svn-r${PORTVERSION:E}.tar.xz
@@ -17,9 +18,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin \
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin \
     ${LOCALBASE}/bin/skype:${PORTSDIR}/net-im/skype
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:xz
 USE_GNOME=	glib20
-USE_XZ=		yes
 
 # this is a local target to build a tarball
 build-tarball: ${DISTFILES}
@@ -66,7 +66,7 @@ do-build:
 	cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} ${mycflags} \
 			-o libskype.so libskype.c ${mylibs}
 .if ${PORT_OPTIONS:MNLS}
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} -C ${BUILD_WRKSRC} locales
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} -C ${BUILD_WRKSRC} locales
 .endif
 
 do-install:
diff --git a/net-im/pidgin-skype/pkg-plist b/net-im/pidgin-skype/pkg-plist
index c259717c72d7..c0723196c3f2 100644
--- a/net-im/pidgin-skype/pkg-plist
+++ b/net-im/pidgin-skype/pkg-plist
@@ -13,18 +13,11 @@ lib/purple-2/libskype.so
 %%NLS%%share/locale/pt/LC_MESSAGES/skype4pidgin.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/skype4pidgin.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/skype4pidgin.mo
-share/pixmaps/pidgin/protocols/16/skypeout.png
-share/pixmaps/pidgin/protocols/22/skypeout.png
-share/pixmaps/pidgin/protocols/48/skypeout.png
+share/pixmaps/pidgin/emotes/skype/theme
 share/pixmaps/pidgin/protocols/16/skype.png
+share/pixmaps/pidgin/protocols/16/skypeout.png
 share/pixmaps/pidgin/protocols/22/skype.png
+share/pixmaps/pidgin/protocols/22/skypeout.png
 share/pixmaps/pidgin/protocols/48/skype.png
-share/pixmaps/pidgin/emotes/skype/theme
+share/pixmaps/pidgin/protocols/48/skypeout.png
 @dirrm share/pixmaps/pidgin/emotes/skype
-@dirrmtry share/pixmaps/pidgin/protocols/48
-@dirrmtry share/pixmaps/pidgin/protocols/22
-@dirrmtry share/pixmaps/pidgin/protocols/16
-@dirrmtry share/pixmaps/pidgin/protocols
-@dirrmtry share/pixmaps/pidgin/emotes
-@dirrmtry share/pixmaps/pidgin
-@dirrmtry lib/purple-2
diff --git a/net-im/pidgin-twitter/Makefile b/net-im/pidgin-twitter/Makefile
index 7b465398eefb..58ecaf65e2b6 100644
--- a/net-im/pidgin-twitter/Makefile
+++ b/net-im/pidgin-twitter/Makefile
@@ -3,27 +3,31 @@
 
 PORTNAME=	pidgin-twitter
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.honeyplanet.jp/
 
 MAINTAINER=	jun-g@daemonfreaks.com
-COMMENT=	A pidgin plugin to help twitting via pidgin
+COMMENT=	Pidgin plugin to help twitting via pidgin
 
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 USES=		gmake pkgconfig
-USE_GNOME=	glib20
+USE_GNOME=	glib20 libxml2
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/pidgin/pidgin-twitter.so \
 		${DATADIR_REL}/prefs.ui
 PLIST_DIRS=	${DATADIR_REL}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/Makefile.in
 
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/pidgin
+	${INSTALL_LIB} ${WRKSRC}/pidgin-twitter.so ${STAGEDIR}${PREFIX}/lib/pidgin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/prefs.ui ${STAGEDIR}${DATADIR}
+
 .include <bsd.port.mk>
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 9a8d26b0e083..0c92eb34f478 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/net-im/pidgin/Makefile,v 1.17 2007/09/17 19:53:06 marcus Exp $
 
 PORTNAME=	pidgin
-PORTREVISION=	0
+PORTREVISION=	1
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
@@ -23,7 +23,6 @@ WITH_GTKUI=	yes
 
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix intlhack gtk20
-USES+=		pathfix
 USE_XORG=	xscrnsaver sm
 WANT_GNOME=	yes
 CONFIGURE_ARGS=	--disable-consoleui \
@@ -32,7 +31,7 @@ CONFIGURE_ARGS=	--disable-consoleui \
 		--with-dynamic_prpls=${PRPL_MODULES:S/,$//}
 
 post-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 	    	Makefile ${MAKE_ARGS} pidgin.desktop
 
 post-install:
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 358a6fa545e5..f1982be20f57 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -49,49 +49,27 @@ include/pidgin/minidialog.h
 include/pidgin/pidgin.h
 include/pidgin/pidginstock.h
 include/pidgin/pidgintooltip.h
-%%CAP%%lib/pidgin/cap.la
 %%CAP%%lib/pidgin/cap.so
-lib/pidgin/convcolors.la
 lib/pidgin/convcolors.so
-lib/pidgin/extplacement.la
 lib/pidgin/extplacement.so
-lib/pidgin/gestures.la
 lib/pidgin/gestures.so
-%%EVO%%lib/pidgin/gevolution.la
 %%EVO%%lib/pidgin/gevolution.so
-lib/pidgin/gtkbuddynote.la
 lib/pidgin/gtkbuddynote.so
-lib/pidgin/history.la
 lib/pidgin/history.so
-lib/pidgin/iconaway.la
 lib/pidgin/iconaway.so
-lib/pidgin/markerline.la
 lib/pidgin/markerline.so
-%%DBUS%%lib/pidgin/musicmessaging.la
 %%DBUS%%lib/pidgin/musicmessaging.so
-lib/pidgin/notify.la
 lib/pidgin/notify.so
-lib/pidgin/pidginrc.la
 lib/pidgin/pidginrc.so
-lib/pidgin/relnot.la
 lib/pidgin/relnot.so
-lib/pidgin/sendbutton.la
 lib/pidgin/sendbutton.so
-lib/pidgin/spellchk.la
 lib/pidgin/spellchk.so
-lib/pidgin/themeedit.la
 lib/pidgin/themeedit.so
-lib/pidgin/ticker.la
 lib/pidgin/ticker.so
-lib/pidgin/timestamp.la
 lib/pidgin/timestamp.so
-lib/pidgin/timestamp_format.la
 lib/pidgin/timestamp_format.so
-%%VV%%lib/pidgin/vvconfig.la
 %%VV%%lib/pidgin/vvconfig.so
-lib/pidgin/xmppconsole.la
 lib/pidgin/xmppconsole.so
-lib/pidgin/xmppdisco.la
 lib/pidgin/xmppdisco.so
 libdata/pkgconfig/pidgin.pc
 share/applications/pidgin.desktop
@@ -712,11 +690,11 @@ share/pixmaps/pidgin/tray/hicolor/index.theme
 @dirrm share/pixmaps/pidgin/emotes/none
 @dirrm share/pixmaps/pidgin/emotes/small
 @dirrm share/pixmaps/pidgin/emotes
-@dirrmtry share/pixmaps/pidgin/protocols/16
-@dirrmtry share/pixmaps/pidgin/protocols/22
-@dirrmtry share/pixmaps/pidgin/protocols/48
-@dirrmtry share/pixmaps/pidgin/protocols/scalable
-@dirrmtry share/pixmaps/pidgin/protocols
+@dirrm share/pixmaps/pidgin/protocols/16
+@dirrm share/pixmaps/pidgin/protocols/22
+@dirrm share/pixmaps/pidgin/protocols/48
+@dirrm share/pixmaps/pidgin/protocols/scalable
+@dirrm share/pixmaps/pidgin/protocols
 @dirrm share/pixmaps/pidgin/status/11/rtl
 @dirrm share/pixmaps/pidgin/status/11
 @dirrm share/pixmaps/pidgin/status/16/rtl
@@ -746,4 +724,4 @@ share/pixmaps/pidgin/tray/hicolor/index.theme
 @dirrm share/pixmaps/pidgin/tray/hicolor
 @dirrm share/pixmaps/pidgin/tray
 @dirrm share/pixmaps/pidgin
-@dirrmtry lib/pidgin
+@dirrm lib/pidgin
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index 2a67a6936bf4..1b979ff8c858 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	telepathy-haze
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-haze/
 
diff --git a/net/online-desktop/Makefile b/net/online-desktop/Makefile
index b56ab28169ea..fc06e5fa4701 100644
--- a/net/online-desktop/Makefile
+++ b/net/online-desktop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	online-desktop
 PORTVERSION=	0.3.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -16,29 +16,25 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
 		${LOCALBASE}/libdata/pkgconfig/nss.pc:${PORTSDIR}/security/nss \
 		${LOCALBASE}/libdata/pkgconfig/purple.pc:${PORTSDIR}/net-im/libpurple \
 		${LOCALBASE}/libdata/pkgconfig/pidgin.pc:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		nspr4.1:${PORTSDIR}/devel/nspr \
-		nss3.1:${PORTSDIR}/security/nss \
-		purple.10:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libnspr4.so:${PORTSDIR}/devel/nspr \
+		libnss3.so:${PORTSDIR}/security/nss \
+		libpurple.so:${PORTSDIR}/net-im/libpurple
 RUN_DEPENDS=	${LOCALBASE}/libexec/desktop-data-engine:${PORTSDIR}/net/desktop-data-model \
 		${LOCALBASE}/bin/bigboard:${PORTSDIR}/misc/bigboard \
 		${LOCALBASE}/bin/purple-remote:${PORTSDIR}/net-im/libpurple \
 		${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
 
-USE_BZIP2=	yes
+USES=		gettext gmake libtool tar:bzip2
 USE_GNOME=	glib20 gconf2 pygnomedesktop
-USE_GMAKE=	yes
-USES=		gettext
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 GCONF_SCHEMAS=	online-desktop.schemas
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC} -type f -exec fgrep -l '%%PREFIX%%' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' -i .bak
-	@${FIND} ${WRKSRC} -type f -exec fgrep -l '%%LOCALBASE%%' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' -i .bak
 
 .include <bsd.port.mk>
diff --git a/net/online-desktop/files/patch-Makefile.in b/net/online-desktop/files/patch-Makefile.in
deleted file mode 100644
index ae3d2787bbcc..000000000000
--- a/net/online-desktop/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2008-04-25 00:52:28.000000000 +0530
-+++ Makefile.in2	2008-05-28 11:32:38.000000000 +0530
-@@ -114,7 +114,7 @@
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- presessionSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS) $(presession_SCRIPTS)
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -I%%LOCALBASE%%/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff --git a/net/online-desktop/files/patch-po_Makefile.in.in b/net/online-desktop/files/patch-po_Makefile.in.in
deleted file mode 100644
index 8c912069fac3..000000000000
--- a/net/online-desktop/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in.orig
-+++ po/Makefile.in.in
-@@ -33,7 +33,7 @@
- datadir = @datadir@
- datarootdir = @datarootdir@
- libdir = @libdir@
--DATADIRNAME = @DATADIRNAME@
-+DATADIRNAME = share
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
- subdir = po
- install_sh = @install_sh@
diff --git a/net/online-desktop/pkg-plist b/net/online-desktop/pkg-plist
index d9009cca53e5..9db4dce2f5b1 100644
--- a/net/online-desktop/pkg-plist
+++ b/net/online-desktop/pkg-plist
@@ -6,7 +6,6 @@ bin/od-session
 bin/od-start-im
 bin/online-prefs-sync-daemon
 bin/web-login-driver
-lib/pidgin/libdbus-api-plugin.la
 lib/pidgin/libdbus-api-plugin.so
 %%PYTHON_SITELIBDIR%%/ddm/AbstractModel.py
 %%PYTHON_SITELIBDIR%%/ddm/AbstractModel.pyc
@@ -29,7 +28,6 @@ lib/pidgin/libdbus-api-plugin.so
 %%PYTHON_SITELIBDIR%%/ddm/__init__.py
 %%PYTHON_SITELIBDIR%%/ddm/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ddm/__init__.pyo
-%%PYTHON_SITELIBDIR%%/nssdecrypt.la
 %%PYTHON_SITELIBDIR%%/nssdecrypt.so
 %%PYTHON_SITELIBDIR%%/pyonlinedesktop/__init__.py
 %%PYTHON_SITELIBDIR%%/pyonlinedesktop/__init__.pyc
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 539d6eec1d9a..e2d0d89f16ca 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}-encrypt/Releases/${PORTVERSION}
 PKGNAMESUFFIX=	-encryption
@@ -13,37 +13,28 @@ MAINTAINER=	perlfu@gmail.com
 COMMENT=	Encryption Plugin for the Pidgin instant messenger client
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple \
-		nss3:${PORTSDIR}/security/nss
+RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
+LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple \
+		libnss3.so:${PORTSDIR}/security/nss
 
 USE_GNOME=	gtk20
 USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr	\
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-static \
+		--with-nspr-includes=${LOCALBASE}/include/nspr	\
 		--with-nspr-libs=${LOCALBASE}/lib	\
 		--with-nss-includes=${LOCALBASE}/include/nss/nss \
 		--with-nss-libs=${LOCALBASE}/lib/nss
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE}
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_SUB=	yes
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 post-extract:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|glib/.*\.h"|glib.h"|g' ${WRKSRC}/rsa_nss.c
 
 .include <bsd.port.mk>
diff --git a/security/pidgin-encryption/pkg-plist b/security/pidgin-encryption/pkg-plist
index e5ed4e6f0e6e..5b644ff03ceb 100644
--- a/security/pidgin-encryption/pkg-plist
+++ b/security/pidgin-encryption/pkg-plist
@@ -1,5 +1,3 @@
-lib/pidgin/encrypt.a
-lib/pidgin/encrypt.la
 lib/pidgin/encrypt.so
 %%NLS%%share/locale/cs/LC_MESSAGES/pidgin-encryption.mo
 %%NLS%%share/locale/da/LC_MESSAGES/pidgin-encryption.mo
@@ -32,4 +30,3 @@ share/pixmaps/pidgin-encryption/icon_out_capable.png
 share/pixmaps/pidgin-encryption/icon_out_lock.png
 share/pixmaps/pidgin-encryption/icon_out_unlock.png
 @dirrm share/pixmaps/pidgin-encryption
-@dirrmtry lib/pidgin
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index a9bb2492435f..51f425ca003b 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -2,9 +2,7 @@
 
 PORTNAME=	otr
 PORTVERSION=	4.0.0
-# Please do not bump PORTREVISION for this port unless you have
-# confirmed via testing that it is necessary
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-im net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 PKGNAMEPREFIX=	pidgin-
@@ -21,13 +19,19 @@ LIB_DEPENDS=	libotr.so.5:${PORTSDIR}/security/libotr \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libpurple.so:${PORTSDIR}/net-im/libpurple
 
-USE_GNOME=	intltool
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake libtool pkgconfig
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
 		--with-libotr-inc-prefix=${LOCALBASE}/include
 
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 1000036 && ${ARCH} == i386
+LDFLAGS+=	-lssp_nonshared
+.endif
+
 .include <bsd.port.mk>
diff --git a/security/pidgin-otr/pkg-plist b/security/pidgin-otr/pkg-plist
index 104795db02e8..32de4fa07e55 100644
--- a/security/pidgin-otr/pkg-plist
+++ b/security/pidgin-otr/pkg-plist
@@ -1,4 +1,3 @@
-lib/pidgin/pidgin-otr.la
 lib/pidgin/pidgin-otr.so
 share/locale/ar/LC_MESSAGES/pidgin-otr.mo
 share/locale/de/LC_MESSAGES/pidgin-otr.mo
@@ -17,4 +16,3 @@ share/locale/sk/LC_MESSAGES/pidgin-otr.mo
 share/locale/sv/LC_MESSAGES/pidgin-otr.mo
 share/locale/vi/LC_MESSAGES/pidgin-otr.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin-otr.mo
-@dirrmtry lib/pidgin