1: add LICENSE.

2: use options helper
3: add TRUECOLOR knob

PR:		198103 [3]
Submitted by:	Olivia Theze fox at foxiepa.ws [3]

2 files changed, 28 insertions, 56 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index a7d4ccb0d900..6fd88cbb366f 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -9,18 +9,32 @@ MASTER_SITES=	http://mirror.irssi.org/
 MAINTAINER?=	vanilla@FreeBSD.org
 COMMENT?=	Modular IRC client with many features
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
 
 CONFLICTS=	irssi-devel-[0-9]* zh-irssi-[0-9]*
 
-USES=		pkgconfig ncurses gmake tar:bzip2 libtool
+USES=		gmake libtool ncurses pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ncurses=${NCURSESBASE}
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	PERL PROXY SOCKS IPV6 BOT DOCS
+OPTIONS_DEFINE=	PERL PROXY SOCKS IPV6 BOT DOCS TRUECOLOR
+OPTIONS_DEFAULT=	PERL IPV6 DOCS
+OPTIONS_SUB=	yes
 SOCKS_DESC=	Socks proxy support
+SOCKS_CONFIGURE_WITH=	socks
 BOT_DESC=	Bot support
-OPTIONS_DEFAULT=	PERL IPV6 DOCS
+BOT_CONFIGURE_WITH=	bot
+PERL_USES=	perl5
+PERL_CONFIGURE_ON=	--with-perl-lib=site
+PERL_CONFIGURE_OFF=	--with-perl=no
+PROXY_CONFIGURE_WITH=	proxy
+IPV6_CONFIGURE_ENABLE=	ipv6
+IPV6_CATEGORIES=	ipv6
+TRUECOLOR_DESC=	Truecolor (24bit) support
+TRUECOLOR_CONFIGURE_ENABLE=	true-color
 
 # USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema
 # for WITH_SSL option
@@ -31,51 +45,9 @@ CONFIGURE_ARGS+=	--disable-ssl
 USE_OPENSSL=	yes
 .endif
 
-.include <bsd.port.options.mk>
-
-# Process options.
-
-.if ${PORT_OPTIONS:MPERL}
-USES+=		perl5
-CONFIGURE_ARGS+=	--with-perl-lib=site
-PLIST_SUB+=	WITH_PERL=""
-.else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=	WITH_PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPROXY}
-CONFIGURE_ARGS+=	--with-proxy
-PLIST_SUB+=	WITH_PROXY=""
-.else
-PLIST_SUB+=	WITH_PROXY="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSOCKS}
-CONFIGURE_ARGS+=	--with-socks
-.endif
-
-.if !${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--disable-ipv6
-CATEGORIES+=	ipv6
-.endif
-
-.if ${PORT_OPTIONS:MBOT}
-CONFIGURE_ARGS+=	--with-bot
-PLIST_SUB+=	WITH_BOT=""
-.else
-CONFIGURE_ARGS+=	--without-bot
-PLIST_SUB+=	WITH_BOT="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e 's|/etc|${PREFIX}&|' \
 		${WRKSRC}/docs/irssi.1
-.if empty(PORT_OPTIONS:MDOCS)
-	${REINPLACE_CMD} -e \
-		'/^install-data-am:/ s|install-docDATA||' \
-		${WRKSRC}/docs/Makefile.in
-.endif
 
 post-configure:
 	@${MV} ${WRKSRC}/irssi.conf ${WRKSRC}/irssi.conf.sample
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 8d0e3b86404e..194df0fac062 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,4 +1,4 @@
-%%WITH_BOT%%bin/botti
+%%BOT%%bin/botti
 bin/irssi
 @sample etc/irssi.conf.sample
 include/irssi/irssi-config.h
@@ -113,16 +113,16 @@ include/irssi/src/irc/notifylist/notify-setup.h
 include/irssi/src/irc/notifylist/notifylist.h
 include/irssi/src/lib-config/iconfig.h
 include/irssi/src/lib-config/module.h
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
-%%WITH_PERL%%%%SITE_ARCH%%/Irssi.pm
-%%WITH_PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
-%%WITH_PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
-%%WITH_PERL%%%%SITE_ARCH%%/Irssi/UI.pm
-%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
+%%PROXY%%lib/irssi/modules/libirc_proxy.a
+%%PROXY%%lib/irssi/modules/libirc_proxy.so
+%%PERL%%%%SITE_ARCH%%/Irssi.pm
+%%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
+%%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
+%%PERL%%%%SITE_ARCH%%/Irssi/UI.pm
+%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so
+%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
+%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
+%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
 man/man1/irssi.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/design.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.html