From 6b25bba79076e807ecfcef07316cf15a668d90ba Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Sat, 9 Apr 2005 22:36:56 +0000
Subject: Standardize handling of additional distfiles (such as externally
 supplied manual pages) across djbware.

---
 net/djbdns/Makefile    |  6 +++---
 net/ucspi-tcp/Makefile | 17 ++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'net')

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 5aeb397988f..9cb82380bdc 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -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 @@ MAINTAINER=		schmonz@NetBSD.org
 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 @@ INSTALLATION_DIRS=	bin man man/man1 man/man5 man/man8 share/examples/djbdns
 .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 --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index 44906dd4bfa..ff5fbc9faf3 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -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
 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 @@ GCC_REQD+=		3.0
 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"
-- 
cgit v1.2.3