svn commit: r458966 - in head/security/racoon2: . files
Tijl Coosemans
tijl at FreeBSD.org
Sun Jan 14 13:34:24 UTC 2018
Author: tijl
Date: Sun Jan 14 13:34:22 2018
New Revision: 458966
URL: https://svnweb.freebsd.org/changeset/ports/458966
Log:
- Fix installation broken by undefined ac_given_INSTALL in configure script.
- Improve patch commands that add DESTDIR support.
Reported by: antoine
Modified:
head/security/racoon2/Makefile
head/security/racoon2/files/patch-configure
Modified: head/security/racoon2/Makefile
==============================================================================
--- head/security/racoon2/Makefile Sun Jan 14 13:26:01 2018 (r458965)
+++ head/security/racoon2/Makefile Sun Jan 14 13:34:22 2018 (r458966)
@@ -15,8 +15,6 @@ CONFIGURE_ARGS+= --disable-kinkd
PLIST_SUB+= KINK="@comment "
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${STAGEDIR}${PREFIX}
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/racoon2
CONFIGURE_ENV= YACC=/usr/bin/yacc perl_bindir=${LOCALBASE}/bin/perl5
OPTIONS_DEFINE= DOCS
@@ -68,18 +66,19 @@ PORTDOCS+= kinkd-install.ja.txt kinkd-state-txn.obj
.endif
.endif
+post-patch:
+ @${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \
+ -e '/INSTALL/s|\$$([a-z0-9]*dir)|$$(DESTDIR)&|' \
+ -e '/INSTALL/s|\$$(prefix)|$$(DESTDIR)&|' {} +
+ @${REINPLACE_CMD} 's|/var/run/racoon2|$$(DESTDIR)&|' \
+ ${WRKSRC}/samples/Makefile.in
+
post-patch-DOCS-on:
.for FILE in ${PORTDOCS}
@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${PREFIX}|' ${WRKSRC}/doc/${FILE}
.endfor
-post-configure:
- @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/INSTALL/s|\$$([a-z].*dir)|${STAGEDIR}&|'
- @${REINPLACE_CMD} -e '/INSTALL/s|\$$(prefix)|${STAGEDIR}&|' ${WRKSRC}/pskgen/Makefile
- @${REINPLACE_CMD} -e '/^prefix=/s|/usr/local|${STAGEDIR}${PREFIX}|;/\/var\/run\/racoon2/d' ${WRKSRC}/samples/Makefile
-
post-install:
- ${MKDIR} ${STAGEDIR}/var/run/racoon2
@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"; \
Modified: head/security/racoon2/files/patch-configure
==============================================================================
--- head/security/racoon2/files/patch-configure Sun Jan 14 13:26:01 2018 (r458965)
+++ head/security/racoon2/files/patch-configure Sun Jan 14 13:34:22 2018 (r458966)
@@ -9,3 +9,11 @@
startup_scripts=rc-d
;;
*)
+@@ -1126,6 +1126,7 @@ rm -fr confdefs* $ac_clean_files
+ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
+ if test "$no_recursion" != yes; then
++ac_given_INSTALL="$INSTALL"
+
+ # Remove --cache-file and --srcdir arguments so they do not pile up.
+ ac_sub_configure_args=
More information about the svn-ports-head
mailing list