diff options
| -rw-r--r-- | CHANGES | 11 | ||||
| -rw-r--r-- | Mk/bsd.java.mk | 13 | ||||
| -rw-r--r-- | Mk/bsd.php.mk | 8 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 122 | ||||
| -rw-r--r-- | UPDATING | 7 |
5 files changed, 35 insertions, 126 deletions
@@ -10,6 +10,17 @@ in the release notes. All ports committers are allowed to commit to this file. +20070306: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * The remainging vestiges of FreeBSD 4.X support were removed. Any + remaining users of 4.X should have stayed with the RELENG_4_EOL tag. + + * It is now possible to include USE_PHP after bsd.port.pre.mk. + + * 'make search' should now work with non-default ${PORTSDIR}. + 20070130: AUTHOR: portmgr@FreeBSD.org The following changes were made to the ports infrastructure: diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 567813915ad6..0bd2a1652422 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -31,7 +31,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # for the port. (allowed values: native linux) # # JAVA_VENDOR List of space-separated suitable JDK port vendors for the -# port. (allowed values: freebsd bsdjava sun ibm blackdown) +# port. (allowed values: freebsd bsdjava sun blackdown) # # JAVA_BUILD When set, it means that the selected JDK port should be # added to build dependencies for the port. @@ -169,7 +169,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" __JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux -_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown ibm +_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor @@ -191,10 +191,6 @@ _JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3_INFO= PORT=java/linux-blackdown-jdk13 HOME=${ VERSION=1.3.1 OS=linux VENDOR=blackdown _JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \ VERSION=1.4.2 OS=linux VENDOR=blackdown -_JAVA_PORT_LINUX_IBM_JDK_1_3_INFO= PORT=java/linux-ibm-jdk13 HOME=${LOCALBASE}/linux-ibm-jdk1.3.1 \ - VERSION=1.3.1 OS=linux VENDOR=ibm -_JAVA_PORT_LINUX_IBM_JDK_1_4_INFO= PORT=java/linux-ibm-jdk14 HOME=${LOCALBASE}/linux-ibm-jdk1.4.2 \ - VERSION=1.4.1 OS=linux VENDOR=ibm _JAVA_PORT_LINUX_SUN_JDK_1_2_INFO= PORT=java/linux-sun-jdk12 HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \ VERSION=1.2.2 OS=linux VENDOR=sun _JAVA_PORT_LINUX_SUN_JDK_1_3_INFO= PORT=java/linux-sun-jdk13 HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \ @@ -208,7 +204,6 @@ _JAVA_PORT_LINUX_SUN_JDK_1_5_INFO= PORT=java/linux-sun-jdk15 HOME=${LOCALBASE _JAVA_VENDOR_freebsd= "FreeBSD Foundation" _JAVA_VENDOR_bsdjava= "BSD Java Porting Team" _JAVA_VENDOR_blackdown= Blackdown -_JAVA_VENDOR_ibm= IBM _JAVA_VENDOR_sun= Sun # Verbose description for each OS @@ -236,9 +231,7 @@ __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ JAVA_PORT_LINUX_SUN_JDK_1_2 \ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3 \ - JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2 \ - JAVA_PORT_LINUX_IBM_JDK_1_4 \ - JAVA_PORT_LINUX_IBM_JDK_1_3 + JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${_JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index 90b70257781f..b22fab24fa86 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -31,8 +31,12 @@ # Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI. # +.if !defined(_PHPMKINCLUDED) + PHP_Include_MAINTAINER= ale@FreeBSD.org +_PHPMKINCLUDED= yes + .if exists(${LOCALBASE}/etc/php.conf) .include "${LOCALBASE}/etc/php.conf" PHP_EXT_DIR!= ${LOCALBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${LOCALBASE}/lib/php/\(.*\),\1,p' @@ -224,8 +228,10 @@ php-ini: @${ECHO_CMD} "****************************************************************************" .endif +.endif + # Extensions -.if ${USE_PHP:L} != "yes" +.if defined(_POSTMKINCLUDED) && ${USE_PHP:L} != "yes" # non-version specific components _USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase \ exif fileinfo fribidi ftp gd gettext gmp \ diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 3589648e1a24..7a46ff41c592 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -310,10 +310,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Default: gmake ## # USE_GETOPT_LONG -# - If set, this port uses getopt_long. If OSVERSION -# less than 500041, automatically adds devel/libgnugeopt -# to LIB_DEPENDS, and pass adjusted values of -# CPPFLAGS and LDFLAGS in CONFIGURE_ENV. +# - If set, this port uses getopt_long. May be obsolete. ## # USE_ICONV - If set, this port uses libiconv. # USE_GETTEXT - If set, this port uses GNU gettext (libintl). @@ -1298,15 +1295,6 @@ check-makefile:: _PREMKINCLUDED= yes -# check for old, crufty, makefile types, part 1: -.if !defined(PORTNAME) || !( defined(PORTVERSION) || defined (DISTVERSION) ) || defined(PKGNAME) -check-makefile:: - @${ECHO_CMD} "Makefile error: you need to define PORTNAME and PORTVERSION instead of PKGNAME." - @${ECHO_CMD} "(This port is too old for your bsd.port.mk, please update it to match" - @${ECHO_CMD} " your bsd.port.mk.)" - @${FALSE} -.endif - .if defined(PORTVERSION) .if ${PORTVERSION:M*[-_,]*}x != x IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ',' @@ -1326,14 +1314,8 @@ PORTEPOCH?= 0 _SUF2= ,${PORTEPOCH} .endif -# check for old, crufty, makefile types, part 2. The "else" case -# should have been handled in part 1, above. -.if !defined(PKGVERSION) PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} -.endif -.if !defined(PKGNAME) PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} -.endif DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} # These need to be absolute since we don't know how deep in the ports @@ -1352,11 +1334,7 @@ LINUXBASE:= ${DESTDIR}${LINUXBASE_REL} DISTDIR?= ${PORTSDIR}/distfiles _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} INDEXDIR?= ${PORTSDIR} -.if ${OSVERSION} >= 500036 INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} -.else -INDEXFILE?= INDEX -.endif TARGETDIR:= ${DESTDIR}${PREFIX} @@ -1374,12 +1352,6 @@ EXTRACT_SUFX?= .tar.gz PACKAGES?= ${PORTSDIR}/packages TEMPLATES?= ${PORTSDIR}/Templates -.if (!defined(PKGDIR) && exists(${MASTERDIR}/pkg/DESCR)) || \ - (!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5)) -check-makefile:: - @${ECHO_CMD} "Makefile error: your port uses an old layout. Please update it to match this bsd.port.mk. If you have updated your ports collection via cvsup and are still getting this error, see Q12 and Q13 in the cvsup FAQ on http://www.polstra.com for further information." - @${FALSE} -.endif PATCHDIR?= ${MASTERDIR}/files FILESDIR?= ${MASTERDIR}/files SCRIPTDIR?= ${MASTERDIR}/scripts @@ -1426,23 +1398,8 @@ LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg -.if ${OSVERSION} >= 500036 PERL_VERSION?= 5.8.8 PERL_VER?= 5.8.8 -.else -.if ${OSVERSION} >= 500032 -PERL_VERSION?= 5.6.1 -PERL_VER?= 5.6.1 -.else -.if ${OSVERSION} >= 500007 -PERL_VERSION?= 5.6.0 -PERL_VER?= 5.6.0 -.else -PERL_VERSION?= 5.00503 -PERL_VER?= 5.005 -.endif -.endif -.endif .if !defined(PERL_LEVEL) && defined(PERL_VERSION) perl_major= ${PERL_VERSION:C|^([1-9]+).*|\1|} @@ -1460,11 +1417,7 @@ PERL_LEVEL= ${perl_major}${perl_minor}${perl_patch} PERL_LEVEL=0 .endif # !defined(PERL_LEVEL) && defined(PERL_VERSION) -.if ${PERL_LEVEL} >= 500600 PERL_ARCH?= mach -.else -PERL_ARCH?= ${ARCH}-freebsd -.endif .if ${PERL_LEVEL} >= 500800 PERL_PORT?= perl5.8 @@ -1475,13 +1428,8 @@ PERL_PORT?= perl5 SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} -.if ${PERL_LEVEL} < 500600 -PERL5= ${DESTDIR}/usr/bin/perl${PERL_VERSION} -PERL= ${DESTDIR}/usr/bin/perl -.else PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION} PERL= ${LOCALBASE}/bin/perl -.endif .if defined(USE_LOCAL_MK) .include "${PORTSDIR}/Mk/bsd.local.mk" @@ -1583,11 +1531,7 @@ PERL= ${LOCALBASE}/bin/perl .endif .endif -.if ${OSVERSION} >= 502123 X_WINDOW_SYSTEM ?= xorg -.else -X_WINDOW_SYSTEM ?= xfree86-4 -.endif # Location of mounted CDROM(s) to search for files CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT} @@ -1756,22 +1700,8 @@ IGNORE= unknown FAM system: ${FAM_SYSTEM} .endif .endif # USE_FAM -.if defined(USE_GETOPT_LONG) -.if ${OSVERSION} < 500041 -LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lgnugetopt -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -.endif -.endif - .if defined(USE_RC_SUBR) || defined(USE_RCORDER) -.if ${OSVERSION} < 500037 -RUN_DEPENDS+= ${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr -RC_SUBR= ${LOCALBASE}/etc/rc.subr -.else RC_SUBR= /etc/rc.subr -.endif SUB_LIST+= RC_SUBR=${RC_SUBR} .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" SUB_FILES+= ${USE_RC_SUBR} @@ -1797,7 +1727,7 @@ NO_LDCONFIG_MTREE= yes USE_LDCONFIG= ${PREFIX}/lib .endif .if defined(USE_LDCONFIG32) && ${USE_LDCONFIG32:L} == "yes" -IGNORE= has USE_LDCONFIG set to yes, which is not correct +IGNORE= has USE_LDCONFIG32 set to yes, which is not correct .endif .endif @@ -1957,7 +1887,6 @@ CONFIGURE_ENV+= PERL_MM_USE_DEFAULT="YES" .endif .endif -.if ${PERL_LEVEL} >= 500600 .if defined(USE_PERL5) || defined(USE_PERL5_BUILD) EXTRACT_DEPENDS+=${PERL5}:${PORTSDIR}/lang/${PERL_PORT} PATCH_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} @@ -1966,7 +1895,6 @@ BUILD_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .if defined(USE_PERL5) || defined(USE_PERL5_RUN) RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif -.endif .if defined(USE_LOCAL_MK) .include "${PORTSDIR}/Mk/bsd.local.mk" @@ -1998,6 +1926,10 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif +.if defined(USE_PHP) +.include "${PORTSDIR}/Mk/bsd.php.mk" +.endif + .if defined(USE_PYTHON) .include "${PORTSDIR}/Mk/bsd.python.mk" .endif @@ -2129,22 +2061,13 @@ MAKE_ENV+= TARGETDIR=${TARGETDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \ MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" -.if ${OSVERSION} < 500016 -PTHREAD_CFLAGS?= -D_THREAD_SAFE -PTHREAD_LIBS?= -pthread -.elif ${OSVERSION} < 502102 -PTHREAD_CFLAGS?= -D_THREAD_SAFE -PTHREAD_LIBS?= -lc_r -.else PTHREAD_CFLAGS?= PTHREAD_LIBS?= -pthread -.endif .if exists(/usr/bin/fetch) FETCH_CMD?= /usr/bin/fetch -ApRr FETCH_REGET?= 1 -.if ${OSVERSION} >= 480000 && !defined(DISABLE_SIZE) -# Avoid -S for 4.7 and earlier since it causes fetch errors +.if !defined(DISABLE_SIZE) FETCH_BEFORE_ARGS+= $${CKSIZE:+-S $$CKSIZE} .endif .else @@ -2156,11 +2079,7 @@ FETCH_REGET?= 0 .if exists(/usr/games/random) RANDOM_CMD?= /usr/games/random RANDOM_ARGS?= "-w -f -" -.if ( ${OSVERSION} > 480000 && ${OSVERSION} < 500000 ) || ${OSVERSION} > 500100 _RANDOMIZE_SITES= " |${RANDOM_CMD} ${RANDOM_ARGS}" -.else -_RANDOMIZE_SITES= '' -.endif .endif .endif @@ -2348,11 +2267,7 @@ PKG_ARGS+= -C "${CONFLICTS}" .if defined(PKG_NOCOMPRESS) PKG_SUFX?= .tar .else -.if ${OSVERSION} >= 500039 PKG_SUFX?= .tbz -.else -PKG_SUFX?= .tgz -.endif .endif # where pkg_add records its dirty deeds. PKG_DBDIR?= ${DESTDIR}/var/db/pkg @@ -2362,25 +2277,6 @@ MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp ALL_TARGET?= all INSTALL_TARGET?= install -# This is a mid-term solution patch while pkg-comment files are -# phased out. -# The final simpler patch will come afterwards -.if !defined(COMMENT) -check-makevars:: - @${ECHO_CMD} 'Makefile error: there is no COMMENT variable defined' - @${ECHO_CMD} 'for this port. Please, rectify this.' - @${FALSE} -.else -.if exists(${COMMENTFILE}) -check-makevars:: - @${ECHO_CMD} 'Makefile error: There is a COMMENTFILE in this port.' - @${ECHO_CMD} 'COMMENTFILEs have been deprecated in' - @${ECHO_CMD} 'favor of COMMENT variables.' - @${ECHO_CMD} 'Please, rectify this.' - @${FALSE} -.endif -.endif - # Popular master sites .include "bsd.sites.mk" @@ -3609,10 +3505,6 @@ do-configure: .if !defined(PERL_MODBUILD) @cd ${CONFIGURE_WRKSRC} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile -.if ${PERL_LEVEL} <= 500503 - @cd ${CONFIGURE_WRKSRC} && \ - ${PERL5} -pi -e 's/^(INSTALLSITELIB|INSTALLSITEARCH|SITELIBEXP|SITEARCHEXP|INSTALLMAN1DIR|INSTALLMAN3DIR) = \/usr\/local/$$1 = \$$(PREFIX)/' Makefile -.endif .endif .endif .if defined(USE_IMAKE) @@ -6,6 +6,13 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20070205: + AFFECTS: all users of FreeBSD 4.X + AUTHOR: portmgr@FreeBSD.org + + The remnants of FreeBSD 4.X support have been removed from bsd.port.mk. + Any remaining users should _not_ get this or any subsequent updates. + 20070301: AFFECTS: users of ports-mgmt/portupgrade* AUTHOR: sem@FreeBSD.org |