diff options
| author | tijl <tijl@FreeBSD.org> | 2016-09-08 01:09:57 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2016-09-08 01:09:57 +0800 |
| commit | 77a015a223296e793cd733c4d23c74827fc4dad7 (patch) | |
| tree | 0b1935d249386c7b349e8ce0722f75778131bd8d /security | |
| parent | eb78cbb58a309ef8a444b6e23cd4ad7283e4afe9 (diff) | |
| download | freebsd-ports-gnome-77a015a223296e793cd733c4d23c74827fc4dad7.tar.gz freebsd-ports-gnome-77a015a223296e793cd733c4d23c74827fc4dad7.tar.zst freebsd-ports-gnome-77a015a223296e793cd733c4d23c74827fc4dad7.zip | |
- Don't return an error on package installation when spmd.pwd doesn't exist.
- Always generate spmd.pwd.
Diffstat (limited to 'security')
| -rw-r--r-- | security/racoon2/Makefile | 8 | ||||
| -rw-r--r-- | security/racoon2/pkg-plist | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile index 94da9077c234..9a2adee3373c 100644 --- a/security/racoon2/Makefile +++ b/security/racoon2/Makefile @@ -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> diff --git a/security/racoon2/pkg-plist b/security/racoon2/pkg-plist index 5c2d97b3cde0..3d1939e792b1 100644 --- a/security/racoon2/pkg-plist +++ b/security/racoon2/pkg-plist @@ -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 |