From e6d59391bf49cd935506fe6ea329df8376684448 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Wed, 23 Mar 2005 00:51:09 +0000
Subject: Take advantage of mk/djbware.mk.

---
 net/djbdns/Makefile     | 15 +++------------
 net/publicfile/Makefile | 16 ++++------------
 net/ucspi-tcp/Makefile  | 15 +++------------
 3 files changed, 10 insertions(+), 36 deletions(-)

(limited to 'net')

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index b93cbe22642..ac3265b58cc 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/03/21 04:03:35 schmonz Exp $
+# $NetBSD: Makefile,v 1.40 2005/03/23 00:51:10 schmonz Exp $
 # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp
 #
 
@@ -22,12 +22,7 @@ USE_BUILDLINK3=		yes
 # We change conf-home from the default "/usr/local" and don't
 # provide compatibility symlinks. We also patch to honor PKG_SYSCONFDIR
 # and to set reasonable permissions on standard pkgsrc directories.
-RESTRICTED=		"modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-
-BUILD_TARGET=		it
-INSTALL_TARGET=		setup check
+DJB_RESTRICTED=		YES
 
 EGDIR=			${PREFIX}/share/examples/djbdns
 CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
@@ -49,14 +44,10 @@ CFLAGS+=		--include errno.h
 
 .include "options.mk"
 
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-
 post-install:
 	cd ${WRKDIR}/djbdns-man; for i in 1 5 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 --git a/net/publicfile/Makefile b/net/publicfile/Makefile
index 3c85af07aea..5ebb1548003 100644
--- a/net/publicfile/Makefile
+++ b/net/publicfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2005/03/23 00:51:10 schmonz Exp $
 #
 
 DISTNAME=		publicfile-0.52
@@ -12,16 +12,8 @@ COMMENT=		Secure read-only HTTP and FTP servers
 DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
 DEPENDS+=		ucspi-tcp-[0-9]*:../../net/ucspi-tcp
 
-BUILD_TARGET=		it
-INSTALL_TARGET=		setup check
-
-RESTRICTED=		"unsure of djb's license"
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX}/publicfile > ${WRKSRC}/conf-home
+DJB_RESTRICTED=		YES
+DJB_CONFIG_PREFIX=	${PREFIX}/publicfile
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index da37910ec8b..fe5a5d55a9a 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.22 2005/03/23 00:51:10 schmonz Exp $
 # FreeBSD Id: ports/sysutils/ucspi-tcp/Makefile,v 1.12 2000/07/10 01:41:24 steve Exp
 
 DISTNAME=	ucspi-tcp-0.88
@@ -13,32 +13,23 @@ MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://cr.yp.to/ucspi-tcp.html
 COMMENT=	Command-line tools for building TCP client-server applications
 
-RESTRICTED=	"modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
+DJB_RESTRICTED=	YES
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=	yes
 
-BUILD_TARGET=	it
-INSTALL_TARGET=	setup check
-
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=	3.0
 .endif
 
 INSTALLATION_DIRS=	bin man man/man1
 
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-
 post-install:
 	cd ${WRKDIR}/${DISTNAME}-man &&					\
 	for i in *.1; do						\
 		${INSTALL_MAN} $${i} ${PREFIX}/man/man1;		\
 	done
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3