diff options
author | jlam <jlam@pkgsrc.org> | 2003-08-26 21:58:05 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2003-08-26 21:58:05 +0000 |
commit | 665434d39196587261ab8ec13eec41f7dcd63aa5 (patch) | |
tree | 0b3b143cff0cba9be49d9d85791e297019b64677 | |
parent | 27bad764952c2d22b8638d883207522ff3dcc3c1 (diff) | |
download | pkgsrc-665434d39196587261ab8ec13eec41f7dcd63aa5.tar.gz |
Sync to HEAD
-rw-r--r-- | mk/bsd.pkg.defaults.mk | 15 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 31 | ||||
-rw-r--r-- | mk/bulk/pre-build | 4 | ||||
-rw-r--r-- | mk/defs.Darwin.mk | 3 | ||||
-rw-r--r-- | mk/defs.FreeBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.IRIX.mk | 3 | ||||
-rw-r--r-- | mk/defs.Linux.mk | 10 | ||||
-rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.OpenBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.SunOS.mk | 3 | ||||
-rw-r--r-- | mk/tools.mk | 41 |
11 files changed, 91 insertions, 28 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index c50622a3958..fefa983a63c 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.160.2.7 2003/08/16 09:08:47 jlam Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.160.2.8 2003/08/26 21:58:05 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -1318,6 +1318,19 @@ MUTT_USE_SSL?= YES # Possible: any directory # Default: /var/mysql +#MYSQL_CHARSET= latin1 +# default character set of mysql. +# Possible: big5, cp1251, cp1257, croat, czech, danish, dec8, dos, estonia, +# euc_kr, gb2312, gbk, german1, greek, hebrew, hp8, hungarian, +# koi8_ru, koi8_ukr, latin1, latin2, latin5, swe7, usa7, win1250, +# win1251ukr, ujis, sjis and tis620 +# Default: latin1 + +#MYSQL_EXTRA_CHARSET= all +# additional charsets to be compiled in mysql. +# Possible: none, compolex, all or list selected from MYSQL_CHARSET's +# possible values. + NMH_EDITOR?= vi # default editor for use in nmh. # Possible: any editor. diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f704f952d19..fb82760a01a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216.2.35 2003/08/26 21:52:09 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216.2.36 2003/08/26 21:58:05 jlam Exp $ # # This file is in the public domain. # @@ -207,17 +207,24 @@ PKG_FAIL_REASON+= "${PKGNAME} uses imake, but the buildlink-x11 package was foun . endif .endif # USE_IMAKE +.if defined(USE_GNU_TOOLS) && !empty(USE_GNU_TOOLS:Mmake) +_USE_GMAKE= yes +.endif + +# XXX USE_GMAKE is redundant since USE_GNU_TOOLS+=make accomplishes the +# XXX same thing but by using the more general tools.mk framework. This +# XXX variable should eventually be reaped from pkgsrc. +# .if defined(USE_GMAKE) -. if ${_OPSYS_HAS_GMAKE} == "no" -BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake -. endif +_USE_GMAKE= yes +.endif + +.if defined(_USE_GMAKE) MAKE_PROGRAM= ${GMAKE} -.else -. if defined(USE_IMAKE) +.elif defined(USE_IMAKE) MAKE_PROGRAM= ${_IMAKE_MAKE} -. else +.else MAKE_PROGRAM= ${MAKE} -. endif .endif CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}" @@ -2352,6 +2359,12 @@ do-install: real-su-package: ${PLIST} ${DESCR} ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO_MSG} "${_PKGSRC_IN}> Building binary package for ${PKGNAME}"; \ + if ${PKG_INFO} -qe ${PKGNAME}; then \ + : The package is installed. ; \ + else \ + ${ECHO_MSG} "=> ${PKGNAME} is not installed."; \ + exit 1; \ + fi; \ if [ ! -d ${PKGREPOSITORY} ]; then \ ${MKDIR} ${PKGREPOSITORY}; \ if [ $$? -ne 0 ]; then \ @@ -4468,7 +4481,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} . if defined(USE_PERL5) && (${USE_PERL5} == "run") @${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${BUILD_INFO_FILE} . endif -. ifdef USE_GMAKE +. ifdef _USE_GMAKE @${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${BUILD_INFO_FILE} . endif . if ${CHECK_SHLIBS} == "YES" diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build index 79e2a0c4f8e..fd2386c8de1 100644 --- a/mk/bulk/pre-build +++ b/mk/bulk/pre-build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: pre-build,v 1.27.2.2 2003/08/22 07:15:48 jlam Exp $ +# $NetBSD: pre-build,v 1.27.2.3 2003/08/26 21:58:07 jlam Exp $ # # Clean up system to be ready for bulk pkg build # @@ -120,6 +120,8 @@ rm -fr /nonexistent # broken useradd on pop3d rm -fr /home/majordom # mail/majordomo pkg rm -fr /home/nut # sysutils/ups-net rm -fr /var/wwwoffle # www/wwwoffle +rm -fr /tmp/config-guess-* +rm -fr /tmp/mod* # Clean up state files diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 146bfe2f930..7e46d53d37b 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.50.2.1 2003/08/23 09:45:55 jlam Exp $ +# $NetBSD: defs.Darwin.mk,v 1.50.2.2 2003/08/26 21:58:06 jlam Exp $ # # Variable definitions for the Darwin operating system. @@ -103,7 +103,6 @@ IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # on installation, fixup PLIST for shared libs _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake -_OPSYS_HAS_GMAKE= yes # GNU make is standard .if ${OS_VERSION} >= 6.0 _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk index e2a4c13b293..9ede7346dcf 100644 --- a/mk/defs.FreeBSD.mk +++ b/mk/defs.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.FreeBSD.mk,v 1.21 2003/04/15 05:29:46 grant Exp $ +# $NetBSD: defs.FreeBSD.mk,v 1.21.4.1 2003/08/26 21:58:06 jlam Exp $ # # Variable definitions for the FreeBSD operating system. @@ -118,7 +118,6 @@ IMAKE_MANNEWSUFFIX= 0 _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake -_OPSYS_HAS_GMAKE= no # GNU make is not standard .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk index 2fa3d35a8d3..36c98d46f80 100644 --- a/mk/defs.IRIX.mk +++ b/mk/defs.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.IRIX.mk,v 1.30 2003/07/11 15:40:19 jschauma Exp $ +# $NetBSD: defs.IRIX.mk,v 1.30.4.1 2003/08/26 21:58:06 jlam Exp $ # # Variable definitions for the IRIX operating system. @@ -107,7 +107,6 @@ IMAKE_MANNEWSUFFIX= z _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake -_OPSYS_HAS_GMAKE= no # GNU make is not standard .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index a7e20e03a7b..c396bb5ed0f 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.53 2003/06/06 19:07:42 jschauma Exp $ +# $NetBSD: defs.Linux.mk,v 1.53.2.1 2003/08/26 21:58:07 jlam Exp $ # # Variable definitions for the Linux operating system. @@ -37,7 +37,12 @@ FGREP?= /usr/bin/fgrep .endif FILE_CMD?= /usr/bin/file FIND?= /usr/bin/find +.if exists(/usr/bin/make) GMAKE?= /usr/bin/make +_TOOLS_OPSYS_HAS_GNU.make+= ${MACHINE_PLATFORM} +.else +GMAKE?= ${LOCALBASE}/bin/gmake +.endif .if exists(/bin/grep) GREP?= /bin/grep .elif exists(/usr/bin/grep) @@ -126,7 +131,7 @@ MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type NOLOGIN?= ${FALSE} PKG_TOOLS_BIN?= ${ZOULARISBASE}/sbin ROOT_CMD?= ${SU} - root -c -ROOT_GROUP?= wheel +ROOT_GROUP?= root ROOT_USER?= root SERIAL_DEVICES?= /dev/null ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` @@ -148,7 +153,6 @@ IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake -_OPSYS_HAS_GMAKE= yes # GNU make is standard .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 55a5d70576e..6572198c106 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.49.2.4 2003/08/23 03:24:46 jlam Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.49.2.5 2003/08/26 21:58:07 jlam Exp $ # # Variable definitions for the NetBSD operating system. @@ -114,7 +114,6 @@ IMAKE_MANNEWSUFFIX= 0 _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake -_OPSYS_HAS_GMAKE= no # GNU make is not standard .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk index 45aa8fb97b4..f98c9a0e75a 100644 --- a/mk/defs.OpenBSD.mk +++ b/mk/defs.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.OpenBSD.mk,v 1.17 2003/04/15 05:29:47 grant Exp $ +# $NetBSD: defs.OpenBSD.mk,v 1.17.4.1 2003/08/26 21:58:07 jlam Exp $ # # Variable definitions for the OpenBSD operating system. @@ -110,7 +110,6 @@ IMAKE_MANNEWSUFFIX= 0 _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake -_OPSYS_HAS_GMAKE= no # GNU make is not standard .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index f189fb6379a..dfc6e8759fe 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.62.2.4 2003/08/23 09:45:55 jlam Exp $ +# $NetBSD: defs.SunOS.mk,v 1.62.2.5 2003/08/26 21:58:07 jlam Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -118,7 +118,6 @@ IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs _IMAKE_MAKE= /usr/ccs/bin/make # program which gets invoked by imake -_OPSYS_HAS_GMAKE= no # GNU make is not standard .if exists(/usr/include/netinet/ip6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/tools.mk b/mk/tools.mk index 286040ece4a..cd778d112c1 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.mk,v 1.4.2.4 2003/08/19 20:11:09 jlam Exp $ +# $NetBSD: tools.mk,v 1.4.2.5 2003/08/26 21:58:07 jlam Exp $ # # This Makefile creates a ${TOOLS_DIR} directory and populates the bin # subdir with tools that hide the ones outside of ${TOOLS_DIR}. @@ -113,7 +113,7 @@ ${TOOLS_DIR}/bin/makeinfo: ${_GNU_MISSING} # defining e.g. USE_GNU_TOOLS+="awk sed". Version numbers are not # considered. -_TOOLS= awk grep sed +_TOOLS= awk grep make sed .if defined(_IGNORE_USE_GNU_TOOLS) USE_GNU_TOOLS:= # empty @@ -128,6 +128,7 @@ USE_GNU_TOOLS?= # empty _TOOLS_OPSYS_HAS_GNU.awk+= FreeBSD-*-* Linux-*-* NetBSD-*-* OpenBSD-*-* _TOOLS_OPSYS_HAS_GNU.grep+= Darwin-*-* FreeBSD-*-* Linux-*-* _TOOLS_OPSYS_HAS_GNU.grep+= NetBSD-*-* OpenBSD-*-* +_TOOLS_OPSYS_HAS_GNU.make+= Darwin-*-* _TOOLS_OPSYS_HAS_GNU.sed+= Linux-*-* # These platforms have GNUish versions of the tools available in the base @@ -137,6 +138,7 @@ _TOOLS_OPSYS_HAS_GNU.sed+= Linux-*-* # _TOOLS_REPLACE_OPSYS.awk+= SunOS-*-* _TOOLS_REPLACE_OPSYS.grep+= SunOS-*-* +_TOOLS_REPLACE_OPSYS.make+= # empty _TOOLS_REPLACE_OPSYS.sed+= SunOS-*-* # These platforms have completely unusable versions of these tools, and @@ -144,6 +146,7 @@ _TOOLS_REPLACE_OPSYS.sed+= SunOS-*-* # _TOOLS_OPSYS_INCOMPAT.awk+= # empty _TOOLS_OPSYS_INCOMPAT.grep+= # empty +_TOOLS_OPSYS_INCOMPAT.make+= # empty _TOOLS_OPSYS_INCOMPAT.sed+= # empty # Default to not requiring GNU tools. @@ -214,6 +217,21 @@ _TOOLS_OVERRIDE.grep= NO MAKEFLAGS+= _IGNORE_USE_GNU_TOOLS= .endif +.if ${_TOOLS_REPLACE.make} == "YES" +_TOOLS_OVERRIDE.make= YES +_TOOLS_PROGNAME.make= ${GMAKE} +.endif +.if (${_TOOLS_NEED_GNU.make} == "YES") && empty(PKGPATH:Mdevel/gmake) +BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake +_TOOLS_OVERRIDE.make= YES +_TOOLS_PROGNAME.make= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}make +GREP:= ${_TOOLS_PROGNAME.make} +.endif +.if !empty(PKGPATH:Mdevel/gmake) +_TOOLS_OVERRIDE.make= NO +MAKEFLAGS+= _IGNORE_USE_GNU_TOOLS= +.endif + .if ${_TOOLS_REPLACE.sed} == "YES" _TOOLS_OVERRIDE.sed= YES _TOOLS_PROGNAME.sed= ${SED} @@ -246,4 +264,23 @@ ${TOOLS_DIR}/bin/${_tool_}: . endif .endfor +# Always provide a symlink from ${TOOLS_DIR}/bin/make to the "make" +# used to build the package. The following only creates the symlink +# if GNU make isn't required (and already symlinked from above). +# +override-tools: ${TOOLS_DIR}/bin/make + +.if !target(${TOOLS_DIR}/bin/make) +${TOOLS_DIR}/bin/make: + ${_PKG_SILENT}${_PKG_DEBUG} \ + case ${MAKE_PROGRAM} in \ + /*) src="${MAKE_PROGRAM}" ;; \ + *) src=`${TYPE} ${MAKE_PROGRAM} | ${AWK} '{ print $$NF }'` ;; \ + esac; \ + if [ -x $$src -a ! -f ${.TARGET} ]; then \ + ${MKDIR} ${.TARGET:H}; \ + ${LN} -sf $$src ${.TARGET}; \ + fi +.endif + .endif # TOOLS_MK |