pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Standardize handling of additional distfiles (such as ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/23ea8f3a2e37
branches:  trunk
changeset: 492313:23ea8f3a2e37
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sat Apr 09 22:36:56 2005 +0000

description:
Standardize handling of additional distfiles (such as externally
supplied manual pages) across djbware.

diffstat:

 mail/qmail-conf/Makefile      |   8 ++++----
 net/djbdns/Makefile           |   6 +++---
 net/ucspi-tcp/Makefile        |  17 ++++++++---------
 sysutils/daemontools/Makefile |  16 +++++++++-------
 sysutils/daemontools/distinfo |   8 ++++----
 5 files changed, 28 insertions(+), 27 deletions(-)

diffs (147 lines):

diff -r de24cc4bdd9b -r 23ea8f3a2e37 mail/qmail-conf/Makefile
--- a/mail/qmail-conf/Makefile  Sat Apr 09 19:53:38 2005 +0000
+++ b/mail/qmail-conf/Makefile  Sat Apr 09 22:36:56 2005 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2005/03/23 00:51:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/09 22:36:56 schmonz Exp $
 #
 
 DISTNAME=              qmail-conf-0.60
 PKGREVISION=           3
 CATEGORIES=            mail
-MASTER_SITES=          http://www.din.or.jp/~ushijima/qmail-conf/      \
-                       http://cr.yp.to/djbdns/                         \
-                       ftp://cr.yp.to/djbdns/
+MASTER_SITES=          http://www.din.or.jp/~ushijima/qmail-conf/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
@@ -18,6 +16,8 @@
 DEPENDS+=              qmail>=1.03nb7:../../mail/qmail
 DEPENDS+=              ucspi-tcp>=0.86:../../net/ucspi-tcp
 
+SITES_djbdns-1.05.tar.gz=      http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
+
 USE_BUILDLINK3=                yes
 
 DJB_RESTRICTED=                NO
diff -r de24cc4bdd9b -r 23ea8f3a2e37 net/djbdns/Makefile
--- a/net/djbdns/Makefile       Sat Apr 09 19:53:38 2005 +0000
+++ b/net/djbdns/Makefile       Sat Apr 09 22:36:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/03/24 21:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2005/04/09 22:36:56 schmonz Exp $
 
 DISTNAME=              djbdns-1.05
 PKGREVISION=           6
@@ -10,7 +10,7 @@
 HOMEPAGE=              http://cr.yp.to/djbdns.html
 COMMENT=               Collection of secure and reliable DNS tools
 
-MANPAGES=              djbdns-1.05-man-20031023.tar.gz
+MANPAGES=              ${DISTNAME}-man-20031023.tar.gz
 SITES_${MANPAGES}=     http://smarden.org/pape/djb/manpages/
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
@@ -38,7 +38,7 @@
 .include "options.mk"
 
 post-install:
-       cd ${WRKDIR}/djbdns-man; for i in 1 5 8; do                      \
+       cd ${WRKDIR}/*-man; for i in 1 5 8; do                          \
        for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \
        done
 
diff -r de24cc4bdd9b -r 23ea8f3a2e37 net/ucspi-tcp/Makefile
--- a/net/ucspi-tcp/Makefile    Sat Apr 09 19:53:38 2005 +0000
+++ b/net/ucspi-tcp/Makefile    Sat Apr 09 22:36:56 2005 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.24 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/09 22:36:56 schmonz Exp $
 
 DISTNAME=              ucspi-tcp-0.88
 CATEGORIES=            sysutils net
-MASTER_SITES=          http://cr.yp.to/ucspi-tcp/                      \
-                       ftp://cr.yp.to/djbdns/                          \
-                       ftp://ftp.innominate.org/pub/pape/djb/
-DISTFILES=             ${DISTNAME}.tar.gz                              \
-                       ${DISTNAME}-man-20010502.tar.gz
+MASTER_SITES=          http://cr.yp.to/ucspi-tcp/ ftp://cr.yp.to/ucspi-tcp/
+DISTFILES=             ${DISTNAME}.tar.gz ${MANPAGES}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://cr.yp.to/ucspi-tcp.html
 COMMENT=               Command-line tools for building TCP client-server applications
 
+MANPAGES=              ${DISTNAME}-man-20010502.tar.gz
+SITES_${MANPAGES}=     http://smarden.org/pape/djb/manpages/
+
 DJB_RESTRICTED=                YES
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
@@ -25,9 +25,8 @@
 INSTALLATION_DIRS=     bin man man/man1
 
 post-install:
-       cd ${WRKDIR}/${DISTNAME}-man &&                                 \
-       for i in *.1; do                                                \
-               ${INSTALL_MAN} $${i} ${PREFIX}/man/man1;                \
+       cd ${WRKDIR}/*-man; for i in 1; do                              \
+       for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \
        done
 
 .include "../../mk/djbware.mk"
diff -r de24cc4bdd9b -r 23ea8f3a2e37 sysutils/daemontools/Makefile
--- a/sysutils/daemontools/Makefile     Sat Apr 09 19:53:38 2005 +0000
+++ b/sysutils/daemontools/Makefile     Sat Apr 09 22:36:56 2005 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.20 2005/03/24 21:13:01 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/09 22:36:56 schmonz Exp $
 
 DISTNAME=              daemontools-0.76
 CATEGORIES=            sysutils
-MASTER_SITES=          http://cr.yp.to/daemontools/                    \
-                       ftp://cr.yp.to/daemontools/                     \
-                       http://smarden.org/pape/djb/manpages/
-DISTFILES=             ${DISTNAME}.tar.gz                              \
-                       ${DISTNAME}-man.tar.gz
+MASTER_SITES=          http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://cr.yp.to/daemontools.html
 COMMENT=               Service monitoring and logging utilities by djb
 
+MANPAGES=              ${DISTNAME}-man-20020131.tar.gz
+SITES_${MANPAGES}=     http://smarden.org/pape/djb/manpages/
+
 DJB_RESTRICTED=                YES
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
@@ -54,7 +54,9 @@
        ${INSTALL_DATA} ${WRKDIR}/${SAMPLERC}                           \
                ${PREFIX}/share/examples/daemontools
        ${INSTALL_DATA_DIR} ${SERVICEDIR}
-       cd ${WRKDIR}/${PKGBASE}-man && ${INSTALL_MAN} *.8 ${PREFIX}/man/man8
+       cd ${WRKDIR}/*-man; for i in 8; do                              \
+       for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \
+       done
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r de24cc4bdd9b -r 23ea8f3a2e37 sysutils/daemontools/distinfo
--- a/sysutils/daemontools/distinfo     Sat Apr 09 19:53:38 2005 +0000
+++ b/sysutils/daemontools/distinfo     Sat Apr 09 22:36:56 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:40:51 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/04/09 22:36:56 schmonz Exp $
 
 SHA1 (daemontools-0.76.tar.gz) = 70a1be67e7dbe0192a887905846acc99ad5ce5b7
 RMD160 (daemontools-0.76.tar.gz) = 9819dae18b3f15a366e49fea81ecef76d5b4f53f
 Size (daemontools-0.76.tar.gz) = 36975 bytes
-SHA1 (daemontools-0.76-man.tar.gz) = 28e167def0e457f2be10aa90504c402fa08723ab
-RMD160 (daemontools-0.76-man.tar.gz) = d82f0bad55f0751fdfadfa0f3bf2883740fa65d9
-Size (daemontools-0.76-man.tar.gz) = 8005 bytes
+SHA1 (daemontools-0.76-man-20020131.tar.gz) = 28e167def0e457f2be10aa90504c402fa08723ab
+RMD160 (daemontools-0.76-man-20020131.tar.gz) = d82f0bad55f0751fdfadfa0f3bf2883740fa65d9
+Size (daemontools-0.76-man-20020131.tar.gz) = 8005 bytes



Home | Main Index | Thread Index | Old Index