diff options
| author | lawrance <lawrance@FreeBSD.org> | 2005-12-02 19:28:06 +0800 |
|---|---|---|
| committer | lawrance <lawrance@FreeBSD.org> | 2005-12-02 19:28:06 +0800 |
| commit | 7dfcf96eadf85f9bcd50b8b395ea7d6dd2b854f3 (patch) | |
| tree | 248040ad690defd32f5c39b6ff25058f9f6375e9 | |
| parent | 92916648ab73b9263ccc9545c006376cfed93d2e (diff) | |
| download | freebsd-ports-gnome-7dfcf96eadf85f9bcd50b8b395ea7d6dd2b854f3.tar.gz freebsd-ports-gnome-7dfcf96eadf85f9bcd50b8b395ea7d6dd2b854f3.tar.zst freebsd-ports-gnome-7dfcf96eadf85f9bcd50b8b395ea7d6dd2b854f3.zip | |
- Change the location of racoon configuration files to /usr/local/etc/racoon,
bringing it in line with the old security/racoon port and the handbook [1]
- Make use of USE_RC_SUBR instead of home-grown substitution and install
- Prevent installation of some intermediate sample configuration files
PR: ports/89273 [1]
Submitted by: Angelo Turetta <aturetta@bestunion.it> [1]
Approved by: VANHULLEBUS Yvan <vanhu@netasq.com> (maintainer)
| -rw-r--r-- | security/ipsec-tools/Makefile | 11 | ||||
| -rw-r--r-- | security/ipsec-tools/files/racoon.sh.in (renamed from security/ipsec-tools/files/racoon.sh) | 2 | ||||
| -rw-r--r-- | security/ipsec-tools/pkg-plist | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 10bb201fa0ad..076a8e1cd705 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -21,7 +21,7 @@ COMMENT= KAME racoon IKE daemon, ipsec-tools version CONFLICTS= racoon-[0-9]* -USE_RC_SUBR= yes +USE_RC_SUBR= racoon.sh USE_OPENSSL= yes USE_BZIP2= yes @@ -32,27 +32,22 @@ INSTALLS_SHLIB= yes LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-debug --enable-dpd --enable-natt=kernel \ --enable-frag --enable-ipv6 --enable-shared \ - --sysconfdir=${LOCALBASE}/etc \ + --sysconfdir=${PREFIX}/etc/racoon \ --with-pkgversion=freebsd-${PORTVERSION} \ MAN3= ipsec_set_policy.3 ipsec_strerror.3 MAN5= racoon.conf.5 MAN8= racoon.8 racoonctl.8 setkey.8 plainrsa-gen.8 -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - RC_SUBR=${RC_SUBR} - PORTDOCS= * post-install: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/racoon.sh > ${PREFIX}/etc/rc.d/racoon.sh - @${CHMOD} +x ${PREFIX}/etc/rc.d/racoon.sh @if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && ${ECHO_CMD} 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 ; @${MKDIR} ${EXAMPLESDIR} + @${RM} -f ${WRKSRC}/src/racoon/samples/*.in @${CP} -r ${WRKSRC}/src/racoon/samples/* ${EXAMPLESDIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/security/ipsec-tools/files/racoon.sh b/security/ipsec-tools/files/racoon.sh.in index 0c615586a558..ecde585dad87 100644 --- a/security/ipsec-tools/files/racoon.sh +++ b/security/ipsec-tools/files/racoon.sh.in @@ -1,7 +1,7 @@ #!/bin/sh # Start or stop racoon -# $FreeBSD: /tmp/pcvs/ports/security/ipsec-tools/files/Attic/racoon.sh,v 1.1 2005-09-05 14:13:42 vsevolod Exp $ +# $FreeBSD$ # PROVIDE: racoon # REQUIRE: DAEMON diff --git a/security/ipsec-tools/pkg-plist b/security/ipsec-tools/pkg-plist index fdda9c01199b..27f2cfbc6542 100644 --- a/security/ipsec-tools/pkg-plist +++ b/security/ipsec-tools/pkg-plist @@ -1,6 +1,5 @@ sbin/racoon sbin/setkey -etc/rc.d/racoon.sh include/libipsec/libpfkey.h include/racoon/admin.h include/racoon/evt.h @@ -26,10 +25,8 @@ lib/libracoon.so.0 sbin/plainrsa-gen sbin/racoonctl %%EXAMPLESDIR%%/psk.txt -%%EXAMPLESDIR%%/psk.txt.in %%EXAMPLESDIR%%/psk.txt.sample %%EXAMPLESDIR%%/racoon.conf -%%EXAMPLESDIR%%/racoon.conf.in %%EXAMPLESDIR%%/racoon.conf.sample %%EXAMPLESDIR%%/racoon.conf.sample-gssapi %%EXAMPLESDIR%%/racoon.conf.sample-inherit |