pkgsrc-WIP-changes archive

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

Fixing covering config file



Module Name:	pkgsrc-wip
Committed By:	Marcin Gondek <drixter%e-utp.net@localhost>
Pushed By:	drixter
Date:		Mon Apr 7 22:21:08 2025 +0200
Changeset:	18e13e826a6bb3000a0ae0b80d2593a3a0ecebd5

Modified Files:
	dnsdist/Makefile
	dnsdist/PLIST

Log Message:
Fixing covering config file

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

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

diffstat:
 dnsdist/Makefile | 15 +++++++--------
 dnsdist/PLIST    |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diffs:
diff --git a/dnsdist/Makefile b/dnsdist/Makefile
index a20e8dd02e..b832cb4027 100644
--- a/dnsdist/Makefile
+++ b/dnsdist/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.28 2024/11/14 22:21:04 wiz Exp $
 
 DISTNAME=	dnsdist-1.9.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -27,8 +27,6 @@ PKG_GECOS.${DNSDIST_USER}=	dnsdist daemon user
 
 FILES_SUBST+=	DNSDIST_USER=${DNSDIST_USER}
 FILES_SUBST+=	DNSDIST_GROUP=${DNSDIST_GROUP}
-#CONF_FILES+=	share/examples/dnsdist/dnsdist.conf \
-#		${PKG_SYSCONFDIR}/dnsdist.conf
 
 CONFIGURE_ARGS+=	--enable-dns-over-tls
 CONFIGURE_ARGS+=	--enable-dnscrypt
@@ -40,21 +38,22 @@ CONFIGURE_ARGS+=	--with-nghttp2
 CONFIGURE_ARGS+=	--with-re2
 CONFIGURE_ARGS+=	--without-net-snmp
 CONFIGURE_ARGS+=	--enable-dns-over-https
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 CONFIGURE_ENV+=		LIBEDIT_CFLAGS="-I${BUILDLINK_PREFIX.editlinereadline}/include"
 CONFIGURE_ENV+=		LIBEDIT_LIBS="-L${BUILDLINK_PREFIX.editlinereadline}/lib ${BUILDLINK_LDADD.editlinereadline}"
 
-RCD_SCRIPTS+=		dnsdist
+EGDIR=			${PREFIX}/share/examples/dnsdist
+CONF_FILES=		${EGDIR}/dnsdist.conf-dist ${PKG_SYSCONFDIR}/dnsdist.conf
+INSTALLATION_DIRS+=	${EGDIR}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
-#post-install:
-#	cd ${DESTDIR}${PREFIX} && \
-#	${MV} share/examples/dnsdist/dnsdist.conf-dist share/examples/dnsdist/dnsdist.conf || ${TRUE}
+RCD_SCRIPTS+=		dnsdist
 
 .include "../../databases/lmdb/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/re2/buildlink3.mk"
-#.include "../../devel/libatomic/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../net/fstrm/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
diff --git a/dnsdist/PLIST b/dnsdist/PLIST
index 90bb8e5815..d9170d83bc 100644
--- a/dnsdist/PLIST
+++ b/dnsdist/PLIST
@@ -1,4 +1,4 @@
 @comment $NetBSD$
 bin/dnsdist
-etc/dnsdist.conf-dist
 man/man1/dnsdist.1
+share/examples/dnsdist/dnsdist.conf-dist


Home | Main Index | Thread Index | Old Index