diff options
| -rw-r--r-- | mail/ezmlm-idx/Makefile | 6 | ||||
| -rw-r--r-- | mail/ezmlm/Makefile | 5 | ||||
| -rw-r--r-- | mail/ezmlm/options.mk | 4 | ||||
| -rw-r--r-- | mail/qmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/qmail/options.mk | 4 | ||||
| -rw-r--r-- | mk/defaults/options.description | 1 | ||||
| -rw-r--r-- | mk/djbware.mk | 32 | ||||
| -rw-r--r-- | net/djbdns/Makefile | 4 | ||||
| -rw-r--r-- | net/djbdns/options.mk | 4 |
9 files changed, 32 insertions, 32 deletions
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index ad3466363f5..45bdac90084 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/12 10:58:09 schmonz Exp $ +# $NetBSD: Makefile,v 1.23 2005/08/19 04:44:09 schmonz Exp $ # .include "../../mail/ezmlm/Makefile.common" @@ -32,10 +32,6 @@ CONF_FILES+= ${EGDIR}/ezmlmrc ${PKG_SYSCONFDIR}/ezmlmrc INSTALLATION_DIRS= bin man man/man1 man/man5 man/cat1 man/cat5 INSTALLATION_DIRS+= share/examples/ezmlm-idx -.include "../../mk/bsd.prefs.mk" - -.include "options.mk" - post-extract: @${MV} ${WRKSRC}/* ${WRKDIR}/${EZMLM_VERS} @${RMDIR} ${WRKSRC} diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index af610520c62..69df421e9b1 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/08/19 03:55:00 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2005/08/19 04:44:09 schmonz Exp $ # .include "../../mail/ezmlm/Makefile.common" @@ -20,8 +20,5 @@ 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/options.mk b/mail/ezmlm/options.mk index a4f952fd026..bbc392c4a83 100644 --- a/mail/ezmlm/options.mk +++ b/mail/ezmlm/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.3 2005/07/19 19:41:19 schmonz Exp $ +# $NetBSD: options.mk,v 1.4 2005/08/19 04:44:09 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ezmlm -PKG_SUPPORTED_OPTIONS= ezmlm-althash +PKG_SUPPORTED_OPTIONS+= ezmlm-althash PKG_OPTIONS_LEGACY_OPTS+= althash:ezmlm-althash .if ${OPSYS} == "Darwin" diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index dff346929b0..7f29cbfbedc 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/07/15 18:27:51 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/08/19 04:44:09 schmonz Exp $ # DISTNAME= netqmail-1.05 @@ -71,8 +71,6 @@ INSTALLATION_DIRS+= share/doc/qmail share/examples/qmail/boot share/qmail .include "../../mk/bsd.prefs.mk" -.include "options.mk" - BUILD_DEFS+= QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA .if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*) diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index 9ac7ffae0af..f50d5e719ed 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.14 2005/07/19 19:41:19 schmonz Exp $ +# $NetBSD: options.mk,v 1.15 2005/08/19 04:44:10 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail -PKG_SUPPORTED_OPTIONS= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns +PKG_SUPPORTED_OPTIONS+= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns PKG_SUPPORTED_OPTIONS+= qmail-netqmail qmail-outgoingip qmail-qregex PKG_SUPPORTED_OPTIONS+= qmail-realrcptto qmail-viruscan PKG_OPTIONS_LEGACY_OPTS+= badrcptto:qmail-badrcptto diff --git a/mk/defaults/options.description b/mk/defaults/options.description index 0884ec54300..4b94f6b8c48 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -52,6 +52,7 @@ debug deliver-suid Install deliver executable setuid root. djbdns-ignoreip2 Patch to treat certain responses as NXDOMAIN. djbdns-tinydns64 Patch to fix tinydns-data on 64-bit platforms. +djbware-errno-hack Patch to #include <errno.h> for correctness. domainscale drac Enable DRAC support. dummy diff --git a/mk/djbware.mk b/mk/djbware.mk index da9d13515a5..91219a9fabf 100644 --- a/mk/djbware.mk +++ b/mk/djbware.mk @@ -1,4 +1,4 @@ -# $NetBSD: djbware.mk,v 1.6 2005/08/15 19:44:13 schmonz Exp $ +# $NetBSD: djbware.mk,v 1.7 2005/08/19 04:44:09 schmonz Exp $ # # Makefile fragment for packages with djb-style build machinery # @@ -35,8 +35,6 @@ DJB_CONFIG_HOME?= conf-home DJB_CONFIG_CMDS?= ${DO_NADA} BGWARE_INSTALLER?= NO -BUILD_DEFS+= DJB_ERRNO_HACK - .if !empty(DJB_RESTRICTED:M[yY][eE][sS]) RESTRICTED= "modified source and binaries may not be distributed" NO_BIN_ON_CDROM= ${RESTRICTED} @@ -46,14 +44,6 @@ NO_BIN_ON_FTP= ${RESTRICTED} BUILD_TARGET?= it ${DJB_BUILD_TARGETS} INSTALL_TARGET?= setup check ${DJB_INSTALL_TARGETS} -.if !empty(DJB_ERRNO_HACK:M[yY][eE][sS]) -SUBST_CLASSES+= djbware -SUBST_STAGE.djbware= do-configure -SUBST_FILES.djbware= error.h -SUBST_SED.djbware= -e 's|^extern\ int\ errno\;|\#include \<errno.h\>|' -SUBST_MESSAGE.djbware= "Correcting definition of errno." -.endif - .if !target(do-configure) do-configure: ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ @@ -86,4 +76,24 @@ do-install: . endif .endif +PKG_SUPPORTED_OPTIONS+= djbware-errno-hack +PKG_OPTIONS_LEGACY_VARS+= DJB_ERRNO_HACK:djbware-errno-hack + +.include "../../mk/bsd.prefs.mk" + +.if exists(${PKGDIR}/options.mk) +. include "${PKGDIR}/options.mk" +.else +PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGBASE} +.include "../../mk/bsd.options.mk" +.endif + +.if !empty(PKG_OPTIONS:Mdjbware-errno-hack) +SUBST_CLASSES+= djbware +SUBST_STAGE.djbware= do-configure +SUBST_FILES.djbware= error.h +SUBST_SED.djbware= -e 's|^extern\ int\ errno\;|\#include \<errno.h\>|' +SUBST_MESSAGE.djbware= "Correcting definition of errno." +.endif + .endif # DJBWARE_MK diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index 6c7b664d43d..52b0600435a 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/08/19 03:55:00 schmonz Exp $ +# $NetBSD: Makefile,v 1.48 2005/08/19 04:44:10 schmonz Exp $ DISTNAME= djbdns-1.05 PKGREVISION= 7 @@ -33,8 +33,6 @@ GCC_REQD+= 3.0 INSTALLATION_DIRS= bin man man/man1 man/man5 man/man8 share/examples/djbdns -.include "options.mk" - post-install: cd ${WRKDIR}/*-man; for i in 1 5 8; do \ for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \ diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk index 9effacd3b49..da5d64132f1 100644 --- a/net/djbdns/options.mk +++ b/net/djbdns/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.5 2005/07/19 19:41:19 schmonz Exp $ +# $NetBSD: options.mk,v 1.6 2005/08/19 04:44:10 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns -PKG_SUPPORTED_OPTIONS= inet6 djbdns-ignoreip2 djbdns-tinydns64 +PKG_SUPPORTED_OPTIONS+= inet6 djbdns-ignoreip2 djbdns-tinydns64 PKG_OPTIONS_LEGACY_OPTS+= ignoreip2:djbdns-ignoreip2 PKG_OPTIONS_LEGACY_OPTS+= tinydns64:djbdns-tinydns64 |