4 files changed, 6 insertions, 53 deletions

diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 215532e3390b..2da600808a05 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ekg2
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	http://pl.ekg2.org/
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libgadu.so:${PORTSDIR}/polish/libgadu \
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USES=		gmake iconv pathfix pkgconfig
+USES=		gmake iconv pathfix pkgconfig libtool
 
 CONFIGURE_ARGS+=	--enable-shared \
 			--disable-static \
diff --git a/polish/ekg2/pkg-plist b/polish/ekg2/pkg-plist
index d32584cf18cb..5509714d6e6c 100644
--- a/polish/ekg2/pkg-plist
+++ b/polish/ekg2/pkg-plist
@@ -1,62 +1,33 @@
 bin/ekg2
-lib/ekg2/plugins/autoresponder.la
 lib/ekg2/plugins/autoresponder.so
 lib/ekg2/plugins/feed.so
-lib/ekg2/plugins/feed.la
 lib/ekg2/plugins/gg.so
-lib/ekg2/plugins/gg.la
-%%GPG%%lib/ekg2/plugins/gpg.la
 %%GPG%%lib/ekg2/plugins/gpg.so
 %%GSM%%lib/ekg2/plugins/gsm.so
-%%GSM%%lib/ekg2/plugins/gsm.la
 %%GTK2%%lib/ekg2/plugins/gtk.so
-%%GTK2%%lib/ekg2/plugins/gtk.la
-lib/ekg2/plugins/httprc_xajax.la
 lib/ekg2/plugins/httprc_xajax.so
-lib/ekg2/plugins/icq.la
 lib/ekg2/plugins/icq.so
-lib/ekg2/plugins/ioctld.la
 lib/ekg2/plugins/ioctld.so
-lib/ekg2/plugins/irc.la
 lib/ekg2/plugins/irc.so
 lib/ekg2/plugins/jabber.so
-lib/ekg2/plugins/jabber.la
-lib/ekg2/plugins/jogger.la
 lib/ekg2/plugins/jogger.so
-lib/ekg2/plugins/logs.la
 lib/ekg2/plugins/logs.so
 %%SQLITE%%lib/ekg2/plugins/logsqlite.so
-%%SQLITE%%lib/ekg2/plugins/logsqlite.la
-lib/ekg2/plugins/mail.la
 lib/ekg2/plugins/mail.so
-lib/ekg2/plugins/ncurses.la
 lib/ekg2/plugins/ncurses.so
 %%PERL%%lib/ekg2/plugins/perl.so
-%%PERL%%lib/ekg2/plugins/perl.la
-lib/ekg2/plugins/pcm.la
 lib/ekg2/plugins/pcm.so
-lib/ekg2/plugins/polchat.la
 lib/ekg2/plugins/polchat.so
 %%PYTHON%%lib/ekg2/plugins/python.so
-%%PYTHON%%lib/ekg2/plugins/python.la
-lib/ekg2/plugins/rc.la
 lib/ekg2/plugins/rc.so
-lib/ekg2/plugins/readline.la
 lib/ekg2/plugins/readline.so
-lib/ekg2/plugins/remote.la
 lib/ekg2/plugins/remote.so
-lib/ekg2/plugins/rivchat.la
 lib/ekg2/plugins/rivchat.so
-lib/ekg2/plugins/rot13.la
 lib/ekg2/plugins/rot13.so
-lib/ekg2/plugins/sim.la
 lib/ekg2/plugins/sim.so
-lib/ekg2/plugins/sms.la
 lib/ekg2/plugins/sms.so
-lib/ekg2/plugins/xmsg.la
 lib/ekg2/plugins/xmsg.so
 %%XOSD%%lib/ekg2/plugins/xosd.so
-%%XOSD%%lib/ekg2/plugins/xosd.la
 %%PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.bs
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.so
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 200433ca6505..3c69687804c3 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnugadu2
 PORTVERSION=	2.3.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	polish net-im
 MASTER_SITES=	SF/ggadu/gg2/${PORTVERSION}
 DISTNAME=	gg2-${PORTVERSION}
@@ -16,8 +16,7 @@ LIB_DEPENDS=	gadu.3:${PORTSDIR}/polish/libgadu \
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_BZIP2=	yes
-USES=		gettext gmake perl5 pkgconfig
+USES=		gettext gmake perl5 pkgconfig tar:bzip2 libtool
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xaw ice xscrnsaver
@@ -57,7 +56,6 @@ XOSD_DESC=	Enable On-Screen-Display messages
 
 #.if ${${HAVE_GNOME:Mesound}!="" && empty(PORT_OPTIONS:MESOUND)
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk> # can't change this untile HAVE_GNOME has been fixed
 
 .if ${PORT_OPTIONS:MAUTODETECT}
@@ -152,7 +150,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/plugins/GUI/gtkimhtml.c
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 # vim: set ts=8 sw=8:
 .include <bsd.port.post.mk>
diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist
index 110b38a0692f..e5058192723d 100644
--- a/polish/gnugadu2/pkg-plist
+++ b/polish/gnugadu2/pkg-plist
@@ -1,41 +1,25 @@
 bin/gg2
 bin/gghist
 include/gg2_core.h
-lib/gg2/libGUI_plugin.la
 lib/gg2/libGUI_plugin.so
-lib/gg2/libaaway_plugin.la
 lib/gg2/libaaway_plugin.so
-%%DBUS:%%lib/gg2/libdbus_plugin.la
 %%DBUS:%%lib/gg2/libdbus_plugin.so
-%%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.la
 %%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.so
-%%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.la
 %%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.so
-lib/gg2/libgadu_gadu_plugin.la
 lib/gg2/libgadu_gadu_plugin.so
-lib/gg2/libhistory_external_plugin.la
 lib/gg2/libhistory_external_plugin.so
-lib/gg2/libignore_main_plugin.la
 lib/gg2/libignore_main_plugin.so
-%%JABBER:%%lib/gg2/libjabber_plugin.la
 %%JABBER:%%lib/gg2/libjabber_plugin.so
-lib/gg2/libsms_plugin.la
 lib/gg2/libsms_plugin.so
-%%ESOUND:%%lib/gg2/libsound_esd_plugin.la
 %%ESOUND:%%lib/gg2/libsound_esd_plugin.so
-lib/gg2/libsound_external_plugin.la
 lib/gg2/libsound_external_plugin.so
-lib/gg2/libsound_oss_plugin.la
 lib/gg2/libsound_oss_plugin.so
-%%TLEN:%%lib/gg2/libtlen_plugin.la
 %%TLEN:%%lib/gg2/libtlen_plugin.so
-lib/gg2/libupdate_plugin.la
 lib/gg2/libupdate_plugin.so
-%%XOSD:%%lib/gg2/libxosd_plugin.la
 %%XOSD:%%lib/gg2/libxosd_plugin.so
-lib/libgg2_core.la
 lib/libgg2_core.so
 lib/libgg2_core.so.2
+lib/libgg2_core.so.2.0.2
 libdata/pkgconfig/gg2_core.pc
 %%DBUS:%%share/dbus-1/services/org.freedesktop.im.GG.service
 share/applications/gg2.desktop