From owner-svn-ports-head@freebsd.org Tue Nov 17 21:31:02 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EE89A31E9C; Tue, 17 Nov 2015 21:31:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E16421EF6; Tue, 17 Nov 2015 21:31:01 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHLV0DH001839; Tue, 17 Nov 2015 21:31:00 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHLV0l3001838; Tue, 17 Nov 2015 21:31:00 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201511172131.tAHLV0l3001838@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 17 Nov 2015 21:31:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401826 - head/irc/sirc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2015 21:31:02 -0000 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 +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}