From owner-svn-ports-all@freebsd.org Sun Jan 14 13:34:24 2018 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 4D2AEE6FE06; Sun, 14 Jan 2018 13:34:24 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2C4B7BE17; Sun, 14 Jan 2018 13:34:23 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CE8522608; Sun, 14 Jan 2018 13:34:23 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0EDYNFB059399; Sun, 14 Jan 2018 13:34:23 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0EDYNUg059397; Sun, 14 Jan 2018 13:34:23 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201801141334.w0EDYNUg059397@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 14 Jan 2018 13:34:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458966 - in head/security/racoon2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/security/racoon2: . files X-SVN-Commit-Revision: 458966 X-SVN-Commit-Repository: ports 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.25 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: Sun, 14 Jan 2018 13:34:24 -0000 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=