4 files changed, 223 insertions, 147 deletions

diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 361c374718a1..76dacb7e2814 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -5,48 +5,136 @@
 # $FreeBSD$
 
 PORTNAME=	ekg2
-PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTVERSION=	0.3.0
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	http://pl.ekg2.org/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	c0rn@o2.pl
 COMMENT=	Text-mode Gadu-Gadu, Jabber and IRC client
 
 LIB_DEPENDS=	gadu.3:${PORTSDIR}/polish/libgadu \
 		expat.6:${PORTSDIR}/textproc/expat2
 
+LICENSE=	GPLv2
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
-USE_GETTEXT=	yes
+USE_ICONV=	yes
+MAKE_JOBS_SAFE=	yes
+
+OPTIONS=	ASPELL		"Enable spell checking support"	on \
+		GPG		"Enable gpg plugin"		off \
+		GSM		"Enable gsm audio plugin"	off \
+		GTK2		"Enable gtk plugin"		off \
+		PERL		"Enable perl plugin"		off \
+		PYTHON		"Enable python plugin"		off \
+		SQLITE		"Enable sqlite plugin"		off \
+		XOSD		"Enable xosd plugin"		off
 
 CONFIGURE_ARGS+=	--enable-shared \
 			--disable-static \
 			--enable-dynamic \
 			--with-expat \
-			--without-aspell \
-			--without-gtk \
-			--without-libgsm \
-			--without-libxosd \
-			--without-perl \
-			--without-python \
-			--without-sqlite3 \
 			--without-sqlite \
 			--without-gpm-mouse \
-			--with-libgadu
+			--with-libgadu \
+			--without-libgnutls \
+			--without-gif \
+			--without-libjpeg
 
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
-MAKE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl"
 CFLAGS+=		-I${LOCALBASE}/include
 
-USE_LDCONFIG=		yes
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+=		aspell:${PORTSDIR}/textproc/aspell
+RUN_DEPENDS+=		${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell
+CONFIGURE_ARGS+=	--with-aspell
+.else
+CONFIGURE_ARGS+=	--without-aspell
+.endif
+
+.if defined(WITH_GPG)
+LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme \
+			gpg-error:${PORTSDIR}/security/libgpg-error
+RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
+CONFIGURE_ARGS+=	--with-gpg
+PLIST_SUB+=		GPG_PLUGIN=""
+.else
+CONFIGURE_ARGS+=	--without-gpg
+PLIST_SUB+=		GPG_PLUGIN="@comment "
+.endif
+
+.if defined(WITH_GSM)
+LIB_DEPENDS+=		gsm:${PORTSDIR}/audio/gsm
+CONFIGURE_ARGS+=	--with-libgsm
+PLIST_SUB+=		GSM_PLUGIN=""
+.else
+CONFIGURE_ARGS+=	--without-libgsm
+PLIST_SUB+=		GSM_PLUGIN="@comment "
+.endif
+
+.if defined(WITH_GTK2)
+USE_GNOME+=		gtk20
+CONFIGURE_ARGS+=	--with-gtk
+PLIST_SUB+=		GTK2_PLUGIN=""
+.else
+CONFIGURE_ARGS+=	--without-gtk
+PLIST_SUB+=		GTK2_PLUGIN="@comment "
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=		NLS=""
+.endif
+
+.if defined(WITH_PERL)
+USE_PERL5=		yes
+CONFIGURE_ARGS+=	--with-perl
+PLIST_SUB+=		PERL_PLUGIN=""
+.else
+CONFIGURE_ARGS+=	--without-perl
+PLIST_SUB+=		PERL_PLUGIN="@comment "
+.endif
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=		yes
+CONFIGURE_ARGS+=	--with-python
+PLIST_SUB+=		PYTHON_PLUGIN=""
+.else
+CONFIGURE_ARGS+=	--without-python
+PLIST_SUB+=		PYTHON_PLUGIN="@comment "
+.endif
+
+.if defined(WITH_SQLITE)
+LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=	--with-sqlite3
+PLIST_SUB+=		SQLITE_PLUGIN=""
+.else
+CONFIGURE_ARGS+=	--without-sqlite3
+PLIST_SUB+=		SQLITE_PLUGIN="@comment "
+.endif
+
+.if defined(WITH_XOSD)
+LIB_DEPENDS+=		xosd:${PORTSDIR}/misc/xosd
+CONFIGURE_ARGS+=	--with-libxosd
+PLIST_SUB+=		XOSD_PLUGIN=""
+.else
+CONFIGURE_ARGS+=	--without-libxosd
+PLIST_SUB+=		XOSD_PLUGIN="@comment "
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+.if defined(WITH_PYTHON)
+	${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \
+		${WRKSRC}/contrib/python/notify-bubble.py
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/polish/ekg2/distinfo b/polish/ekg2/distinfo
index 25acb4e5f2e2..a79b3e63cca9 100644
--- a/polish/ekg2/distinfo
+++ b/polish/ekg2/distinfo
@@ -1,3 +1,2 @@
-MD5 (ekg2-0.1.1.tar.gz) = 8c64ab909687b9ac3798caa7736d7b2a
-SHA256 (ekg2-0.1.1.tar.gz) = 563ad926becaa634c7004d309d4bcf5fccdf385cf2bba779b38679e511005400
-SIZE (ekg2-0.1.1.tar.gz) = 1218364
+SHA256 (ekg2-0.3.0.tar.gz) = 07d460b171c266c3375a3d9ca4c9c19fa001d986cbb73fcd8611900f65382dcd
+SIZE (ekg2-0.3.0.tar.gz) = 1701061
diff --git a/polish/ekg2/files/patch-plugins-rc-inputs.c b/polish/ekg2/files/patch-plugins-rc-inputs.c
deleted file mode 100644
index 6c54c1c0ee72..000000000000
--- a/polish/ekg2/files/patch-plugins-rc-inputs.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/rc/inputs.c.orig	Wed Apr  4 19:58:55 2007
-+++ plugins/rc/inputs.c	Wed Apr  4 20:03:38 2007
-@@ -8,6 +8,9 @@
- #include <sys/un.h>
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
- #include <sys/stat.h>
- 
- #include <stdlib.h>
diff --git a/polish/ekg2/pkg-plist b/polish/ekg2/pkg-plist
index 1070d8f6e41b..5089ec8291ac 100644
--- a/polish/ekg2/pkg-plist
+++ b/polish/ekg2/pkg-plist
@@ -1,156 +1,157 @@
 bin/ekg2
-bin/ekg2-config
-include/ekg2/audio.h
-include/ekg2/commands.h
-include/ekg2/configfile.h
-include/ekg2/debug.h
-include/ekg2/dynstuff.h
-include/ekg2/ekg2-config.h
-include/ekg2/emoticons.h
-include/ekg2/events.h
-include/ekg2/gettext.h
-include/ekg2/log.h
-include/ekg2/metacontacts.h
-include/ekg2/msgqueue.h
-include/ekg2/objects.h
-include/ekg2/plugins.h
-include/ekg2/protocol.h
-include/ekg2/scripts.h
-include/ekg2/sessions.h
-include/ekg2/stuff.h
-include/ekg2/themes.h
-include/ekg2/userlist.h
-include/ekg2/vars.h
-include/ekg2/windows.h
-include/ekg2/xmalloc.h
-include/ekg2/queries.h
-include/ekg2/win32.h
-lib/ekg2/plugins/gg.la
+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_PLUGIN%%lib/ekg2/plugins/gpg.la
+%%GPG_PLUGIN%%lib/ekg2/plugins/gpg.so
+%%GSM_PLUGIN%%lib/ekg2/plugins/gsm.so
+%%GSM_PLUGIN%%lib/ekg2/plugins/gsm.la
+%%GTK2_PLUGIN%%lib/ekg2/plugins/gtk.so
+%%GTK2_PLUGIN%%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.la
 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_PLUGIN%%lib/ekg2/plugins/logsqlite.so
+%%SQLITE_PLUGIN%%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_PLUGIN%%lib/ekg2/plugins/perl.so
+%%PERL_PLUGIN%%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_PLUGIN%%lib/ekg2/plugins/python.so
+%%PYTHON_PLUGIN%%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/rot13.so
-lib/ekg2/plugins/rot13.la
-lib/ekg2/plugins/httprc_xajax.so
-lib/ekg2/plugins/httprc_xajax.la
-lib/ekg2/plugins/xmsg.so
 lib/ekg2/plugins/xmsg.la
-lib/ekg2/plugins/readline.so
-lib/ekg2/plugins/readline.la
-lib/ekg2/plugins/autoresponder.so
-lib/ekg2/plugins/autoresponder.la
+lib/ekg2/plugins/xmsg.so
+%%XOSD_PLUGIN%%lib/ekg2/plugins/xosd.so
+%%XOSD_PLUGIN%%lib/ekg2/plugins/xosd.la
+%%PERL_PLUGIN%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.bs
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.so
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/.packlist
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.bs
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.so
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/.packlist
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2.pm
+%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2/Irc.pm
 libexec/ioctld
-%%DATADIR%%/plugins/logs/vars-pl.txt
-%%DATADIR%%/plugins/logs/vars-pl-utf.txt
-%%DATADIR%%/plugins/mail/vars-pl.txt
-%%DATADIR%%/plugins/mail/vars-pl-utf.txt
-%%DATADIR%%/plugins/rc/vars-pl.txt
-%%DATADIR%%/plugins/rc/vars-pl-utf.txt
-%%DATADIR%%/plugins/sms/vars-pl.txt
-%%DATADIR%%/plugins/sms/commands-pl.txt
-%%DATADIR%%/plugins/sms/vars-pl-utf.txt
-%%DATADIR%%/plugins/sms/commands-pl-utf.txt
-%%DATADIR%%/plugins/irc/commands-pl.txt
-%%DATADIR%%/plugins/irc/session-pl.txt
-%%DATADIR%%/plugins/irc/commands-pl-utf.txt
-%%DATADIR%%/plugins/irc/session-pl-utf.txt
-%%DATADIR%%/plugins/httprc_xajax/xajax_0.2.4.js
-%%DATADIR%%/plugins/httprc_xajax/ekg2.js
-%%DATADIR%%/plugins/httprc_xajax/ekg2.css
-%%DATADIR%%/plugins/httprc_xajax/xajax_0.2.4.js-utf.txt
-%%DATADIR%%/plugins/httprc_xajax/ekg2.js-utf.txt
-%%DATADIR%%/plugins/httprc_xajax/ekg2.css-utf.txt
-%%DATADIR%%/plugins/xmsg/session-pl.txt
-%%DATADIR%%/plugins/xmsg/session-en.txt
-%%DATADIR%%/plugins/xmsg/vars-pl.txt
-%%DATADIR%%/plugins/xmsg/vars-en.txt
-%%DATADIR%%/plugins/xmsg/session-pl-utf.txt
-%%DATADIR%%/plugins/xmsg/session-en-utf.txt
-%%DATADIR%%/plugins/xmsg/vars-pl-utf.txt
-%%DATADIR%%/plugins/xmsg/vars-en-utf.txt
-%%DATADIR%%/plugins/autoresponder/vars-pl.txt
+%%DATADIR%%/commands-pl.txt
 %%DATADIR%%/plugins/autoresponder/vars-en.txt
-%%DATADIR%%/plugins/autoresponder/vars-pl-utf.txt
-%%DATADIR%%/plugins/autoresponder/vars-en-utf.txt
-%%DATADIR%%/plugins/ioctld/commands-pl.txt
-%%DATADIR%%/plugins/ioctld/commands-pl-utf.txt
-%%DATADIR%%/plugins/gg/vars-pl.txt
+%%DATADIR%%/plugins/autoresponder/vars-pl.txt
+%%DATADIR%%/plugins/gg/commands-en.txt
 %%DATADIR%%/plugins/gg/commands-pl.txt
+%%DATADIR%%/plugins/gg/session-en.txt
 %%DATADIR%%/plugins/gg/session-pl.txt
-%%DATADIR%%/plugins/gg/commands-en.txt
 %%DATADIR%%/plugins/gg/vars-en.txt
-%%DATADIR%%/plugins/gg/session-en.txt
-%%DATADIR%%/plugins/gg/vars-pl-utf.txt
-%%DATADIR%%/plugins/gg/commands-pl-utf.txt
-%%DATADIR%%/plugins/gg/session-pl-utf.txt
-%%DATADIR%%/plugins/gg/commands-en-utf.txt
-%%DATADIR%%/plugins/gg/vars-en-utf.txt
-%%DATADIR%%/plugins/gg/session-en-utf.txt
-%%DATADIR%%/plugins/sim/vars-pl.txt
-%%DATADIR%%/plugins/sim/commands-pl.txt
-%%DATADIR%%/plugins/sim/vars-pl-utf.txt
-%%DATADIR%%/plugins/sim/commands-pl-utf.txt
-%%DATADIR%%/plugins/jabber/commands-pl.txt
-%%DATADIR%%/plugins/jabber/session-pl.txt
+%%DATADIR%%/plugins/gg/vars-pl.txt
+%%GPG_PLUGIN%%%%DATADIR%%/plugins/gpg/commands-en.txt
+%%GPG_PLUGIN%%%%DATADIR%%/plugins/gpg/commands-pl.txt
+%%DATADIR%%/plugins/httprc_xajax/ekg2.css
+%%DATADIR%%/plugins/httprc_xajax/ekg2.js
+%%DATADIR%%/plugins/httprc_xajax/xajax_0.2.4.js
+%%DATADIR%%/plugins/ioctld/commands-pl.txt
+%%DATADIR%%/plugins/irc/commands-pl.txt
+%%DATADIR%%/plugins/irc/session-pl.txt
 %%DATADIR%%/plugins/jabber/commands-en.txt
+%%DATADIR%%/plugins/jabber/commands-pl.txt
 %%DATADIR%%/plugins/jabber/session-en.txt
-%%DATADIR%%/plugins/jabber/commands-pl-utf.txt
-%%DATADIR%%/plugins/jabber/session-pl-utf.txt
-%%DATADIR%%/plugins/jabber/commands-en-utf.txt
-%%DATADIR%%/plugins/jabber/session-en-utf.txt
-%%DATADIR%%/plugins/ncurses/vars-pl.txt
+%%DATADIR%%/plugins/jabber/session-pl.txt
+%%DATADIR%%/plugins/logs/vars-pl.txt
+%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/vars-en.txt
+%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/vars-pl.txt
+%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/commands-en.txt
+%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/commands-pl.txt
+%%DATADIR%%/plugins/mail/vars-pl.txt
+%%DATADIR%%/plugins/ncurses/commands-pl.txt
 %%DATADIR%%/plugins/ncurses/vars-en.txt
-%%DATADIR%%/plugins/ncurses/vars-pl-utf.txt
-%%DATADIR%%/plugins/ncurses/vars-en-utf.txt
+%%DATADIR%%/plugins/ncurses/vars-pl.txt
+%%PYTHON_PLUGIN%%%%DATADIR%%/plugins/python/commands-en.txt
+%%PYTHON_PLUGIN%%%%DATADIR%%/plugins/python/commands-pl.txt
+%%DATADIR%%/plugins/rc/vars-pl.txt
+%%DATADIR%%/plugins/readline/vars-en.txt
 %%DATADIR%%/plugins/readline/vars-pl.txt
-%%DATADIR%%/plugins/readline/vars-pl-utf.txt
-%%DATADIR%%/vars-pl.txt
-%%DATADIR%%/commands-pl.txt
-%%DATADIR%%/session-pl.txt
+%%DATADIR%%/plugins/sim/commands-pl.txt
+%%DATADIR%%/plugins/sim/vars-pl.txt
+%%DATADIR%%/plugins/sms/commands-pl.txt
+%%DATADIR%%/plugins/sms/vars-pl.txt
+%%DATADIR%%/plugins/xmsg/session-en.txt
+%%DATADIR%%/plugins/xmsg/session-pl.txt
+%%DATADIR%%/plugins/xmsg/vars-en.txt
+%%DATADIR%%/plugins/xmsg/vars-pl.txt
+%%XOSD_PLUGIN%%%%DATADIR%%/plugins/xosd/commands-pl.txt
+%%XOSD_PLUGIN%%%%DATADIR%%/plugins/xosd/vars-pl.txt
+%%PERL_PLUGIN%%%%DATADIR%%/scripts/audioscrobbler_bot.pl
+%%PERL_PLUGIN%%%%DATADIR%%/scripts/dns.pl
+%%PERL_PLUGIN%%%%DATADIR%%/scripts/ggbe.pl
+%%PYTHON_PLUGIN%%%%DATADIR%%/scripts/notify-bubble.py
+%%PERL_PLUGIN%%%%DATADIR%%/scripts/slownik.pl
+%%PERL_PLUGIN%%%%DATADIR%%/scripts/xmms.pl
 %%DATADIR%%/session-en.txt
-%%DATADIR%%/vars-pl-utf.txt
-%%DATADIR%%/commands-pl-utf.txt
-%%DATADIR%%/session-pl-utf.txt
-%%DATADIR%%/session-en-utf.txt
+%%DATADIR%%/session-pl.txt
 %%DATADIR%%/themes/blue_sea_dragon.theme
+%%DATADIR%%/themes/dmilith.theme
 %%DATADIR%%/themes/irc-irssi.theme
-share/locale/pl/LC_MESSAGES/ekg2.mo
-share/locale/de/LC_MESSAGES/ekg2.mo
+%%DATADIR%%/themes/peres.theme
+%%DATADIR%%/vars-en.txt
+%%DATADIR%%/vars-pl.txt
+%%NLS%%share/locale/de/LC_MESSAGES/ekg2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ekg2.mo
 @dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/plugins/logs
-@dirrm %%DATADIR%%/plugins/mail
-@dirrm %%DATADIR%%/plugins/rc
-@dirrm %%DATADIR%%/plugins/sms
-@dirrm %%DATADIR%%/plugins/irc
-@dirrm %%DATADIR%%/plugins/httprc_xajax
-@dirrm %%DATADIR%%/plugins/xmsg
+@dirrmtry %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/plugins/autoresponder
-@dirrm %%DATADIR%%/plugins/ioctld
 @dirrm %%DATADIR%%/plugins/gg
-@dirrm %%DATADIR%%/plugins/sim
+%%GPG_PLUGIN%%@dirrm %%DATADIR%%/plugins/gpg
+@dirrm %%DATADIR%%/plugins/httprc_xajax
+@dirrm %%DATADIR%%/plugins/ioctld
+@dirrm %%DATADIR%%/plugins/irc
 @dirrm %%DATADIR%%/plugins/jabber
+@dirrm %%DATADIR%%/plugins/logs
+%%SQLITE_PLUGIN%%@dirrm %%DATADIR%%/plugins/logsqlite
+@dirrm %%DATADIR%%/plugins/mail
 @dirrm %%DATADIR%%/plugins/ncurses
+%%PYTHON_PLUGIN%%@dirrm %%DATADIR%%/plugins/python
+@dirrm %%DATADIR%%/plugins/rc
 @dirrm %%DATADIR%%/plugins/readline
+@dirrm %%DATADIR%%/plugins/sim
+@dirrm %%DATADIR%%/plugins/sms
+@dirrm %%DATADIR%%/plugins/xmsg
+%%XOSD_PLUGIN%%@dirrm %%DATADIR%%/plugins/xosd
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%
+%%PERL_PLUGIN%%@dirrm %%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc
+%%PERL_PLUGIN%%@dirrm %%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2
+%%PERL_PLUGIN%%@dirrm %%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2
 @dirrm lib/ekg2/plugins
 @dirrm lib/ekg2
-@dirrm include/ekg2