From cb47420cf023d8cd6a1ed7bcaedf56dba4177a50 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 8 Jan 2006 13:27:53 +0000 Subject: Use SUBST framework, add man pages to the list of files in need of substituation. Use PKG_SYSCONFDIR instead of PREFIX/etc, it can be different. Bump revision. --- net/chrony/Makefile | 17 ++++++++--------- net/chrony/distinfo | 12 ++++++------ net/chrony/patches/patch-aa | 4 ++-- net/chrony/patches/patch-ab | 8 ++++---- net/chrony/patches/patch-ac | 6 +++--- net/chrony/patches/patch-ae | 6 +++--- net/chrony/patches/patch-af | 4 ++-- 7 files changed, 28 insertions(+), 29 deletions(-) (limited to 'net/chrony') diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 590c3ed08bd..234562455da 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2005/12/29 06:21:58 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/01/08 13:27:53 joerg Exp $ DISTNAME= chrony-1.20 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://chrony.sunsite.dk/projects/chrony/ @@ -21,17 +21,16 @@ MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q} -pre-install: - for file in ${EGFILES}; do \ - ${SED} ${FILES_SUBST_SED} \ - ${WRKSRC}/examples/$${file} > \ - ${WRKDIR}/$${file}; \ - done +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${EGFILES:S/^/examples\//} chrony.conf.5 chronyd.8 +SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_STAGE.paths= post-patch post-install: ${INSTALL_DATA_DIR} ${EGDIR} for file in ${EGFILES}; do \ - ${INSTALL_DATA} ${WRKDIR}/$${file} \ + ${INSTALL_DATA} ${WRKSRC}/examples/$${file} \ ${EGDIR}/$${file}; \ done diff --git a/net/chrony/distinfo b/net/chrony/distinfo index a26991d327d..a85784817e6 100644 --- a/net/chrony/distinfo +++ b/net/chrony/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:43 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/01/08 13:27:53 joerg Exp $ SHA1 (chrony-1.20.tar.gz) = 8a739038b208bf63e4d0afbee44e8fea3c9aa480 RMD160 (chrony-1.20.tar.gz) = ec6f570c29b68983752ff8b025d908372bdf2fb1 Size (chrony-1.20.tar.gz) = 308253 bytes -SHA1 (patch-aa) = 10f5a5301c2f0ae2da840386a563551ad0fbfb1c -SHA1 (patch-ab) = adeb6a5bceb15aee05efcf4a7ecd25a0d0197e39 -SHA1 (patch-ac) = 67bf960ab1434050461e682aae9f1f1f030ca88c +SHA1 (patch-aa) = 84d1276a00e30ac66ae1cb142c001cba76fab4a8 +SHA1 (patch-ab) = 08716e6d8983c33f2f9e9df1a7b29f627469576f +SHA1 (patch-ac) = 14f34e14d595e235f9febfaef7a75d332dfe5bdb SHA1 (patch-ad) = 98f5ba97e0052a0e83a0017769bd869ce593c461 -SHA1 (patch-ae) = 6f692c25f35e857fe93dcc0e7a6b9c23337bd72e -SHA1 (patch-af) = 0cd339cceb6af8dcafc5f58ee4855fe72781d609 +SHA1 (patch-ae) = f55536cf3be9c9fc55345a3d21b88500e30807ad +SHA1 (patch-af) = 3d09c0aba56bdce704a923ae7c15673cdb6a7489 SHA1 (patch-ag) = 4616fdfed44467d48962303b8e34ca96b6ac0fc5 diff --git a/net/chrony/patches/patch-aa b/net/chrony/patches/patch-aa index 73272573a3b..b807075c525 100644 --- a/net/chrony/patches/patch-aa +++ b/net/chrony/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/11/30 11:26:59 hannken Exp $ +$NetBSD: patch-aa,v 1.3 2006/01/08 13:27:53 joerg Exp $ --- Makefile.in.orig 2003-09-20 00:48:26.000000000 +0200 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2004/11/30 11:26:59 hannken Exp $ DEFS=@SYSDEFS@ -CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) -+CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) -DDEFAULT_CONF_FILE=\"$(INSTALL_PREFIX)/etc/chrony.conf\" ++CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) -DDEFAULT_CONF_FILE=\"$(PKG_SYSCONFDIR)/chrony.conf\" # Until we have a main procedure we can link, just build object files # to test compilation diff --git a/net/chrony/patches/patch-ab b/net/chrony/patches/patch-ab index c363603970e..ed15dc18a6d 100644 --- a/net/chrony/patches/patch-ab +++ b/net/chrony/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2004/11/30 11:26:59 hannken Exp $ +$NetBSD: patch-ab,v 1.3 2006/01/08 13:27:53 joerg Exp $ --- chrony.conf.5.orig 2002-11-04 00:32:08.000000000 +0100 +++ chrony.conf.5 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 2004/11/30 11:26:59 hannken Exp $ .SH SYNOPSIS -.B /etc/chrony.conf -+.B @PREFIX@/etc/chrony.conf ++.B @PKG_SYSCONFDIR@/chrony.conf .SH DESCRIPTION \fIchrony\fR is a pair of programs for maintaining the accuracy of computer @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 2004/11/30 11:26:59 hannken Exp $ Assuming that you have found some servers, you need to set up a configuration file to run \fIchrony\fR. The (compiled-in) default location -for this file is \fB/etc/chrony.conf\fR. Assuming that your ntp servers -+for this file is \fB@PREFIX@/etc/chrony.conf\fR. Assuming that your ntp servers ++for this file is \fB@PKG_SYSCONFDIR@/chrony.conf\fR. Assuming that your ntp servers are called `a.b.c' and `d.e.f', your \fBchrony.conf\fR file could contain as a minimum @@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.2 2004/11/30 11:26:59 hannken Exp $ server d.e.f server g.h.i - keyfile /etc/chrony.keys -+ keyfile @PREFIX@/etc/chrony.keys ++ keyfile @PKG_SYSCONFDIR@/chrony.keys commandkey 1 - driftfile /etc/chrony.drift + driftfile /var/db/chrony.drift diff --git a/net/chrony/patches/patch-ac b/net/chrony/patches/patch-ac index 0cc7bb27175..e125f58f8ff 100644 --- a/net/chrony/patches/patch-ac +++ b/net/chrony/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2004/11/30 11:26:59 hannken Exp $ +$NetBSD: patch-ac,v 1.3 2006/01/08 13:27:53 joerg Exp $ --- chronyd.8.orig 2002-11-04 00:32:10.000000000 +0100 +++ chronyd.8 @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2004/11/30 11:26:59 hannken Exp $ \fB\-f\fR \fIconf-file\fR This option can be used to specify an alternate location for the -configuration file (default \fI/etc/chrony.conf\fR). -+configuration file (default \fI@PREFIX@/etc/chrony.conf\fR). ++configuration file (default \fI@PKG_SYSCONFDIR@/chrony.conf\fR). .TP .B \-r This option will reload sample histories for each of the servers being used. @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.2 2004/11/30 11:26:59 hannken Exp $ .SH FILES -\fI/etc/chrony.conf\fR -+\fI@PREFIX@/etc/chrony.conf\fR ++\fI@PKG_SYSCONFDIR@/chrony.conf\fR .SH VERSION Version 1.17 diff --git a/net/chrony/patches/patch-ae b/net/chrony/patches/patch-ae index ea51e4387c7..b1a0c667b29 100644 --- a/net/chrony/patches/patch-ae +++ b/net/chrony/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2004/11/30 11:26:59 hannken Exp $ +$NetBSD: patch-ae,v 1.3 2006/01/08 13:27:53 joerg Exp $ --- examples/chrony.conf.example.orig 2002-02-03 22:46:29.000000000 +0100 +++ examples/chrony.conf.example @@ -6,7 +6,7 @@ $NetBSD: patch-ae,v 1.2 2004/11/30 11:26:59 hannken Exp $ # # This is an example chrony configuration file. You should copy it to -# /etc/chrony.conf after uncommenting and editing the options that you -+# @PREFIX@/etc/chrony.conf after uncommenting and editing the options that you ++# @PKG_SYSCONFDIR@/chrony.conf after uncommenting and editing the options that you # want to enable. I have not included the more obscure options. Refer # to the documentation for these. @@ -91,5 +91,5 @@ @@ -20,6 +20,6 @@ $NetBSD: patch-ae,v 1.2 2004/11/30 11:26:59 hannken Exp $ # assumed by default. -keyfile /etc/chrony.keys -+keyfile @PREFIX@/etc/chrony.keys ++keyfile @PKG_SYSCONFDIR@/chrony.keys # Tell chronyd which numbered key in the file is used as the password diff --git a/net/chrony/patches/patch-af b/net/chrony/patches/patch-af index 0a0d19c07db..29096a7338d 100644 --- a/net/chrony/patches/patch-af +++ b/net/chrony/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.2 2004/11/30 11:26:59 hannken Exp $ +$NetBSD: patch-af,v 1.3 2006/01/08 13:27:53 joerg Exp $ --- examples/chrony.keys.example.orig 2002-01-31 01:00:08.000000000 +0100 +++ examples/chrony.keys.example @@ -3,3 +3,3 @@ # -# This is an example chrony keys file. You should copy it to /etc/chrony.keys -+# This is an example chrony keys file. You should copy it to @PREFIX@/etc/chrony.keys ++# This is an example chrony keys file. You should copy it to @PKG_SYSCONFDIR@/chrony.keys # after editing it to set up the key(s) you want to use. In most situations, -- cgit v1.2.3