pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/racoon2 racoon2: respect DESTDIR/PKG_SYSCONFDIR.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/46c3fa358229
branches:  trunk
changeset: 440585:46c3fa358229
user:      maya <maya%pkgsrc.org@localhost>
date:      Tue Oct 13 01:47:25 2020 +0000

description:
racoon2: respect DESTDIR/PKG_SYSCONFDIR.

PR pkg/55471

diffstat:

 security/racoon2/Makefile |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 36298f329b85 -r 46c3fa358229 security/racoon2/Makefile
--- a/security/racoon2/Makefile Tue Oct 13 00:50:08 2020 +0000
+++ b/security/racoon2/Makefile Tue Oct 13 01:47:25 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2020/08/31 18:11:21 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2020/10/13 01:47:25 maya Exp $
 
 DISTNAME=              racoon2
 PKGNAME=               racoon2-20180701
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            security net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=zoulasc/}
 GITHUB_PROJECT=                racoon2
@@ -26,6 +26,12 @@
 REPLACE.perl.new=      ${PERL5}
 REPLACE_FILES.perl=    pskgen/pskgen.in
 
+SUBST_CLASSES+=                destdir
+SUBST_STAGE.destdir=   pre-configure
+SUBST_MESSAGE.destdir= Respect destdir and PKG_SYSCONFDIR
+SUBST_FILES.destdir=   pskgen/autogen.spmd.pwd.in
+SUBST_SED.destdir=     -e 's,@prefix@/etc/racoon2/,${DESTDIR}${PKG_SYSCONFDIR}/,g'
+
 SUBST_CLASSES+=                cf-path
 SUBST_STAGE.cf-path=   pre-configure
 SUBST_MESSAGE.cf-path= Fixing config file paths.
@@ -43,7 +49,7 @@
                        samples/ph1-up.in samples/ph1-down.in
 SUBST_SED.hk-path=     -e 's,cd @prefix@/etc/racoon2/,cd ${PKG_SYSCONFDIR}/,g'
 
-PLIST_SUBST+=          PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+PLIST_SUBST+=          PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}



Home | Main Index | Thread Index | Old Index