Date: Fri, 10 Jul 2009 15:01:41 GMT From: Alejandro Pulver <alepulver@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 165905 for review Message-ID: <200907101501.n6AF1fau035183@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=165905 Change 165905 by alepulver@alepulver_deimos on 2009/07/10 15:01:09 - Integrate latest CVS changes. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#5 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#5 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#7 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#5 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#6 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.tcl.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#3 integrate Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/GIDs,v 1.71 2009/04/07 11:49:11 rafan Exp $ +# $FreeBSD: ports/GIDs,v 1.74 2009/06/19 17:16:01 mezz Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -140,3 +140,6 @@ ssmtp:*:916: prayer:*:917: nefu:*:918: +couchdb:*:919: +vboxusers:*:920: +transmission:*:921: ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.35 2009/03/31 05:18:22 danfe Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.36 2009/07/08 06:54:19 girgen Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -173,6 +173,7 @@ PGSQL81_LIBVER= 4 PGSQL82_LIBVER= 5 PGSQL83_LIBVER= 5 +PGSQL84_LIBVER= 5 # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/pg_config) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.78 2009/04/02 21:37:31 pav Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.81 2009/06/23 15:05:31 pgollucci Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -100,7 +100,7 @@ # Emacs-23.x (development version) .elif (${EMACS_PORT_NAME} == "emacs-devel") EMACS_NAME= emacs -EMACS_VER= 23.0.92 +EMACS_VER= 23.0.95 EMACS_MAJOR_VER= 23 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#5 (text+ko) ==== @@ -30,7 +30,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.29 2009/03/28 23:57:56 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.30 2009/06/19 17:48:47 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -39,7 +39,7 @@ # All GCC versions supported by the ports framework. # Please keep them in ascending order. # -GCCVERSIONS= 029500 030402 040200 040300 040400 +GCCVERSIONS= 030402 040200 040300 040400 # # Versions of GCC shipped. @@ -48,7 +48,6 @@ # the base system. # The third field is the version as USE_GCC would use. # -GCCVERSION_029500= 400012 500035 2.95 GCCVERSION_030402= 502126 700042 3.4 GCCVERSION_040200= 700042 999999 4.2 GCCVERSION_040300= 999999 999999 4.3 ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.22 2009/06/12 18:03:43 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.24 2009/07/03 20:58:54 nox Exp $ # # Please view me with 4 column tabs! @@ -48,8 +48,12 @@ . else IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\" . endif +. elif ${OSVERSION} < 800076 +# default for OSVERSION < 800076 +LINUX_DIST_SUFFIX= . else -LINUX_DIST_SUFFIX= +# default for OSVERSION >= 800076 +LINUX_DIST_SUFFIX= -f10 . endif # I'm not sure if kompozer is better for linux-f8 ports, so use nvu @@ -66,7 +70,8 @@ _LINUX_APPS_ALL+= # 2.6.16 components -_LINUX_26_APPS= libidn libssh2 nspr nss sqlite3 tcl84 tk84 +_LINUX_26_APPS= cyrus-sasl2 libidn libssh2 nspr nss openldap \ + sqlite3 tcl84 tk84 _LINUX_APPS_ALL+= ${_LINUX_26_APPS} @@ -132,6 +137,14 @@ curl_f10_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1 curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE} curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl +. if ${LINUX_DIST_SUFFIX} == "-f10" +curl_DEPENDS= cyrus-sasl2 openldap +. endif + +# no cyrus-sasl2_FILE, cyrus-sasl2_f8_FILE +cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22 +cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2 dri_FILE= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1 dri_f8_FILE= ${LINUXBASE}/usr/lib/libGL.so.1 @@ -303,6 +316,11 @@ mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE} mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod +# no openldap_FILE, openldap_f8_FILE +openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0 +openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap + openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3 openmotif_f8_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.2 openmotif_f10_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3 ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.19 2009/06/01 17:26:07 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.22 2009/07/01 20:35:34 bsam Exp $ # # Variables: @@ -63,7 +63,15 @@ Linux_RPM_Post_Include= bsd.linux-rpm.mk LINUX_DIST?= fedora -LINUX_DIST_VER?= 3 +. if ${OSVERSION} < 800076 +LINUX_DIST_VER?= 4 +. else +LINUX_DIST_VER?= 10 +. if !defined(OVERRIDE_LINUX_NONBASE_PORTS) && \ + ${LINUX_DIST_VER} != 10 +IGNORE= bsd.linux-rpm.mk test failed: default package building at OSVERSION>=800076 was changed to linux-f10 ports, please define OVERRIDE_LINUX_NONBASE_PORTS to build other linux infrastructure ports +. endif +. endif # linux Fedora 8 infrastructure ports should be used with compat.linux.osrelease=2.6.16, # linux_base-f8 (or greater) port @@ -72,14 +80,19 @@ . if (${LINUX_OSRELEASE} != "2.6.16") IGNORE= bsd.linux-rpm.mk test failed: the port should be used with compat.linux.osrelease=2.6.16, which is supported at 8-CURRENT and has a limitted support at 7-STABLE . endif +# the default for OSVERSION < 800076 +. if ${OSVERSION} < 800076 # let's check if an apropriate linux base port is used -. if ${USE_LINUX} != f8 && ${USE_LINUX} != f9 && ${USE_LINUX} != f10 +. if ${USE_LINUX} != f8 && ${USE_LINUX} != f9 && ${USE_LINUX} != f10 IGNORE= bsd.linux-rpm.mk test failed: the port should be used with at least linux_base-f8, please read /usr/ports/UPDATING -. endif +. endif # let's check if OVERRIDE_LINUX_NONBASE_PORTS is defined -. ifndef(OVERRIDE_LINUX_NONBASE_PORTS) +. ifndef(OVERRIDE_LINUX_NONBASE_PORTS) IGNORE= bsd.linux-rpm.mk test failed: the port should be used with defined OVERRIDE_LINUX_NONBASE_PORTS, please read /usr/ports/UPDATING -. endif +. endif +# the default for OSVERSION >= 800076 +#. else +. endif # ${OSVERSION} < 800076 . endif . if defined(LINUX_DIST) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#4 (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.50 2009/03/06 10:08:32 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.51 2009/06/15 09:22:34 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 @@ -244,7 +244,7 @@ tokenizer wddx xml xmlrpc yaz zip zlib # version specific components _USE_PHP_VER4= ${_USE_PHP_ALL} crack dbx dio domxml filepro mcal mcve \ - mnogosearch oracle overload pfpro xslt yp + oracle overload pfpro xslt yp _USE_PHP_VER5= ${_USE_PHP_ALL} dom filter ming mysqli oci8 pdo \ pdo_mysql pdo_sqlite \ simplexml soap spl sqlite tidy xmlreader xmlwriter xsl @@ -283,7 +283,6 @@ memcache_DEPENDS= databases/pecl-memcache mhash_DEPENDS= security/php${PHP_VER}-mhash ming_DEPENDS= graphics/php${PHP_VER}-ming -mnogosearch_DEPENDS= www/php${PHP_VER}-mnogosearch mssql_DEPENDS= databases/php${PHP_VER}-mssql mysql_DEPENDS= databases/php${PHP_VER}-mysql mysqli_DEPENDS= databases/php${PHP_VER}-mysqli ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#7 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.623 2009/06/11 09:09:29 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.624 2009/06/26 17:03:48 bsam Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -1836,7 +1836,11 @@ LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} . else . if ${USE_LINUX:L} == "yes" +. if ${OSVERSION} < 800076 LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-fc4 +. else +LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10 +. endif . else IGNORE= cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT . endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.113 2009/06/08 22:30:45 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.114 2009/07/06 20:30:29 lwhsu Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -214,7 +214,7 @@ # _PYTHON_PORTBRANCH= 2.6 -_PYTHON_ALLBRANCHES= 2.6 2.5 2.4 2.3 3.0 # preferred first +_PYTHON_ALLBRANCHES= 2.6 2.5 2.4 2.3 3.1 3.0 # preferred first _ZOPE_PORTBRANCH= 2.7 _ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2 @@ -369,8 +369,16 @@ # Propagate the chosen python version to submakes. .MAKEFLAGS: PYTHON_VERSION=python${_PYTHON_VERSION} +# Python-3.1 +.if ${PYTHON_VERSION} == "python3.1" +PYTHON_PORTVERSION?=3.1 +PYTHON_PORTSDIR= ${PORTSDIR}/lang/python31 +PYTHON_REL= 310 +PYTHON_SUFFIX= 31 +PYTHON_VER= 3.1 + # Python-3.0 -.if ${PYTHON_VERSION} == "python3.0" +.elif ${PYTHON_VERSION} == "python3.0" PYTHON_PORTVERSION?=3.0.1 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python30 PYTHON_REL= 301 @@ -428,6 +436,7 @@ @${ECHO} " python2.5" @${ECHO} " python2.6 (default)" @${ECHO} " python3.0" + @${ECHO} " python3.1" @${FALSE} .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#6 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA <knu@FreeBSD.org> # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.182 2009/06/12 22:44:56 stas Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.185 2009/06/19 12:42:44 stas Exp $ # .if !defined(Ruby_Include) @@ -170,7 +170,7 @@ # Ruby 1.8 # RUBY_RELVERSION= 1.8.7 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 3 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 160 @@ -198,7 +198,7 @@ # Ruby 1.9 # RUBY_RELVERSION= 1.9.1 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 129 ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.tcl.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.10 2009/02/23 14:46:22 mm Exp $ +# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.11 2009/07/07 07:34:31 mm Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Tcl_Pre_Include) @@ -12,7 +12,7 @@ # USE_TCL - Add library dependency on Tcl. If no version is given by the maintainer # via the port or by the user via defined variable try to find the highest # stable installed version. -# Available values: yes 86+ 85+ 84+ 83+ 82+ 80+ 85 84 83 82 80 +# Available values: yes 86+ 85+ 84+ 83+ 82+ 85 84 83 82 # NOTE: - default value 85 is used in case of USE_TCL=yes # # USE_TCL_BUILD - Add buildtime dependency on Tcl (tclsh). @@ -51,7 +51,7 @@ # USE_TK - Add library dependency on Tk. If no version is given by the maintainer # via the port or by the user via defined variable try to find the highest # stable installed version. -# Avaliable values: yes 86+ 85+ 84+ 83+ 82+ 80+ 85 84 83 82 80 +# Avaliable values: yes 86+ 85+ 84+ 83+ 82+ 85 84 83 82 # NOTE: - overrides USE_TCL # - default value 85 is used in case of USE_TK=yes # @@ -191,13 +191,12 @@ . if defined(USE_TCL) _TCL_DEFAULT_VERSION= 85 -_TCL_VERSIONS= 86 85 84 83 82 80 +_TCL_VERSIONS= 86 85 84 83 82 _TCL_THREADS_VERSIONS= 86 85 84 -_TCL_RANGE_VERSIONS= 86+ 85+ 84+ 83+ 82+ 80+ +_TCL_RANGE_VERSIONS= 86+ 85+ 84+ 83+ 82+ _TCL_THREADS_RANGE_VERSIONS= 86+ 85+ 84+ # For specifying [85, 84, ..]+ -_TCL_80P= 80 82 83 84 85 86 _TCL_82P= 82 83 84 85 86 _TCL_83P= 83 84 85 86 _TCL_84P= 84 85 86 ==== //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/UIDs,v 1.82 2009/04/07 11:49:11 rafan Exp $ +# $FreeBSD: ports/UIDs,v 1.85 2009/06/19 17:16:01 mezz Exp $ # Please keep this file sorted by UID! smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin @@ -33,7 +33,7 @@ vpopmail:*:89:89::0:0:VPop Mail User:/usr/local/vpopmail:/nonexistent firebird:*:90:90::0:0:Firebird Database Administrator:/var/db/firebird:/bin/sh mailman:*:91:91::0:0:Mailman User:/usr/local/mailman:/usr/sbin/nologin -gdm:*:92:92::0:0:GDM Sandbox:/:/usr/sbin/nologin +gdm:*:92:92::0:0:GNOME Display Manager:/usr/local/etc/gdm/home:/sbin/nologin jabber:*:93:93::0:0:Jabber Daemon:/nonexistent:/nonexistent p4admin:*:94:94::0:0:Perforce admin:/usr/local/perforce:/usr/sbin/nologin interch:*:95:95::0:0:Interchange user:/usr/local/interchange:/usr/sbin/nologin @@ -150,3 +150,6 @@ logcheck:*:915:915::0:0:Logcheck system account:/var/lib/logcheck:/usr/local/bin/bash _prayer:*:917:917:daemon:0:0:Prayer Account:/nonexistent:/sbin/nologin nefu:*:918:918::0:0:Nefu daemon:/var/db/nefu:/sbin/nologin +couchdb:*:919:919:daemon:0:0:CouchDB Account:/var/empty:/usr/sbin/nologin +vboxusers:*:920:920::0:0:Virtualbox user:/nonexistent:/sbin/nologin +transmission:*:921:921::0:0:Transmission Daemon User:/usr/local/etc/transmission/home:/usr/sbin/nologin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907101501.n6AF1fau035183>