- Add staging support

- Use options helpers, subs, define DOCS option
- Remove WWW line, page seems to not exist anymore

3 files changed, 41 insertions, 67 deletions

diff --git a/irc/sirc/Makefile b/irc/sirc/Makefile
index 7b8bdcc7e3f6..071cf619d25a 100644
--- a/irc/sirc/Makefile
+++ b/irc/sirc/Makefile
@@ -17,42 +17,31 @@ COMMENT=	Small (150k), fast, perl-based IRC client
 
 USES=		perl5
 
-OPTIONS_DEFINE=	IPV6 SIRC_SCRIPTS SOCKS
-OPTIONS_DEFAULT=IPV6 SIRC_SCRIPTS
-IPV6_DESC=		Support for IPv6 transport
-SIRC_SCRIPTS_DESC= 	Additional scripts for the clien
-SOCKS_DESC=		Support for IRCing through a SOCKS proxy
+OPTIONS_DEFINE=	DOCS IPV6 SIRC_SCRIPTS SOCKS
+OPTIONS_DEFAULT=SIRC_SCRIPTS
+OPTIONS_SUB=	yes
 
-SUB_FILES=	sirc
+IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>0:${PORTSDIR}/net/p5-IO-Socket-INET6
+IPV6_EXTRA_PATCHES=	${PATCHDIR}/dsirc-ipv6
+
+SIRC_SCRIPTS_DESC= 	Additional scripts for the client
+SIRC_SCRIPTS_DISTFILES=	${SIRC_SCRIPTS:S|$|:s|}
 
-MAN1=		ssfe.1 sirc.1
+SUB_FILES=	sirc
 
 PORTDOCS=	ChangeLog PROGRAMMING README
+SIRC_SCRIPTS=	adcc.pl akickban.pl avoice.pl country.pl finger.pl ftp.pl \
+		howl.pl lastlog.pl nocolor.pl patattack.pl prefix.pl quiet.pl \
+		quit.pl thx.pl www.pl yiff.pl
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MIPV6}
-RUN_DEPENDS=	p5-IO-Socket-INET6>0:${PORTSDIR}/net/p5-IO-Socket-INET6
-EXTRA_PATCHES=	${PATCHDIR}/dsirc-ipv6
-.else
+.if ! ${PORT_OPTIONS:MIPV6}
 EXTRA_PATCHES=	${PATCHDIR}/dsirc-minimal
 .endif
 
-.if ${PORT_OPTIONS:MSIRC_SCRIPTS}
-DISTFILES+=	adcc.pl:s akickban.pl:s avoice.pl:s country.pl:s finger.pl:s \
-		ftp.pl:s howl.pl:s lastlog.pl:s nocolor.pl:s patattack.pl:s \
-		prefix.pl:s quiet.pl:s quit.pl:s thx.pl:s www.pl:s yiff.pl:s
-PLIST_SUB+=	SCRIPTS=""
-.else
-PLIST_SUB+=	SCRIPTS="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MSOCKS}
 PKGMESSAGE=	${FILESDIR}/pkg-message-socks
-PLIST_SUB+=	SOCKS=""
-.else
-PLIST_SUB+=	SOCKS="@comment "
 .endif
 
 pre-patch:
@@ -64,39 +53,23 @@ pre-patch:
 do-build:
 	${CC} ${CFLAGS} ${WRKSRC}/ssfe.c -o ${WRKSRC}/ssfe -ltermcap
 
-SIRCLIBDIR=	${PREFIX}/libexec/sirc
+SIRCLIBDIR=	${STAGEDIR}${PREFIX}/libexec/sirc
 do-install:
 	@${MKDIR} ${SIRCLIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/n0thing.pl ${SIRCLIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/sirc.help.gz ${SIRCLIBDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/dsirc ${SIRCLIBDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/ssfe ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/sirc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ssfe.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/sirc.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/ssfe ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/sirc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/ssfe.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/sirc.1 ${STAGEDIR}${PREFIX}/man/man1
 .if ${PORT_OPTIONS:MSIRC_SCRIPTS}
-.for file in adcc.pl akickban.pl avoice.pl country.pl finger.pl ftp.pl \
-	howl.pl lastlog.pl nocolor.pl patattack.pl prefix.pl quiet.pl \
-	quit.pl thx.pl www.pl yiff.pl
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${SIRCLIBDIR}
-.endfor
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${SIRC_SCRIPTS} \
+		${SIRCLIBDIR})
 .endif
-.if ${PORT_OPTIONS:MSOCKS}
 	${INSTALL_DATA} ${WRKSRC}/socks.pl ${SIRCLIBDIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.if ${PORT_OPTIONS:MSOCKS}
-	${INSTALL_DATA} ${WRKSRC}/README.socks ${DOCSDIR}
-.endif
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MSOCKS}
-	@${CAT} ${PKGMESSAGE}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.socks ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/sirc/pkg-descr b/irc/sirc/pkg-descr
index 70be7c8256ff..40a646992545 100644
--- a/irc/sirc/pkg-descr
+++ b/irc/sirc/pkg-descr
@@ -8,4 +8,3 @@ knowledge of perl is necessary to run the client although it is helpful
 if you plan to do any scripting.
 
 Author: Roger Espel Llima (aka orabidoo)
-WWW: http://www.iagora.com/~espel/sirc.html
diff --git a/irc/sirc/pkg-plist b/irc/sirc/pkg-plist
index 2f36d72d6899..f39179aa2fbd 100644
--- a/irc/sirc/pkg-plist
+++ b/irc/sirc/pkg-plist
@@ -3,22 +3,24 @@ bin/ssfe
 libexec/sirc/dsirc
 libexec/sirc/n0thing.pl
 libexec/sirc/sirc.help.gz
-%%SCRIPTS%%libexec/sirc/adcc.pl
-%%SCRIPTS%%libexec/sirc/akickban.pl
-%%SCRIPTS%%libexec/sirc/avoice.pl
-%%SCRIPTS%%libexec/sirc/country.pl
-%%SCRIPTS%%libexec/sirc/finger.pl
-%%SCRIPTS%%libexec/sirc/ftp.pl
-%%SCRIPTS%%libexec/sirc/howl.pl
-%%SCRIPTS%%libexec/sirc/lastlog.pl
-%%SCRIPTS%%libexec/sirc/nocolor.pl
-%%SCRIPTS%%libexec/sirc/patattack.pl
-%%SCRIPTS%%libexec/sirc/prefix.pl
-%%SCRIPTS%%libexec/sirc/quiet.pl
-%%SCRIPTS%%libexec/sirc/quit.pl
-%%SCRIPTS%%libexec/sirc/thx.pl
-%%SCRIPTS%%libexec/sirc/www.pl
-%%SCRIPTS%%libexec/sirc/yiff.pl
+%%SIRC_SCRIPTS%%libexec/sirc/adcc.pl
+%%SIRC_SCRIPTS%%libexec/sirc/akickban.pl
+%%SIRC_SCRIPTS%%libexec/sirc/avoice.pl
+%%SIRC_SCRIPTS%%libexec/sirc/country.pl
+%%SIRC_SCRIPTS%%libexec/sirc/finger.pl
+%%SIRC_SCRIPTS%%libexec/sirc/ftp.pl
+%%SIRC_SCRIPTS%%libexec/sirc/howl.pl
+%%SIRC_SCRIPTS%%libexec/sirc/lastlog.pl
+%%SIRC_SCRIPTS%%libexec/sirc/nocolor.pl
+%%SIRC_SCRIPTS%%libexec/sirc/patattack.pl
+%%SIRC_SCRIPTS%%libexec/sirc/prefix.pl
+%%SIRC_SCRIPTS%%libexec/sirc/quiet.pl
+%%SIRC_SCRIPTS%%libexec/sirc/quit.pl
+%%SIRC_SCRIPTS%%libexec/sirc/thx.pl
+%%SIRC_SCRIPTS%%libexec/sirc/www.pl
+%%SIRC_SCRIPTS%%libexec/sirc/yiff.pl
 %%SOCKS%%libexec/sirc/socks.pl
+man/man1/sirc.1.gz
+man/man1/ssfe.1.gz
 %%SOCKS%%%%PORTDOCS%%%%DOCSDIR%%/README.socks
 @dirrm libexec/sirc