diff options
author | schmonz <schmonz> | 2005-03-23 00:51:09 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2005-03-23 00:51:09 +0000 |
commit | b190388ff082259fc7e274c61b62d0cf5b94f0ad (patch) | |
tree | 20ee7d90c6ddce888026ccc27abd5458b6b5361c | |
parent | 574548224e5c48916091bf6958b5dde7d01c9f70 (diff) | |
download | pkgsrc-b190388ff082259fc7e274c61b62d0cf5b94f0ad.tar.gz |
Take advantage of mk/djbware.mk.
-rw-r--r-- | databases/cdb/Makefile | 15 | ||||
-rw-r--r-- | devel/bglibs/Makefile | 12 | ||||
-rw-r--r-- | mail/dot-forward/Makefile | 15 | ||||
-rw-r--r-- | mail/ezmlm-idx/Makefile | 7 | ||||
-rw-r--r-- | mail/ezmlm-idx/options.mk | 24 | ||||
-rw-r--r-- | mail/ezmlm/Makefile | 7 | ||||
-rw-r--r-- | mail/ezmlm/Makefile.common | 13 | ||||
-rw-r--r-- | mail/fastforward/Makefile | 15 | ||||
-rw-r--r-- | mail/mess822/Makefile | 16 | ||||
-rw-r--r-- | mail/qmail-conf/Makefile | 13 | ||||
-rw-r--r-- | mail/qmail-qfilter/Makefile | 21 | ||||
-rw-r--r-- | mail/qmail/Makefile | 15 | ||||
-rw-r--r-- | mail/qmailanalog/Makefile | 16 | ||||
-rw-r--r-- | mail/qtools/Makefile | 14 | ||||
-rw-r--r-- | mail/queue-fix/Makefile | 9 | ||||
-rw-r--r-- | mail/safecat/Makefile | 13 | ||||
-rw-r--r-- | math/djbfft/Makefile | 17 | ||||
-rw-r--r-- | net/djbdns/Makefile | 15 | ||||
-rw-r--r-- | net/publicfile/Makefile | 16 | ||||
-rw-r--r-- | net/ucspi-tcp/Makefile | 15 | ||||
-rw-r--r-- | sysutils/checkpassword/Makefile | 15 | ||||
-rw-r--r-- | sysutils/daemontools/Makefile | 13 | ||||
-rw-r--r-- | sysutils/service-config/Makefile | 14 |
23 files changed, 107 insertions, 223 deletions
diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile index 68d6e8c1682..f8fd06c1185 100644 --- a/databases/cdb/Makefile +++ b/databases/cdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/03/13 03:25:43 schmonz Exp $ +# $NetBSD: Makefile,v 1.15 2005/03/23 00:51:09 schmonz Exp $ DISTNAME= cdb-0.75 CATEGORIES= databases @@ -8,26 +8,17 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://cr.yp.to/cdb.html COMMENT= Creates and reads constant databases -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 - INSTALLATION_DIRS= bin include lib -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: ${INSTALL_DATA} ${WRKSRC}/cdb.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/cdb.a ${PREFIX}/lib/libcdb.a +.include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile index 4135ef93062..83214617fcd 100644 --- a/devel/bglibs/Makefile +++ b/devel/bglibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/03/13 03:25:43 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2005/03/23 00:51:09 schmonz Exp $ # DISTNAME= bglibs-1.019 @@ -11,12 +11,10 @@ COMMENT= Collection of libraries by Bruce Guenter USE_BUILDLINK3= yes -do-configure: - ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc - ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld - ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home +BUILD_TARGET= all -do-install: - cd ${WRKSRC} && ./installer && ./instcheck +DJB_RESTRICTED= NO +BGWARE_INSTALLER= YES +.include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" 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" diff --git a/math/djbfft/Makefile b/math/djbfft/Makefile index 15d6a7a47f0..4736ac6a2e7 100644 --- a/math/djbfft/Makefile +++ b/math/djbfft/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= djbfft-0.76 CATEGORIES= math @@ -8,25 +8,19 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://pobox.com/~djb/djbfft.html COMMENT= Extremely fast library for floating-point convolution -BUILD_TARGET= -INSTALL_TARGET= setup check - USE_BUILDLINK3= yes +DJB_RESTRICTED= YES NOT_FOR_PLATFORM= IRIX-*-* -do-configure: - ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc - ${ECHO} ${CC:Q} > ${WRKSRC}/conf-ld - ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home .ifdef(WITH_OPT_PENTIUM) - ${ECHO} pentium > ${WRKSRC}/conf-opt +DJB_CONFIG_CMDS=${ECHO} pentium > conf-opt .endif .ifdef(WITH_OPT_PPRO) - @${ECHO} 'ppro' > ${WRKSRC}/conf-opt +DJB_CONFIG_CMDS=${ECHO} ppro > conf-opt .endif .if (${MACHINE_ARCH} == "sparc") - @${ECHO} 'sparc' > ${WRKSRC}/conf-opt +DJB_CONFIG_CMDS=${ECHO} sparc > conf-opt .endif post-extract: @@ -39,4 +33,5 @@ post-extract: @${ECHO} ' Pentium III like processors.' .endif +.include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" 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" diff --git a/sysutils/checkpassword/Makefile b/sysutils/checkpassword/Makefile index 048ee141984..022c909af32 100644 --- a/sysutils/checkpassword/Makefile +++ b/sysutils/checkpassword/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= checkpassword-0.90 @@ -9,22 +9,13 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://cr.yp.to/checkpwd.html COMMENT= Simple, uniform password-checking interface to all root 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 - INSTALLATION_DIRS= bin -do-configure: - ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc - ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld - ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home - +.include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 044152f2001..1837930e419 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/03/13 03:25:44 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2005/03/23 00:51:10 schmonz Exp $ # FreeBSD Id: ports/sysutils/daemontools/Makefile,v 1.8 2000/12/03 05:16:41 steve Exp DISTNAME= daemontools-0.76 @@ -13,15 +13,12 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://cr.yp.to/daemontools.html COMMENT= Service monitoring and logging utilities by djb -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 SAMPLERC= svscan.sh.sample SERVICEDIR?= ${VARBASE}/spool/service WRKSRC= ${WRKDIR}/admin/${DISTNAME} @@ -32,10 +29,7 @@ DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL INSTALLATION_DIRS= bin man man/man8 share/examples/daemontools -do-configure: - ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/src/conf-cc - ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/src/conf-ld - ${ECHO} ${PREFIX} > ${WRKSRC}/src/conf-home +DJB_CONFIG_DIR= ${WRKSRC}/src do-build: cd ${WRKSRC} && package/compile @@ -63,4 +57,5 @@ post-install: ${INSTALL_DATA_DIR} ${SERVICEDIR} cd ${WRKDIR}/${PKGBASE}-man && ${INSTALL_MAN} *.8 ${PREFIX}/man/man8 +.include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/service-config/Makefile b/sysutils/service-config/Makefile index 143e126b70b..b2e0386b8e0 100644 --- a/sysutils/service-config/Makefile +++ b/sysutils/service-config/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:10 schmonz Exp $ # DISTNAME= service-config-0.51 @@ -14,14 +14,8 @@ DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools BUILD_TARGET= it INSTALL_TARGET= setup check -RESTRICTED= "Possibly inherited DJB-style license would prohibit distribution \ - of modified binary packages" -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} > ${WRKSRC}/conf-home +# Possibly inherited DJB-style distribution terms +DJB_RESTRICTED= YES +.include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" |