Date: Wed, 21 Jun 2006 12:37:58 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 99752 for review Message-ID: <200606211237.k5LCbw3e072375@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=99752 Change 99752 by gabor@spitfire on 2006/06/21 12:37:26 Follow recent changes Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#2 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#2 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#2 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#2 (text+ko) ==== @@ -10,9 +10,47 @@ All ports committers are allowed to commit to this file. +20060616: +AUTHOR: portmgr@FreeBSD.org +The following functional changes were made to bsd.port.mk: + + * Update default MySQL version from 4.1 to 5.0 [1] + + * Update default PHP version from 4 to 5 [2] + + * Update default LDAP version from 2.2 to 2.3 [3] + + * Add support for LDAP version 2.4 [4] + + * Update default linux_base from '8' (Redhat 8) to 'fc4' (Fedora Core 4) [5] + + * Switch default Linux X implementation from XFree86 to xorg to track the + above [5] + + * Deprecate INSTALLS_SHLIB and replace it by USE_LDCONFIG. If set to "yes", + the old behavior is preserved. Otherwise, it can be set to a list of + directories to be added to ${PREFIX}/libdata/ldconfig/${UNIQUENAME}. + Note that this directory is used by ldconfig startup script, it is meant + to replace ldconfig scripts installed by some ports as (sometimes + 000.${UNQUENAME}.sh) [6] + + * Adds USE_LDCONFIG32 which is like USE_LDCONFIG but the target file is + ${PREFIX}/libdata/ldconfig32/${UNIQUENAME} instead. (Note: this should + only be used on 64-bit architectures) [6] + + * Set the default LANG for tr to be C to avoid some build problems [7] + + * Include bsd.java.mk in both pre and post sections [8] + + * Get rid of remnants of FORCE_PKG_REGISTER [9] + + * Always print options with make showconfig [10] + + PR: 92805 [1], 92806 [2], 96793 [3], 97515 [4], 96849 [5], + 91933 [6], 91381 [7], 97020 [8], 95841 [9], 97133 [10] + 20060523: AUTHOR: portmgr@FreeBSD.org - The following functional changes were made to bsd.port.mk: * include bsd.emacs.mk only when USE_EMACS is set [5] @@ -1043,4 +1081,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.52 2006/05/23 22:27:21 kris Exp $ +$FreeBSD: ports/CHANGES,v 1.53 2006/06/19 00:10:03 linimon Exp $ ==== //depot/projects/soc2006/gabor_ports/MOVED#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1069 2006/06/14 10:45:34 vd Exp $ +# $FreeBSD: ports/MOVED,v 1.1075 2006/06/20 22:35:59 glewis Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2379,3 +2379,8 @@ x11-toolkits/fox-devel|x11-toolkits/fox14|2006-06-10|Renamed databases/arcexplorer||2006-06-14|Has expired: Download unavailable anymore www/linux-flashplugin6||2006-06-14|Has expired: "This port has known security flaws that are not likely to be fixed" +lang/glibstdc++28||2006-06-18|Has expired: Use any variant of lang/gcc that is less than six years old instead +graphics/magickwand|graphics/php-magickwand|2006-06-18|Already in the tree with the name graphics/php-magickwand +devel/p5-Filesys-Statvfs_Df|sysutils/p5-Filesys-Statvfs|2006-06-19|Vendor split port into 2 separate modules: sysutils/p5-Filesys-Statvfs and sysutils/p5-Filesys-Df +www/opera-devel|www/opera|2006-06-20|Merged into the stable port +archivers/bsdtar|archivers/libarchive|2006-06-20|Merged into the libarchive port ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.11 2006/05/11 15:21:22 clement Exp $ +# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.12 2006/06/20 04:58:12 linimon Exp $ # # bsd.apache.mk - Apache related macros. # Author: Clement Laforet <clement@FreeBSD.org> @@ -294,7 +294,7 @@ IGNORE= : Your apache does not support DSO modules . endif . if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX} -IGNORE?= PREFIX must be egal to APXS_PREFIX. +IGNORE?= PREFIX must be equal to APXS_PREFIX. . endif .endif ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#2 (text+ko) ==== @@ -19,7 +19,9 @@ ERROR_ADDRESS=root@localhost # Where to scp the resulting indexes after build -SCP_DEST=root@localhost:/usr/local/www/ports +SCP_DEST_HOST=root@localhost +SCP_DEST_TMP=/tmp +SCP_DEST_DIR=/usr/local/www/ports # Location of ports tree and source trees export BASEDIR=/local0/tmp/kris/tindex @@ -109,6 +111,15 @@ fi } +createtmpdir() { + TMPDIR=`ssh ${SCP_DEST_HOST} "mktemp -qd /tmp/tindex.XXXXXX"` + if [ $? -ne 0 ]; then + echo "$0: Can't create temp file, exiting..." + exit 1 + fi +} + + # Sanitize the environment so that the indexes aren't customized by the # local machine settinge export __MAKE_CONF=/dev/null @@ -154,9 +165,10 @@ fi checkfixed ${BRANCH} +createtmpdir bzip2 -kf ${PORTSDIR}/INDEX -scp ${SSHKEY} ${PORTSDIR}/INDEX ${PORTSDIR}/INDEX.bz2 ${SCP_DEST} || mail -s "Cannot copy INDEX" ${ERROR_ADDRESS} < /dev/null - +scp -q ${SSHKEY} ${PORTSDIR}/INDEX ${PORTSDIR}/INDEX.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX to temp dir" ${ERROR_ADDRESS} +ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX to final dir" ${ERROR_ADDRESS} BRANCH=5.x export OSVERSION=${OSVERSION5} echo "Building INDEX for ${BRANCH} with OSVERSION=${OSVERSION}" @@ -167,8 +179,10 @@ fi checkfixed ${BRANCH} +createtmpdir bzip2 -kf ${PORTSDIR}/INDEX-5 -scp ${SSHKEY} ${PORTSDIR}/INDEX-5 ${PORTSDIR}/INDEX-5.bz2 ${SCP_DEST} || mail -s "Cannot copy INDEX-5" ${ERROR_ADDRESS} < /dev/null +scp -q ${SSHKEY} ${PORTSDIR}/INDEX-5 ${PORTSDIR}/INDEX-5.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-5 to temp dir" ${ERROR_ADDRESS} +ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-5 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-5.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-5 to final dir" ${ERROR_ADDRESS} BRANCH=6.x export OSVERSION=${OSVERSION6} @@ -180,8 +194,10 @@ fi checkfixed ${BRANCH} +createtmpdir bzip2 -kf ${PORTSDIR}/INDEX-6 -scp ${SSHKEY} ${PORTSDIR}/INDEX-6 ${PORTSDIR}/INDEX-6.bz2 ${SCP_DEST} || mail -s "Cannot copy INDEX-6" ${ERROR_ADDRESS} < /dev/null +scp -q ${SSHKEY} ${PORTSDIR}/INDEX-6 ${PORTSDIR}/INDEX-6.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-6 to temp dir" ${ERROR_ADDRESS} +ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-6 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-6.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-6 to final dir" ${ERROR_ADDRESS} BRANCH=7.x export OSVERSION=${OSVERSION7} @@ -193,8 +209,10 @@ fi checkfixed ${BRANCH} +createtmpdir bzip2 -kf ${PORTSDIR}/INDEX-7 -scp ${SSHKEY} ${PORTSDIR}/INDEX-7 ${PORTSDIR}/INDEX-7.bz2 ${SCP_DEST} || mail -s "Cannot copy INDEX-7" ${ERROR_ADDRESS} < /dev/null +scp -q ${SSHKEY} ${PORTSDIR}/INDEX-7 ${PORTSDIR}/INDEX-7.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-7 to temp dir" ${ERROR_ADDRESS} +ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-7 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-7.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-7 to final dir" ${ERROR_ADDRESS} # All indexes built successfully, clear the hook rm -f ${PORTSDIR}/hook ==== //depot/projects/soc2006/gabor_ports/UPDATING#2 (text+ko) ==== @@ -6,6 +6,22 @@ time you update your ports collection, before attempting any port upgrades. +20060616 + AFFECTS users of all pfpro ports + AUTHOR: aaron@FreeBSD.org + + The default certificate location has been changed to respect hier(7). + The new default location is LOCALBASE/etc/pfpro/certs. + +20060616: + AFFECTS: users of net/openldap22{,-sasl}-client + AUTHOR: linimon@FreeBSD.org + + OpenLDAP version 2.3 is now the default. To upgrade all ports do + portupgrade -rfo net/openldap23-client openldap-client + (or a similar command for the SASL variant). If you do not want to + upgrade, add the line `WANT_OPENLDAP_VER?=22' to /etc/make.conf. + 20060616: AFFECTS users of emulation/linux_base-* AUTHOR: netchild@FreeBSD.org @@ -3659,4 +3675,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.343 2006/06/16 17:14:00 netchild Exp $ +$FreeBSD: ports/UPDATING,v 1.345 2006/06/20 19:24:32 linimon Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606211237.k5LCbw3e072375>