diff options
| -rw-r--r-- | devel/bglibs/Makefile | 3 | ||||
| -rw-r--r-- | mail/mailfront/Makefile | 6 | ||||
| -rw-r--r-- | mail/qmail-qfilter/Makefile | 6 | ||||
| -rw-r--r-- | mk/djbware.mk | 16 | ||||
| -rw-r--r-- | sysutils/memtester/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/qlogtools/Makefile | 11 |
6 files changed, 19 insertions, 28 deletions
diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile index af6b58b0c38..a8a9dae7986 100644 --- a/devel/bglibs/Makefile +++ b/devel/bglibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/23 19:33:52 schmonz Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/24 04:47:10 schmonz Exp $ # DISTNAME= bglibs-1.027 @@ -13,6 +13,7 @@ BUILD_TARGET= all INSTALL_TARGET= install DJB_RESTRICTED= NO +DJB_MAKE_TARGETS= NO DJB_CONFIG_CMDS= \ ${ECHO} ${DJB_CONFIG_PREFIX}/include/bglibs > conf-include; \ diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile index 6b305e7249f..449387f33b8 100644 --- a/mail/mailfront/Makefile +++ b/mail/mailfront/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/07/20 03:30:19 schmonz Exp $ +# $NetBSD: Makefile,v 1.2 2005/08/24 04:47:10 schmonz Exp $ # DISTNAME= mailfront-0.96 @@ -14,10 +14,8 @@ DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail DEPENDS+= ${DEPENDS_QMAIL} -BUILD_TARGET= all -INSTALL_TARGET= install - DJB_RESTRICTED= NO +DJB_MAKE_TARGETS= NO USE_PKGINSTALL= YES RCD_SCRIPTS= smtpfront diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile index 4e96059f7bc..b4cf67b501b 100644 --- a/mail/qmail-qfilter/Makefile +++ b/mail/qmail-qfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/08/15 12:58:21 schmonz Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/24 04:47:10 schmonz Exp $ # DISTNAME= qmail-qfilter-2.1 @@ -29,10 +29,8 @@ SUBST_MESSAGE.paths= "Fixing paths." INSTALLATION_DIRS= bin man man/man1 share/examples/qmail-qfilter -BUILD_TARGET= all -INSTALL_TARGET= install - DJB_RESTRICTED= NO +DJB_MAKE_TARGETS= NO .include "../../mk/bsd.prefs.mk" diff --git a/mk/djbware.mk b/mk/djbware.mk index 8597b8d367c..170c23e1109 100644 --- a/mk/djbware.mk +++ b/mk/djbware.mk @@ -1,4 +1,4 @@ -# $NetBSD: djbware.mk,v 1.8 2005/08/19 13:47:26 schmonz Exp $ +# $NetBSD: djbware.mk,v 1.9 2005/08/24 04:47:10 schmonz Exp $ # # Makefile fragment for packages with djb-style build machinery # @@ -12,7 +12,6 @@ # * centralize handling of third-party manpages # * centralize MASTER_SITES and SITES_foo # * centralize compiler hack for arm{,32} -# * phase out BGWARE_INSTALLER (instead, use default INSTALL_TARGET) # * common install script for compatibility with default conf-home pathnames # * PKG_OPTIONS (default): # djbware-errno-hack (off) @@ -28,12 +27,12 @@ DJBWARE_MK= # defined DJB_RESTRICTED?= YES DJB_ERRNO_HACK?= YES +DJB_MAKE_TARGETS?= YES DJB_BUILD_TARGETS?= # empty DJB_INSTALL_TARGETS?= # empty DJB_CONFIG_PREFIX?= ${PREFIX} DJB_CONFIG_HOME?= conf-home DJB_CONFIG_CMDS?= ${DO_NADA} -BGWARE_INSTALLER?= NO .if !empty(DJB_RESTRICTED:M[yY][eE][sS]) RESTRICTED= "modified source and binaries may not be distributed" @@ -41,8 +40,10 @@ NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} .endif +.if !empty(DJB_MAKE_TARGETS:M[yY][eE][sS]) BUILD_TARGET?= it ${DJB_BUILD_TARGETS} INSTALL_TARGET?= setup check ${DJB_INSTALL_TARGETS} +.endif .if !defined(NO_CONFIGURE) && !target(do-configure) do-configure: @@ -67,15 +68,6 @@ do-configure: ${DJB_CONFIG_CMDS} .endif -.if !empty(BGWARE_INSTALLER:M[yY][eE][sS]) -. if !target(do-install) -do-install: - ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ - ./installer; \ - ./instcheck -. endif -.endif - PKG_SUPPORTED_OPTIONS+= djbware-errno-hack PKG_OPTIONS_LEGACY_VARS+= DJB_ERRNO_HACK:djbware-errno-hack diff --git a/sysutils/memtester/Makefile b/sysutils/memtester/Makefile index 2f39b274f0c..47232561013 100644 --- a/sysutils/memtester/Makefile +++ b/sysutils/memtester/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/08/07 11:56:01 schmonz Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/24 04:47:10 schmonz Exp $ # DISTNAME= memtester-4.0.5 @@ -11,9 +11,8 @@ COMMENT= Utility for testing the memory subsystem for faults PKG_INSTALLATION_TYPES= overwrite pkgviews -BUILD_TARGET= all - DJB_RESTRICTED= NO +DJB_MAKE_TARGETS= NO INSTALLATION_DIRS= bin man/man8 share/doc/memtester diff --git a/sysutils/qlogtools/Makefile b/sysutils/qlogtools/Makefile index b2225b83465..97f69bf5129 100644 --- a/sysutils/qlogtools/Makefile +++ b/sysutils/qlogtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/08/07 11:47:55 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2005/08/24 04:47:10 schmonz Exp $ # DISTNAME= qlogtools-3.1 @@ -9,10 +9,13 @@ MAINTAINER= zuntum@NetBSD.org HOMEPAGE= http://untroubled.org/qlogtools/ COMMENT= Tools useful in analyzing logs from qmail and other pkgs -BUILD_TARGET= all - DJB_RESTRICTED= NO -BGWARE_INSTALLER= YES +DJB_MAKE_TARGETS= NO + +do-install: + ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ + ./installer; \ + ./instcheck .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" |