Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Nov 2015 21:31:00 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401826 - head/irc/sirc
Message-ID:  <201511172131.tAHLV0l3001838@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Nov 17 21:31:00 2015
New Revision: 401826
URL: https://svnweb.freebsd.org/changeset/ports/401826

Log:
  - Switch to options helpers

Modified:
  head/irc/sirc/Makefile

Modified: head/irc/sirc/Makefile
==============================================================================
--- head/irc/sirc/Makefile	Tue Nov 17 21:30:44 2015	(r401825)
+++ head/irc/sirc/Makefile	Tue Nov 17 21:31:00 2015	(r401826)
@@ -19,10 +19,6 @@ RUN_DEPENDS=	p5-Perl4-CoreLibs>=0:${PORT
 
 USES=		perl5
 
-OPTIONS_DEFINE=	DOCS IPV6 SIRC_SCRIPTS SOCKS
-OPTIONS_DEFAULT=SIRC_SCRIPTS
-OPTIONS_SUB=	yes
-
 IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>0:${PORTSDIR}/net/p5-IO-Socket-INET6
 IPV6_EXTRA_PATCHES=	${PATCHDIR}/dsirc-ipv6
 
@@ -35,16 +31,14 @@ 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
+SIRCLIBDIR=	${STAGEDIR}${PREFIX}/libexec/sirc
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS IPV6 SIRC_SCRIPTS SOCKS
+OPTIONS_DEFAULT=SIRC_SCRIPTS
+OPTIONS_SUB=	yes
 
-.if ! ${PORT_OPTIONS:MIPV6}
-EXTRA_PATCHES=	${PATCHDIR}/dsirc-minimal
-.endif
-
-.if ${PORT_OPTIONS:MSOCKS}
-PKGMESSAGE=	${FILESDIR}/pkg-message-socks
-.endif
+IPV6_EXTRA_PATCHES_OFF=	${PATCHDIR}/dsirc-minimal
+SOCKS_VARS=		PKGMESSAGE=${FILESDIR}/pkg-message-socks
 
 pre-patch:
 	@${CP} ${WRKSRC}/dsirc ${WRKSRC}/dsirc.prepatch
@@ -55,7 +49,6 @@ pre-patch:
 do-build:
 	${CC} ${CFLAGS} ${WRKSRC}/ssfe.c -o ${WRKSRC}/ssfe -ltermcap
 
-SIRCLIBDIR=	${STAGEDIR}${PREFIX}/libexec/sirc
 do-install:
 	@${MKDIR} ${SIRCLIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/n0thing.pl ${SIRCLIBDIR}
@@ -65,11 +58,13 @@ do-install:
 	${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}
+	${INSTALL_DATA} ${WRKSRC}/socks.pl ${SIRCLIBDIR}
+
+do-install-SIRC_SCRIPTS-on:
 	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${SIRC_SCRIPTS} \
 		${SIRCLIBDIR})
-.endif
-	${INSTALL_DATA} ${WRKSRC}/socks.pl ${SIRCLIBDIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.socks ${STAGEDIR}${DOCSDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511172131.tAHLV0l3001838>