pkgsrc-WIP-changes archive

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

Fix handling configuration files



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Tue May 1 23:04:07 2018 +0200
Changeset:	4ff76a20978bfe2b01beb759571bfc73bc7dab8b

Modified Files:
	fwknop/Makefile
	fwknop/PLIST

Log Message:
Fix handling configuration files

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4ff76a20978bfe2b01beb759571bfc73bc7dab8b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fwknop/Makefile | 14 +++++++++++++-
 fwknop/PLIST    |  5 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs:
diff --git a/fwknop/Makefile b/fwknop/Makefile
index 10daba6e4a..be9aaa82f4 100644
--- a/fwknop/Makefile
+++ b/fwknop/Makefile
@@ -15,7 +15,15 @@ DEPENDS+=	wget-[0-9]*:../../net/wget
 USE_TOOLS+=	aclocal autoconf automake autoheader makeinfo
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
+CONFIGURE_ARGS+=--infodir=${PREFIX}/${PKGINFODIR}
+
+EGDIR=		${PREFIX}/share/examples/fwknop
+CONF_FILES+=	${EGDIR}/access.conf \
+		${PKG_SYSCONFDIR}/fwknop/access.conf
+CONF_FILES+=	${EGDIR}/fwknopd.conf \
+		${PKG_SYSCONFDIR}/fwknop/fwknopd.conf
+INSTALLATION_DIRS+=	${EGDIR}
+
 INFO_FILES=	yes
 
 WRKSRC=		${WRKDIR}/fwknop-2.6.9
@@ -23,6 +31,10 @@ WRKSRC=		${WRKDIR}/fwknop-2.6.9
 pre-configure:
 	cd ${WRKSRC} && sh autogen.sh
 
+post-install:
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/fwknop/access.conf ${DESTDIR}${EGDIR}/
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/fwknop/fwknopd.conf ${DESTDIR}${EGDIR}/
+
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fwknop/PLIST b/fwknop/PLIST
index 5f95f7442b..4c4d1f6de2 100644
--- a/fwknop/PLIST
+++ b/fwknop/PLIST
@@ -1,10 +1,11 @@
 @comment $NetBSD$
 bin/fwknop
-etc/fwknop/access.conf
-etc/fwknop/fwknopd.conf
 include/fko.h
 info/libfko.info
 lib/libfko.la
 man/man8/fwknop.8
 man/man8/fwknopd.8
 sbin/fwknopd
+share/examples/fwknop/access.conf
+share/examples/fwknop/fwknopd.conf
+@pkgdir etc/fwknop


Home | Main Index | Thread Index | Old Index