Take advantage of mk/djbware.mk.

14 files changed, 72 insertions, 126 deletions

diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index 7109025df05..a4daf59ff1f 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=		dot-forward-0.71
@@ -14,16 +14,9 @@ DEPENDS+=		qmail>=1.03nb7:../../mail/qmail
 
 USE_BUILDLINK3=		yes
 
-BUILD_TARGET=		it install instcheck
-INSTALL_TARGET=		setup check
+DJB_BUILD_TARGETS=	install instcheck
 
-RESTRICTED=		"modified source and binaries may not be distributed"
-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} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+DJB_RESTRICTED=		YES
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 2508da61278..e6f04a5da1e 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/13 03:33:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.18 2005/03/23 00:51:09 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -20,9 +20,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_BUILDLINK3=		yes
 
 # ezmlm-idx is a modification of the ezmlm source.
-RESTRICTED=		"modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
+DJB_RESTRICTED=		YES
 
 USE_PKGINSTALL=		YES
 
@@ -55,4 +53,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ezmlmglrc ${EGDIR}/ezmlmglrc
 	${INSTALL_DATA} ${WRKSRC}/ezmlmsubrc ${EGDIR}/ezmlmsubrc
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk
index 171dfed00fa..86cd065cf98 100644
--- a/mail/ezmlm-idx/options.mk
+++ b/mail/ezmlm-idx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2004/12/21 03:42:25 schmonz Exp $
+# $NetBSD: options.mk,v 1.6 2005/03/23 00:51:09 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm-idx
 PKG_SUPPORTED_OPTIONS=	mysql pgsql
@@ -20,9 +20,14 @@ PKG_FAIL_REASON+=       "MySQL and PostgreSQL cannot both be compiled in." \
 .  include "../../mk/mysql.buildlink3.mk"
 .  if !target(post-configure)
 post-configure:
-	${ECHO} -I${BUILDLINK_PREFIX.mysql-client}/include/mysql > ${WRKSRC}/sub_mysql/conf-sqlcc
-	${ECHO} -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql -lmysqlclient > ${WRKSRC}/sub_mysql/conf-sqlld
-	${ECHO} mysql > ${WRKSRC}/conf-sub
+	cd ${WRKSRC};							\
+	${ECHO} -I${BUILDLINK_PREFIX.mysql-client}/include/mysql	\
+		> sub_mysql/conf-sqlcc;					\
+	${ECHO} -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql 		\
+		-Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
+		-lmysqlclient						\
+		> sub_mysql/conf-sqlld;					\
+	${ECHO} mysql > conf-sub
 .  else
 PKG_FAIL_REASON+=	"mysql: can't define post-configure target"
 .  endif
@@ -35,9 +40,14 @@ PKG_FAIL_REASON+=	"mysql: can't define post-configure target"
 .  include "../../mk/pgsql.buildlink3.mk"
 .  if !target(post-configure)
 post-configure:
-	${ECHO} -I${PGSQL_PREFIX}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc
-	${ECHO} -L${PGSQL_PREFIX}/lib -Wl,-R${PGSQL_PREFIX}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld
-	${ECHO} pgsql > ${WRKSRC}/conf-sub
+	cd ${WRKSRC};							\
+	${ECHO} -I${PGSQL_PREFIX}/include				\
+		> sub_pgsql/conf-sqlcc;					\
+	${ECHO} -L${PGSQL_PREFIX}/lib					\
+		-Wl,-R${PGSQL_PREFIX}/lib				\
+		-lpq							\
+		> sub_pgsql/conf-sqlld;					\
+	${ECHO} pgsql > conf-sub
 .  else
 PKG_FAIL_REASON+=	"pgsql: can't define post-configure target"
 .  endif
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 3a344b11a93..6f3e81bdb35 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/01/08 17:54:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/23 00:51:09 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -18,13 +18,12 @@ USE_BUILDLINK3=		yes
 
 # We change conf-bin and conf-man from the default "/usr/local"
 # and don't provide compatibility symlinks.
-RESTRICTED=		"modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
+DJB_RESTRICTED=		YES
 
 INSTALLATION_DIRS=	bin man man/man1 man/man5 man/cat1 man/cat5
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm/Makefile.common b/mail/ezmlm/Makefile.common
index 70e0f56c34d..7516a918e5d 100644
--- a/mail/ezmlm/Makefile.common
+++ b/mail/ezmlm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/03/23 00:51:09 schmonz Exp $
 #
 
 EZMLM_VERS=	ezmlm-0.53
@@ -11,12 +11,5 @@ DEPENDS+=	qmail>=1.03:../../mail/qmail
 
 PLIST_SRC=	../../mail/ezmlm/PLIST.common
 
-BUILD_TARGET=	it man install
-INSTALL_TARGET=	setup
-
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
-	${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
-	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+DJB_BUILD_TARGETS=	man install
+INSTALL_TARGET=		setup
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 05462e2734e..32951606910 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=		fastforward-0.51
@@ -16,16 +16,9 @@ CONFLICTS+=		postfix-[0-9]* sendmail-[0-9]*
 
 USE_BUILDLINK3=		yes
 
-BUILD_TARGET=		it install instcheck
-INSTALL_TARGET=		setup check
+DJB_BUILD_TARGETS=	install instcheck
 
-RESTRICTED=		"modified source and binaries may not be distributed"
-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} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+DJB_RESTRICTED=		YES
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index 5451920fe4a..6ee429e3ebc 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=		mess822-0.58
@@ -15,9 +15,7 @@ DEPENDS+=		qmail>=1.03nb7:../../mail/qmail
 # provide compatibilbity symlinks. We also patch hier.c to respect
 # PKG_SYSCONFDIR and set reasonable modes on directories under
 # ${PREFIX}, and patch strerr_sys.c to build on Mac OS X.
-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
 
@@ -29,16 +27,10 @@ USE_PKGINSTALL=		yes
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 SUPPORT_FILES+=		${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
 
-BUILD_TARGET=		it install instcheck
-INSTALL_TARGET=		setup check
+DJB_BUILD_TARGETS=	install instcheck
 
 INSTALLATION_DIRS=	bin include lib man man/cat1 man/cat3 man/cat5 man/cat8
 INSTALLATION_DIRS+=	man/man1 man/man3 man/man5 man/man8 share/examples/mess822
 
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
-
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 7cb22020760..6c437457f9e 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=		qmail-conf-0.60
@@ -20,16 +20,11 @@ DEPENDS+=		ucspi-tcp>=0.86:../../net/ucspi-tcp
 
 USE_BUILDLINK3=		yes
 
-BUILD_TARGET=		it
-INSTALL_TARGET= 	setup check
-
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ucspi-tcp
-	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+DJB_RESTRICTED=		NO
+DJB_CONFIG_CMDS=	${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ucspi-tcp
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE} -f Makefile.ini djbdns="../djbdns-1.05"
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index 5cb9281ed89..9d90c3973b7 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2005/03/23 00:51:10 schmonz Exp $
 #
 
 DISTNAME=		qmail-qfilter-2.0
@@ -30,18 +30,16 @@ SUBST_MESSAGE.paths=	"Fixing paths."
 
 INSTALLATION_DIRS=	bin man man/man1 share/examples/qmail-qfilter
 
-.include "../../mk/bsd.prefs.mk"
+BUILD_TARGET=		all
+
+DJB_RESTRICTED=		NO
+BGWARE_INSTALLER=	YES
+DJB_CONFIG_CMDS=	${ECHO} ${PREFIX}/include/bglibs > ${WRKSRC}/conf-bgincs;
+DJB_CONFIG_CMDS+=	${ECHO} ${PREFIX}/lib/bglibs > ${WRKSRC}/conf-bglibs
 
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
-	${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
-	${ECHO} ${PREFIX}/include/bglibs > ${WRKSRC}/conf-bgincs
-	${ECHO} ${PREFIX}/lib/bglibs > ${WRKSRC}/conf-bglibs
+.include "../../mk/bsd.prefs.mk"
 
-do-install:
-	cd ${WRKSRC} && ./installer && ./instcheck
+post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qmail-qfilter
 	for i in ${REPLACE_PERL}; do					\
 		${INSTALL_SCRIPT} ${WRKSRC}/$${i}			\
@@ -49,4 +47,5 @@ do-install:
 	done
 
 .include "../../devel/bglibs/buildlink3.mk"
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 906dae86e7a..36a52a9a258 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=		netqmail-1.05
@@ -32,12 +32,9 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
 
-BUILD_TARGET= 		it man
-INSTALL_TARGET=		setup check
+DJB_BUILD_TARGETS= 	man
 
-RESTRICTED=		"modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
+DJB_RESTRICTED=		YES
 NO_PACKAGE=		"needs work to function properly as a binary package"
 
 USE_PKGINSTALL=		yes
@@ -99,11 +96,6 @@ post-extract:
 	export extract_file; cd ${WRKSRC}; ${EXTRACT_CMD};		\
 	${MV} ${PKGNAME_NOREV} ..; ${MV} ${DISTNAME}.patch ..
 
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
-
 post-build:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/README.pkgsrc            \
 		> ${WRKDIR}/README.pkgsrc
@@ -132,4 +124,5 @@ post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/$$i ${SHAREDIR}/setup;	\
 	done
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 872f45021d2..3fb30690f92 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2005/03/23 00:51:10 schmonz Exp $
 #
 
 DISTNAME=		qmailanalog-0.70
@@ -11,16 +11,8 @@ COMMENT=		Collection of tools to help analyze qmail's activity
 
 USE_BUILDLINK3=		yes
 
-BUILD_TARGET=		it
-INSTALL_TARGET=		setup check
-
-RESTRICTED=		"modified source and binaries may not be distributed"
-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}/qmailanalog > ${WRKSRC}/conf-home
+DJB_RESTRICTED=		YES
+DJB_CONFIG_PREFIX=	${PREFIX}/qmailanalog
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index b8188c50629..aa5d594e306 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2005/03/23 00:51:10 schmonz Exp $
 #
 
 DISTNAME=	qtools-0.56
@@ -14,14 +14,8 @@ DEPENDS+=	qmail>=1.03:../../mail/qmail
 
 USE_BUILDLINK3=	yes
 
-BUILD_TARGET=	it
-INSTALL_TARGET=	setup check
-
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
-	${ECHO} ${PREFIX} > ${WRKSRC}/conf-ezmlm
-	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+DJB_RESTRICTED=	NO
+DJB_CONFIG_CMDS=${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ezmlm
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index 14477dc8959..360fe8fe944 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/23 00:51:10 schmonz Exp $
 #
 
 DISTNAME=		queue-fix
@@ -14,16 +14,13 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 USE_BUILDLINK3=		yes
 
-BUILD_TARGET=		it
-
 INSTALLATION_DIRS=	bin share/doc/queue-fix
 
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+DJB_RESTRICTED=		NO
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/queue-fix ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/queue-fix
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/safecat/Makefile b/mail/safecat/Makefile
index 2b4ffa5c2b8..cf2044d1525 100644
--- a/mail/safecat/Makefile
+++ b/mail/safecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/23 00:51:10 schmonz Exp $
 #
 
 DISTNAME=		safecat-1.12
@@ -11,12 +11,9 @@ COMMENT=		Write data safely to a maildir
 
 USE_BUILDLINK3=		yes
 
-BUILD_TARGET=		it install instcheck
-INSTALL_TARGET=		setup check
-
-do-configure:
-	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX} > ${WRKSRC}/conf-root
+DJB_RESTRICTED=		NO
+DJB_BUILD_TARGETS=	install instcheck
+DJB_CONFIG_HOME=	conf-root
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"