From owner-svn-ports-all@freebsd.org Thu Sep 10 12:26:03 2015 Return-Path: Delivered-To: svn-ports-all@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 DFD78A001AF; Thu, 10 Sep 2015 12:26:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 C385813D4; Thu, 10 Sep 2015 12:26:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8ACQ2Xk077202; Thu, 10 Sep 2015 12:26:02 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8ACQ2Ot077200; Thu, 10 Sep 2015 12:26:02 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509101226.t8ACQ2Ot077200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 10 Sep 2015 12:26:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396566 - head/security/racoon2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2015 12:26:03 -0000 Author: amdmi3 Date: Thu Sep 10 12:26:01 2015 New Revision: 396566 URL: https://svnweb.freebsd.org/changeset/ports/396566 Log: - Add empty directories to plist - Use options helpers (a bit) Approved by: portmgr blanket Modified: head/security/racoon2/Makefile head/security/racoon2/pkg-plist Modified: head/security/racoon2/Makefile ============================================================================== --- head/security/racoon2/Makefile Thu Sep 10 11:42:14 2015 (r396565) +++ head/security/racoon2/Makefile Thu Sep 10 12:26:01 2015 (r396566) @@ -3,7 +3,7 @@ PORTNAME= racoon2 PORTVERSION= 20100526a -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security net ipv6 MASTER_SITES= ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/ @@ -53,12 +53,10 @@ PORTDOCS+= kinkd-install.ja.txt kinkd-st .endif .endif -post-patch: -.if ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-on: .for FILE in ${PORTDOCS} @${REINPLACE_CMD} -e 's|/usr/local/racoon2|${PREFIX}|' ${WRKSRC}/doc/${FILE} .endfor -.endif post-configure: @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/INSTALL/s|\$$([a-z].*dir)|${STAGEDIR}&|' @@ -68,7 +66,12 @@ post-configure: post-install: ${MKDIR} ${STAGEDIR}/var/run/racoon2 -.if ${PORT_OPTIONS:MDOCS} + @if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && echo ipsec` ]; then \ + ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \ + ${ECHO_MSG} " You must build the kernel if you want to run racoon on the host"; \ + fi ; + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${STAGEDIR}${DOCSDIR} @@ -76,10 +79,5 @@ post-install: .for FILE in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -.endif - @if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && echo ipsec` ]; then \ - ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \ - ${ECHO_MSG} " You must build the kernel if you want to run racoon on the host"; \ - fi ; .include Modified: head/security/racoon2/pkg-plist ============================================================================== --- head/security/racoon2/pkg-plist Thu Sep 10 11:42:14 2015 (r396565) +++ head/security/racoon2/pkg-plist Thu Sep 10 12:26:01 2015 (r396566) @@ -35,6 +35,15 @@ man/man8/spmdctl.8.gz man/man8/pskgen.8.gz man/man8/iked.8.gz %%KINK%%man/man8/kinkd.8.gz +@dir etc/racoon2/psk +@dir etc/racoon2/hook/ph1-up.d +@dir etc/racoon2/hook/ph1-down.d +@dir etc/racoon2/hook/migration.d +@dir etc/racoon2/hook/ikesa-rekey.d +@dir etc/racoon2/hook/ikesa-down.d +@dir etc/racoon2/hook/child-rekey.d +@dir etc/racoon2/hook/child-down.d +@dir etc/racoon2/cert @exec test -f %%PFX%%/etc/racoon2/spmd.pwd && mv %%PFX%%/etc/racoon2/spmd.pwd %%PFX%%/etc/racoon2/spmd.pwd.bak && %%PFX%%/pskgen -r -o %%PFX%%/etc/racoon2/spmd.pwd @unexec rm -f %%PFX/etc/racoon2/spmd.pwd @dir(root,wheel,700) /var/run/racoon2