pkgsrc-WIP-changes archive

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

gnunet: copy files to workdir



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Mon Mar 21 23:46:18 2022 +0100
Changeset:	02ca7b112b1f9e87b4dd00f68ee5657d1b8c21fe

Modified Files:
	gnunet/Makefile

Log Message:
gnunet: copy files to workdir

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

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

diffstat:
 gnunet/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index befe6d472b..c4ecc03b73 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -59,11 +59,15 @@ AUTO_MKDIRS=		YES
 
 FILES_SUBST+=		PKG_HOME=${GNUNET_DIR}
 
+post-extract:
+	${CP} ${FILESDIR}/gnunet.conf ${WRKSRC}/gnunet.conf
+	${CP} ${FILESDIR}/gnunet_user.conf ${WRKSRC}/gnunet_user.conf
+
 # TODO: This should be an .in file, but how.
 SUBST_CLASSES+=			sysconfdir
-SUBST_STAGE.sysconfdir=		post-configure
+SUBST_STAGE.sysconfdir=		pre-configure
 SUBST_MESSAGE.sysconfdir=	Fixing paths in gnunet.conf
-SUBST_FILES.sysconfdir=		${FILESDIR}/gnunet.conf
+SUBST_FILES.sysconfdir=		${WRKSRC}/gnunet.conf
 SUBST_SED.sysconfdir+=		-e 's,^DEFAULTCONFIG.*,DEFAULTCONFIG = ${PKG_SYSCONFDIR}/gnunet.conf,g'
 SUBST_SED.sysconfdir+=		-e 's,^GNUNET_DATA_HOME.*,GNUNET_DATA_HOME = ${GNUNET_DIR}/data,g'
 SUBST_SED.sysconfdir+=		-e 's,^GNUNET_RUNTIME_DIR.*,GNUNET_RUNTIME_DIR = ${GNUNET_DIR},g'
@@ -71,8 +75,8 @@ SUBST_SED.sysconfdir+=		-e 's,^GNUNET_HOME.*,GNUNET_HOME = ${GNUNET_DIR},g'
 
 post-configure:
 	${MKDIR} ${DESTDIR}${PKG_SYSCONFDIR}
-	${INSTALL_DATA} ${FILESDIR}/gnunet.conf ${DESTDIR}${PKG_SYSCONFDIR}/gnunet.conf
-	${INSTALL_DATA} ${FILESDIR}/gnunet_user.conf ${DESTDIR}${PKG_SYSCONFDIR}/gnunet_user.conf
+	${INSTALL_DATA} ${WRKSRC}/gnunet.conf ${DESTDIR}${PKG_SYSCONFDIR}/gnunet.conf
+	${INSTALL_DATA} ${WRKSRC}/gnunet_user.conf ${DESTDIR}${PKG_SYSCONFDIR}/gnunet_user.conf
 
 # All helpers have to be suid. fs helper must not be suid.
 # Some helpers and functionalities are only supported on


Home | Main Index | Thread Index | Old Index