Date: Wed, 7 Sep 2016 17:09:57 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421514 - head/security/racoon2 Message-ID: <201609071709.u87H9vnM083572@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Sep 7 17:09:57 2016 New Revision: 421514 URL: https://svnweb.freebsd.org/changeset/ports/421514 Log: - Don't return an error on package installation when spmd.pwd doesn't exist. - Always generate spmd.pwd. Modified: head/security/racoon2/Makefile head/security/racoon2/pkg-plist Modified: head/security/racoon2/Makefile ============================================================================== --- head/security/racoon2/Makefile Wed Sep 7 16:40:32 2016 (r421513) +++ head/security/racoon2/Makefile Wed Sep 7 17:09:57 2016 (r421514) @@ -3,7 +3,7 @@ PORTNAME= racoon2 PORTVERSION= 20100526a -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security net ipv6 MASTER_SITES= ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/ @@ -76,9 +76,7 @@ HEIMDAL_BASE_MAKE_ENV= WITH_KINK=yes HEIMDAL_BASE_PLIST_SUB= KINK="" HEIMDAL_BASE_VARS= KINK=yes -.include <bsd.port.pre.mk> - -PLIST_SUB+= PFX=${PREFIX} +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} PORTDOCS+= INSTALL USAGE config-usage.ja.txt config-usage.txt @@ -116,4 +114,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/racoon2/pkg-plist ============================================================================== --- head/security/racoon2/pkg-plist Wed Sep 7 16:40:32 2016 (r421513) +++ head/security/racoon2/pkg-plist Wed Sep 7 17:09:57 2016 (r421514) @@ -44,6 +44,7 @@ man/man8/iked.8.gz @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%%/sbin/pskgen -r -o %%PFX%%/etc/racoon2/spmd.pwd -@unexec rm -f %%PFX/etc/racoon2/spmd.pwd +@postexec [ ! -e %D/%%ETCDIR%%/spmd.pwd ] || mv %D/%%ETCDIR%%/spmd.pwd %D/%%ETCDIR%%/spmd.pwd.bak +@postexec %D/sbin/pskgen -r -o %D/%%ETCDIR%%/spmd.pwd +@rmtry %%ETCDIR%%/spmd.pwd @dir(root,wheel,700) /var/run/racoon2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609071709.u87H9vnM083572>