2 files changed, 86 insertions, 123 deletions

diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 1cfbd2bf630d..ecebf496b96d 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	gadu.3:${PORTSDIR}/polish/libgadu \
 
 LICENSE=	GPLv2
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig iconv
+USES=		gmake iconv pathfix pkgconfig
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS+=	--enable-shared \
@@ -37,6 +36,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib -lintl -pthread
 CFLAGS+=		-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	ASPELL GPG GSM GTK2 PERL PYTHON SQLITE UNICODE XOSD
+OPTIONS_SUB=	yes
 
 ASPELL_DESC=	Enable spell checking support
 GPG_DESC=	Enable gpg plugin
@@ -50,92 +50,55 @@ XOSD_DESC=	Enable xosd plugin
 
 OPTIONS_DEFAULT=ASPELL
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MASPELL}
-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
+ASPELL_CONFIGURE_ON=	--with-aspell
+ASPELL_CONFIGURE_OFF=	--without-aspell
+ASPELL_LIB_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+ASPELL_RUN_DEPENDS=	${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell
 
-.if ${PORT_OPTIONS:MGPG}
-LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme \
+GPG_CONFIGURE_ON=	--with-gpg
+GPG_CONFIGURE_OFF=	--without-gpg
+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
+GPG_RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
-.if ${PORT_OPTIONS:MGSM}
-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
+GSM_CONFIGURE_ON=	--with-libgsm
+GSM_CONFIGURE_OFF=	--without-libgsm
+GSM_LIB_DEPENDS=	gsm:${PORTSDIR}/audio/gsm
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=		gtk20
-CONFIGURE_ARGS+=	--with-gtk
-PLIST_SUB+=		GTK2_PLUGIN=""
-.else
-CONFIGURE_ARGS+=	--without-gtk
-PLIST_SUB+=		GTK2_PLUGIN="@comment "
-.endif
+GTK2_CONFIGURE_ON=	--with-gtk
+GTK2_CONFIGURE_OFF=	--without-gtk
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
-.if ${PORT_OPTIONS:MPERL}
-USE_PERL5=		yes
-CONFIGURE_ARGS+=	--with-perl
-PLIST_SUB+=		PERL_PLUGIN=""
-.else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=		PERL_PLUGIN="@comment "
-.endif
+PERL_CONFIGURE_ON=	--with-perl
+PERL_CONFIGURE_OFF=	--without-perl
 
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=		yes
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=		PYTHON_PLUGIN=""
-.else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=		PYTHON_PLUGIN="@comment "
-.endif
+PYTHON_CONFIGURE_ON=	--with-python
+PYTHON_CONFIGURE_OFF=	--without-python
+
+SQLITE_CONFIGURE_ON=	--with-sqlite3
+SQLITE_CONFIGURE_OFF=	--without-sqlite3
+SQLITE_LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
+
+UNICODE_CONFIGURE_ON=	--enable-unicode
+
+XOSD_CONFIGURE_ON=	--with-libxosd
+XOSD_CONFIGURE_OFF=	--without-libxosd
+XOSD_LIB_DEPENDS=	xosd:${PORTSDIR}/misc/xosd
+
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSQLITE}
-LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
-CONFIGURE_ARGS+=	--with-sqlite3
-PLIST_SUB+=		SQLITE_PLUGIN=""
-.else
-CONFIGURE_ARGS+=	--without-sqlite3
-PLIST_SUB+=		SQLITE_PLUGIN="@comment "
+.if ${PORT_OPTIONS:MGTK2}
+USE_GNOME+=	gtk20
 .endif
 
-.if ${PORT_OPTIONS:MUNICODE}
-CONFIGURE_ARGS+=	--enable-unicode
+.if ${PORT_OPTIONS:MPERL}
+USE_PERL5=	yes
 .endif
 
-.if ${PORT_OPTIONS:MXOSD}
-LIB_DEPENDS+=		xosd:${PORTSDIR}/misc/xosd
-CONFIGURE_ARGS+=	--with-libxosd
-PLIST_SUB+=		XOSD_PLUGIN=""
-.else
-CONFIGURE_ARGS+=	--without-libxosd
-PLIST_SUB+=		XOSD_PLUGIN="@comment "
+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON=	yes
 .endif
 
 post-patch:
diff --git a/polish/ekg2/pkg-plist b/polish/ekg2/pkg-plist
index 4a8f0bf87b1b..d32584cf18cb 100644
--- a/polish/ekg2/pkg-plist
+++ b/polish/ekg2/pkg-plist
@@ -5,12 +5,12 @@ 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
+%%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
@@ -25,20 +25,20 @@ 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
+%%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_PLUGIN%%lib/ekg2/plugins/perl.so
-%%PERL_PLUGIN%%lib/ekg2/plugins/perl.la
+%%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_PLUGIN%%lib/ekg2/plugins/python.so
-%%PYTHON_PLUGIN%%lib/ekg2/plugins/python.la
+%%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
@@ -55,17 +55,17 @@ lib/ekg2/plugins/sms.la
 lib/ekg2/plugins/sms.so
 lib/ekg2/plugins/xmsg.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
+%%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
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/.packlist
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.bs
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.so
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/.packlist
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2/Irc.pm
 libexec/ioctld
 %%DATADIR%%/commands-pl.txt
 %%DATADIR%%/plugins/autoresponder/vars-en.txt
@@ -76,8 +76,8 @@ libexec/ioctld
 %%DATADIR%%/plugins/gg/session-pl.txt
 %%DATADIR%%/plugins/gg/vars-en.txt
 %%DATADIR%%/plugins/gg/vars-pl.txt
-%%GPG_PLUGIN%%%%DATADIR%%/plugins/gpg/commands-en.txt
-%%GPG_PLUGIN%%%%DATADIR%%/plugins/gpg/commands-pl.txt
+%%GPG%%%%DATADIR%%/plugins/gpg/commands-en.txt
+%%GPG%%%%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
@@ -89,16 +89,16 @@ libexec/ioctld
 %%DATADIR%%/plugins/jabber/session-en.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
+%%SQLITE%%%%DATADIR%%/plugins/logsqlite/vars-en.txt
+%%SQLITE%%%%DATADIR%%/plugins/logsqlite/vars-pl.txt
+%%SQLITE%%%%DATADIR%%/plugins/logsqlite/commands-en.txt
+%%SQLITE%%%%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.txt
-%%PYTHON_PLUGIN%%%%DATADIR%%/plugins/python/commands-en.txt
-%%PYTHON_PLUGIN%%%%DATADIR%%/plugins/python/commands-pl.txt
+%%PYTHON%%%%DATADIR%%/plugins/python/commands-en.txt
+%%PYTHON%%%%DATADIR%%/plugins/python/commands-pl.txt
 %%DATADIR%%/plugins/rc/vars-pl.txt
 %%DATADIR%%/plugins/readline/vars-en.txt
 %%DATADIR%%/plugins/readline/vars-pl.txt
@@ -110,14 +110,14 @@ libexec/ioctld
 %%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
+%%XOSD%%%%DATADIR%%/plugins/xosd/commands-pl.txt
+%%XOSD%%%%DATADIR%%/plugins/xosd/vars-pl.txt
+%%PERL%%%%DATADIR%%/scripts/audioscrobbler_bot.pl
+%%PERL%%%%DATADIR%%/scripts/dns.pl
+%%PERL%%%%DATADIR%%/scripts/ggbe.pl
+%%PYTHON%%%%DATADIR%%/scripts/notify-bubble.py
+%%PERL%%%%DATADIR%%/scripts/slownik.pl
+%%PERL%%%%DATADIR%%/scripts/xmms.pl
 %%DATADIR%%/session-en.txt
 %%DATADIR%%/session-pl.txt
 %%DATADIR%%/themes/blue_sea_dragon.theme
@@ -129,29 +129,29 @@ libexec/ioctld
 %%NLS%%share/locale/de/LC_MESSAGES/ekg2.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/ekg2.mo
 @dirrm %%DATADIR%%/themes
-%%PERL_PLUGIN%%@dirrmtry %%DATADIR%%/scripts
+%%PERL%%@dirrmtry %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/plugins/autoresponder
 @dirrm %%DATADIR%%/plugins/gg
-%%GPG_PLUGIN%%@dirrm %%DATADIR%%/plugins/gpg
+%%GPG%%@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
+%%SQLITE%%@dirrm %%DATADIR%%/plugins/logsqlite
 @dirrm %%DATADIR%%/plugins/mail
 @dirrm %%DATADIR%%/plugins/ncurses
-%%PYTHON_PLUGIN%%@dirrm %%DATADIR%%/plugins/python
+%%PYTHON%%@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
+%%XOSD%%@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
+%%PERL%%@dirrm %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc
+%%PERL%%@dirrm %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2
+%%PERL%%@dirrm %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2
 @dirrm lib/ekg2/plugins
 @dirrm lib/ekg2