PERFORCE change 115564 for review
Gabor Kovesdan
gabor at FreeBSD.org
Thu Mar 8 22:30:33 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=115564
Change 115564 by gabor at gabor_server on 2007/03/08 22:29:58
IFC
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/CHANGES#3 integrate
.. //depot/projects/soc2006/gabor_destdir/MOVED#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Makefile#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.php.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#6 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#6 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/UPDATING#3 integrate
Differences ...
==== //depot/projects/soc2006/gabor_destdir/CHANGES#3 (text+ko) ====
@@ -10,6 +10,17 @@
All ports committers are allowed to commit to this file.
+20070306:
+AUTHOR: portmgr at 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 at FreeBSD.org
The following changes were made to the ports infrastructure:
@@ -1272,4 +1283,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.65 2007/01/31 14:07:23 pav Exp $
+$FreeBSD: ports/CHANGES,v 1.66 2007/03/06 06:21:46 linimon Exp $
==== //depot/projects/soc2006/gabor_destdir/MOVED#3 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1306 2007/02/23 22:50:13 mezz Exp $
+# $FreeBSD: ports/MOVED,v 1.1313 2007/03/08 14:29:11 ahze Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -2840,3 +2840,9 @@
lang/tcc||2007-02-19|Has expired: is unusable; tcc -run works, but little else
www/p5-HTML||2007-02-23|Has expired: project no longer exists
audio/speex-devel|audio/speex|2007-02-23|Merged into audio/speex
+www/horde|www/horde-base|2007-02-24|Port renamed for consistency
+www/phpip|net-mgmt/phpip|2007-02-26|move to net-mgmt/phpip
+www/aolserver-openacs-pg||2007-02-28|Not longer needed.
+devel/boost-gcc3|devel/boost|2007-03-07|Removed support for FreeBSD 4.
+graphics/jpeg-mmx|graphics/jpeg|2007-03-08|Has expired: no longer needed.
+graphics/gstreamer-plugins-jpeg-mmx80|graphics/gstreamer-plugins-jpeg80|2007-03-08|graphics/jpeg-mmx was removed
==== //depot/projects/soc2006/gabor_destdir/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: ports/Makefile,v 1.98 2007/01/31 15:37:18 pav Exp $
+# $FreeBSD: ports/Makefile,v 1.99 2007/02/26 08:54:07 ru Exp $
#
SUBDIR += accessibility
@@ -72,11 +72,11 @@
@rm -f ${INDEXDIR}/${INDEXFILE}
@cd ${.CURDIR} && make ${INDEXDIR}/${INDEXFILE}
-fetchindex: ${INDEXDIR}/{INDEXFILE}.bz2
+fetchindex: ${INDEXDIR}/${INDEXFILE}.bz2
@bunzip2 < ${INDEXDIR}/${INDEXFILE}.bz2 > ${INDEXDIR}/${INDEXFILE} && \
chmod a+r ${INDEXDIR}/${INDEXFILE}
-${INDEXDIR}/{INDEXFILE}.bz2: .PHONY
+${INDEXDIR}/${INDEXFILE}.bz2: .PHONY
@${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
MASTER_SITE_INDEX?= http://www.FreeBSD.org/ports/
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#3 (text+ko) ====
@@ -6,7 +6,7 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# Date: 4 Oct 2004
#
-# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.32 2007/01/25 16:22:42 mezz Exp $
+# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.33 2007/03/08 14:20:01 ahze Exp $
# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.38 2006/10/10 20:22:01 mezz Exp $
.if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
@@ -69,7 +69,7 @@
_USE_GSTREAMER80_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \
dts dv dvd esound faac faad ffmpeg flac \
gconf gdkpixbuf gnomevfs gsm hermes ivorbis jack jpeg \
- jpeg-mmx ladspa lame libcaca libfame libmms libmng \
+ ladspa lame libcaca libfame libmms libmng \
libpng libvisual mad mikmod mpeg2dec mpeg2enc mplex \
musepack musicbrainz nas sdl shout shout2 sidplay \
smoothwave sndfile speex theora ogg pango polyp \
@@ -178,8 +178,6 @@
jpeg_DEPENDS= graphics/gstreamer-plugins-jpeg
-jpeg-mmx_DEPENDS= graphics/gstreamer-plugins-jpeg-mmx
-
libcaca_DEPENDS= graphics/gstreamer-plugins-libcaca
libmng_DEPENDS= graphics/gstreamer-plugins-libmng
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#3 (text+ko) ====
@@ -9,7 +9,7 @@
# Please send all suggested changes to the maintainer instead of committing
# them to CVS yourself.
#
-# $FreeBSD: ports/Mk/bsd.java.mk,v 1.75 2007/01/31 14:07:24 pav Exp $
+# $FreeBSD: ports/Mk/bsd.java.mk,v 1.77 2007/03/07 07:44:36 linimon Exp $
#
.if !defined(Java_Include)
@@ -31,7 +31,7 @@
# 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 @@
__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 @@
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_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_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}
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.php.mk#3 (text+ko) ====
@@ -7,7 +7,7 @@
# Please send all suggested changes to the maintainer instead of committing
# them to CVS yourself.
#
-# $FreeBSD: ports/Mk/bsd.php.mk,v 1.39 2007/02/18 19:56:53 ale Exp $
+# $FreeBSD: ports/Mk/bsd.php.mk,v 1.41 2007/03/08 07:17:32 ale Exp $
#
# Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk.
# If the port requires a predefined set of PHP extensions, they can be
@@ -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 at 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 @@
@${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 \
@@ -238,7 +244,7 @@
# version specific components
_USE_PHP_VER4= ${_USE_PHP_ALL} crack dbx dio domxml filepro mcal mcve \
mnogosearch oracle overload pfpro xslt yp
-_USE_PHP_VER5= ${_USE_PHP_ALL} dom filter ming mysqli pdo pdo_sqlite \
+_USE_PHP_VER5= ${_USE_PHP_ALL} dom filter ming mysqli oci8 pdo pdo_sqlite \
simplexml soap spl sqlite tidy xmlreader xmlwriter xsl
bcmath_DEPENDS= math/php${PHP_VER}-bcmath
@@ -279,6 +285,7 @@
mysql_DEPENDS= databases/php${PHP_VER}-mysql
mysqli_DEPENDS= databases/php${PHP_VER}-mysqli
ncurses_DEPENDS=devel/php${PHP_VER}-ncurses
+oci8_DEPENDS= databases/php${PHP_VER}-oci8
odbc_DEPENDS= databases/php${PHP_VER}-odbc
openssl_DEPENDS=security/php${PHP_VER}-openssl
oracle_DEPENDS= databases/php${PHP_VER}-oracle
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#6 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.554 2007/02/21 05:40:11 delphij Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.555 2007/03/06 06:21:46 linimon Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -310,10 +310,7 @@
# 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 @@
_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 @@
_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
@@ -1346,11 +1328,7 @@
DISTDIR?= ${PORTSDIR}/distfiles
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
INDEXDIR?= ${PORTSDIR}
-.if ${OSVERSION} >= 500036
INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
-.else
-INDEXFILE?= INDEX
-.endif
.if defined(USE_LINUX_RPM)
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
@@ -1366,12 +1344,6 @@
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
@@ -1407,23 +1379,8 @@
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|}
@@ -1441,11 +1398,7 @@
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
@@ -1456,13 +1409,8 @@
SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER}
SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
-.if ${PERL_LEVEL} < 500600
-PERL5= /usr/bin/perl${PERL_VERSION}
-PERL= /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"
@@ -1564,11 +1512,7 @@
.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}
@@ -1735,22 +1679,8 @@
.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}
@@ -1776,7 +1706,7 @@
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
@@ -1936,7 +1866,6 @@
.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}
@@ -1945,7 +1874,6 @@
.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"
@@ -1977,6 +1905,10 @@
.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
@@ -2108,22 +2040,13 @@
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
@@ -2135,11 +2058,7 @@
.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
@@ -2308,11 +2227,7 @@
.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?= /var/db/pkg
@@ -2322,25 +2237,6 @@
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"
@@ -3569,10 +3465,6 @@
.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)
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#6 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
-# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.67 2007/02/04 20:23:37 kris Exp $
+# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.68 2007/03/06 06:58:35 linimon Exp $
#
# The include file <bsd.port.subdir.mk> contains the default targets
# for building ports subdirectories.
@@ -415,6 +415,8 @@
} \
} \
{ \
+ if (match($$2, "^/usr/ports/[^/]*/[^/]*$$") > 0) \
+ sub("^/usr/ports", "${PORTSDIR}", $$2); \
if (substr($$2, 1, therelen) != there) \
next; \
for (i in parms) \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#4 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.python.mk,v 1.94 2007/02/14 06:07:28 delphij Exp $
+# $FreeBSD: ports/Mk/bsd.python.mk,v 1.95 2007/02/26 07:32:02 alexbl Exp $
#
.if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include)
@@ -386,6 +386,9 @@
PYDISTUTILS_BUILDARGS?=
PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX}
+# Fix for programs that build python from a GNU auto* enviornment
+CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}"
+
# Zope-related variables
.if defined(USE_ZOPE)
.if ${ZOPE_VERSION} == "3.2"
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#3 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.412 2007/02/12 23:23:31 sat Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.413 2007/03/07 12:46:20 sat Exp $
#
# Where to put distfiles that don't have any other master site
@@ -109,6 +109,13 @@
http://download2.berlios.de/%SUBDIR%/
.endif
+.if !defined(IGNORE_MASTER_SITE_CENKES)
+MASTER_SITE_CENKES+= \
+ http://bsd.cenkes.org/%SUBDIR%/ \
+ http://bsd2.cenkes.org/%SUBDIR%/ \
+ http://bsd3.cenkes.org/%SUBDIR%/
+.endif
+
.if !defined(IGNORE_MASTER_SITE_COMP_SOURCES)
MASTER_SITE_COMP_SOURCES+= \
ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ \
@@ -116,10 +123,7 @@
.endif
.if !defined(IGNORE_MASTER_SITE_CSME)
-MASTER_SITE_CSME+= \
- http://bsd1.csme.ru/%SUBDIR%/ \
- http://bsd2.csme.ru/%SUBDIR%/ \
- http://bsd3.csme.ru/%SUBDIR%/
+MASTER_SITE_CSME+= ${MASTER_SITE_CENKES}
.endif
.if !defined(IGNORE_MASTER_SITE_DEBIAN)
@@ -1326,6 +1330,7 @@
MASTER_SITES_SUBDIRS= \
APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
BERLIOS:${PORTNAME:L} \
+ CENKES:myports \
CSME:myports \
DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
GCC:releases/${DISTNAME} \
==== //depot/projects/soc2006/gabor_destdir/UPDATING#3 (text+ko) ====
@@ -6,6 +6,51 @@
time you update your ports collection, before attempting any port
upgrades.
+20070205:
+ AFFECTS: all users of FreeBSD 4.X
+ AUTHOR: portmgr at 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 at FreeBSD.org
+
+ Because of a bug in previous version, it's recomended you fill ALT_PKGDEP
+ section in pkgtools.conf file for portupgrade be aware of alternative
+ dependencies you use, and run pkgdb -L to restore dependencies that was
+ lost.
+
+ Example of ALT_PKGDEP section:
+ ALT_PKGDEP = {
+ 'www/apache13' => 'www/apache13-modssl',
+ 'print/ghostscript-afpl' => 'print/ghostscript-gnu',
+ }
+
+ Note also, portupgrade knows nothing how to handle ports with different
+ suffixes (E.g. -nox11). So you should define explicitly variables
+ (E.g. WITHOUT_X11=yes) for the ports in /etc/make.conf or pkgtools.conf
+ (MAKE_ARGS section) files.
+
+20070227:
+ AFFECTS: users of net-im/jabber*
+ AUTHOR: martin at matuska.org
+
+ With update to version 1.6.0 the name of the jabber daemon has been
+ changed to bin/jabberd14 to avoid conflicts with other jabber daemons.
+ The port now supports WITH_MYSQL and WITH_POSTGRESQL knobs.
+
+ If you are using one of the following ports please recompile it due
+ to changes in the library.
+
+ net-im/jabber-conference
+ net-im/jabber-jud
+ net-im/jabber-yahoo
+
+ Some configuration directives have changed, too. Please see example
+ configuration files and README.jabberd14 files in the ports above.
+
20070223:
AFFECTS: users of audio/speex and any port that depends on it
AUTHOR: mezz at FreeBSD.org
@@ -4826,4 +4871,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.471 2007/02/23 22:50:13 mezz Exp $
+$FreeBSD: ports/UPDATING,v 1.475 2007/03/06 06:21:46 linimon Exp $
More information about the p4-projects
mailing list