Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 May 2010 00:00:49 GMT
From:      Alejandro Pulver <alepulver@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 178740 for review
Message-ID:  <201005250000.o4P00nIB030704@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@178740?ac=10

Change 178740 by alepulver@alepulver_deimos on 2010/05/25 00:00:02

	- Fix typo (clean-cdrom -> clean-for-cdrom).
	- Integrate changes from CVS.

Affected files ...

.. //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#7 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.apache.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.autotools.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#6 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#7 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gstreamer.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.java.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ldap.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#12 edit
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#6 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.octave.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.perl.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#10 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#6 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.qt.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#8 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sdl.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#7 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.xorg.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#7 integrate

Differences ...

==== //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: ports/GIDs,v 1.77 2009/08/05 01:38:44 vanilla Exp $
+# $FreeBSD: ports/GIDs,v 1.96 2010/05/14 13:23:00 pav Exp $
 # Please keep this file sorted by GID!
 smmsp:*:25:
 bind:*:53:
@@ -68,6 +68,9 @@
 undernet:*:134:
 rabbitmq:*:135:
 dhcpd:*:136:
+mpd:*:137:
+wolfpack:*:138:
+ladvd:*:142:
 dovecot:*:143:
 rbldns:*:153:
 sfs:*:171:
@@ -76,10 +79,13 @@
 flowtools:*:174:
 rt:*:180:
 nagios:*:181:
+noc:*:182:
 moinmoin:*:192:
 cups:*:193:
 sympa:*:200:
 dspam:*:202:
+git:*:211:
+drizzle:*:213:
 bs:*:220:
 postgrey:*:225:
 aprsd:*:240:
@@ -87,8 +93,6 @@
 prosody:*:242:
 fcron:*:247:
 _tor:*:256:
-_dns-proxy-tor:*:257:
-_trans-proxy-tor:*:258:
 meta1s:*:260:
 meta1q:*:261:
 meta1c:*:262:
@@ -109,6 +113,7 @@
 ldap:*:389:
 tiarra:*:398:
 drweb:*:426:
+callweaver:*:444:
 courier:*:465:
 _bbstored:*:505:
 nullmail:*:522:
@@ -122,6 +127,7 @@
 pulse-rt:*:557:
 avahi:*:558:
 tacacs:*:559:
+haldaemon:*:560:
 distcc:*:561:
 polkit:*:562:
 pulse:*:563:
@@ -134,6 +140,7 @@
 openacs:*:820:
 dotlrn:*:821:
 netdisco:*:840:
+munin:*:842:
 fossy:*:901:www
 bacula:*:910:
 iserv:*:911:
@@ -146,3 +153,10 @@
 couchdb:*:919:
 vboxusers:*:920:
 transmission:*:921:
+mongodb:*:922:
+liquidsoap:*:923:
+postpals:*:924:
+mfs:*:925:
+minbif:*:926:
+kumofs:*:927:
+nslcd:*:928:

==== //depot/projects/soc2008/alepulver-portslicense/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.19 2007/09/19 21:03:59 clement Exp $
+# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.23 2010/05/20 21:43:47 pgollucci Exp $
 #
 # bsd.apache.mk - Apache related macros.
 # Author: Clement Laforet <clement@FreeBSD.org>
@@ -12,46 +12,20 @@
 #
 # Variables definition
 # USE_APACHE:	Call this script. Values can be:
-#		<version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+
-#		common*: common13, common20, common21 and common22
-#
-# Note: Setting USE_APACHE to "yes" is deprecated. It will set 
-# APACHE_PORT to www/apache13 and if WITH_APACHE2 (deprecated too)
-# is defined, APACHE_PORT will be set to www/apache20
-#
+#		<version>: 1.3/13/2.0/20/2.2/1.3+/2.0+/2.2+
+#		common*: common13, common20, and common22
 
 .if !defined(Apache_Pre_Include) || defined(PORT_IS_MODULE)
 
 Apache_Pre_Include=		bsd.apache.mk
 
-.if defined(APACHE_COMPAT)
-USE_APACHE=yes
-.endif
-
 # Print warnings
 _ERROR_MSG=	: Error from bsd.apache.mk.
-APACHE_SUPPORTED_VERSION=	13 20 21 22
+APACHE_SUPPORTED_VERSION=	13 20 22
 .if ${USE_APACHE:Mcommon*} != ""
 AP_PORT_IS_SERVER=	YES
-.elif ${USE_APACHE:L} == apr
-APR_DEPS=			YES
-.elif ${USE_APACHE:C/\.//:C/\+//:M[12][3210]} != ""
+.elif ${USE_APACHE:C/\.//:C/\+//:M[12][320]} != ""
 AP_PORT_IS_MODULE=	YES
-
-#### for backward compatibility
-.elif ${USE_APACHE:L} == yes
-.   if defined(WITH_APACHE2)
-APACHE_PORT?=	www/apache20
-.   else
-APACHE_PORT?=	www/apache13
-.   endif
-APXS?=			${LOCALBASE}/sbin/apxs
-.if !defined(APACHE_COMPAT)
-BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-.endif
-#### End of backward compatibility
-
 .else
 IGNORE=		${_ERROR_MSG} Illegal use of USE_APACHE
 .endif
@@ -59,7 +33,7 @@
 .if defined(AP_PORT_IS_SERVER)
 # For slave ports:
 .if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
-IGNORE=	Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync
+IGNORE=	Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
 .endif
 
 .if defined(SLAVE_PORT_MODULES)
@@ -94,20 +68,6 @@
 			--disable-asis --disable-cgid --disable-cgi \
 			--disable-negotiation --disable-dir --disable-imap \
 			--disable-actions --disable-userdir --disable-alias
-.elif ${USE_APACHE} == common21
-CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
-			--disable-authz-host --disable-authz-groupfile \
-			--disable-authz-user --disable-authz-default \
-			--disable-auth-basic --disable-charset-lite \
-			--disable-include --disable-log-config --disable-env \
-			--disable-setenvif --disable-mime --disable-status \
-			--disable-autoindex --disable-asis --disable-cgid \
-			--disable-cgi --disable-negotiation --disable-dir \
-			--disable-imagemap --disable-actions --disable-userdir \
-			--disable-alias --disable-filter \
-			--disable-proxy --disable-proxy-connect \
-			--disable-proxy-ftp --disable-proxy-http \
-			--disable-proxy-ajp --disable-proxy-balancer
 .elif ${USE_APACHE} == common22
 CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
 			--disable-authz-host --disable-authz-groupfile \
@@ -121,7 +81,8 @@
 			--disable-alias --disable-filter \
 			--disable-proxy --disable-proxy-connect \
 			--disable-proxy-ftp --disable-proxy-http \
-			--disable-proxy-ajp --disable-proxy-balancer
+			--disable-proxy-ajp --disable-proxy-balancer \
+			--disable-proxy-scgi --disable-reqtimeout
 .endif
 
 .if defined(OPTIONS) && !(make(make-options-list))
@@ -266,9 +227,6 @@
 .endfor
 ####End of PORT_IS_SERVER ####
 
-.elif defined(APR_DEPS)
-IGNORE=		${_ERROR_MSG} apr support is not yet implemented
-
 .elif defined(AP_PORT_IS_MODULE)
 AP_VERSION=	${USE_APACHE:C/\.//}
 
@@ -320,7 +278,7 @@
 APACHEINCLUDEDIR=include/apache2
 APACHEETCDIR=	etc/apache2
 APACHE_PORT?=	www/apache${APACHE_VERSION}
-.elif ${APACHE_VERSION} >= 21
+.elif ${APACHE_VERSION} >= 22
 AP_BUILDEXT=	la
 APACHEMODDIR=	libexec/apache${APACHE_VERSION}
 APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
@@ -344,6 +302,8 @@
 .  endif
 .endfor
 
+PKGNAMEPREFIX?= ap${APACHE_VERSION}-
+
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.autotools.mk#3 (text+ko) ====

@@ -1,14 +1,15 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.31 2009/08/02 19:32:04 mezz Exp $
+# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.34 2010/04/05 20:36:46 pav Exp $
 #
 # Please view me with 4 column tabs!
 #
-# Please make sure all changes to this file are passed either through
-# the maintainer, or portmgr@FreeBSD.org
+# Note: before committing to this file, contact portmgr to arrange for an
+# experimental ports run.  Untested commits may be backed out at portmgr's
+# discretion.
 
-Autotools_Include_MAINTAINER=	ade@FreeBSD.org
+Autotools_Include_MAINTAINER=	autotools@FreeBSD.org
 
 #---------------------------------------------------------------------------
 # Entry point into the autotools system
@@ -181,6 +182,11 @@
 LIB_DEPENDS+=	ltdl.7:${PORTSDIR}/devel/libltdl22
 .endif
 
+.if defined(AUTOTOOL_libtoolize)
+AUTOTOOL_libtoolize_env=	${AUTOTOOL_libtoolize}
+GNU_CONFIGURE?=			yes
+.endif
+
 .if defined(AUTOTOOL_libtool)
 GNU_CONFIGURE?=			YES
 AUTOTOOL_libtool_env=	${AUTOTOOL_libtool}
@@ -205,7 +211,7 @@
 LTMAIN=				${LIBTOOL_SHAREDIR}/config/ltmain.sh
 LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4}
 
-LIBTOOL_DEPENDS=	${LIBTOOL}:${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}
+LIBTOOL_DEPENDS=	libtool>=2.2:${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}
 BUILD_DEPENDS+=		${LIBTOOL_DEPENDS}
 
 LIBTOOLFLAGS?=		# default to empty
@@ -230,7 +236,7 @@
 CONFIGURE_ENV+=	${AUTOTOOLS_VARS}
 MAKE_ENV+=		${AUTOTOOLS_VARS}
 SCRIPTS_ENV+=	${AUTOTOOLS_VARS}
-. for item in automake aclocal autoconf autoheader libtool
+. for item in automake aclocal autoconf autoheader libtool libtoolize
 .  if defined(AUTOTOOL_${item}_env)
 ${item:U}_ENV+=	${AUTOTOOLS_VARS}
 .  endif
@@ -249,10 +255,10 @@
 # the order of autotools running.
 
 .if !target(run-autotools)
-.ORDER: run-autotools run-autotools-aclocal patch-autotools run-autotools-autoheader run-autotools-autoconf run-autotools-automake
+.ORDER: run-autotools run-autotools-aclocal patch-autotools run-autotools-autoheader run-autotools-libtoolize run-autotools-autoconf run-autotools-automake
 
 run-autotools:: run-autotools-aclocal patch-autotools run-autotools-autoheader \
-		run-autotools-autoconf run-autotools-automake
+		run-autotools-libtoolize run-autotools-autoconf run-autotools-automake
 .endif
 
 .if !target(run-autotools-aclocal)
@@ -265,6 +271,16 @@
 . endif
 .endif
 
+.if !target(run-autotools-libtoolize)
+run-autotools-libtoolize:
+. if defined(AUTOTOOL_libtoolize)
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} \
+		${LIBTOOLIZE_ARGS})
+. else
+	@${DO_NADA}
+. endif
+.endif
+
 .if !target(run-autotools-automake)
 run-autotools-automake:
 . if defined(AUTOTOOL_automake)

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#4 (text+ko) ====

@@ -11,19 +11,21 @@
 #					compiling/linking
 #					Default: not set
 # CMAKE_BUILD_TYPE	- Type of build (cmake predefined build types),
-#					affects on CFALGS and thus should not be set.
+#					affects on CFLAGS and thus should not be set.
 #					Default: none (which respects CFLAGS)
 # CMAKE_VERBOSE		- Verbose build
 #					Default: not set
+# CMAKE_OUTSOURCE	- Instruct to perform an out-of-source build
+# 					Default: not set
 # CMAKE_SOURCE_PATH	- Path to sourcedir for cmake
-#					Default: .
+#					Default: ${WRKSRC}
 # CMAKE_INSTALL_PREFIX	- prefix for cmake to use for installation.
 #					Default: ${PREFIX}
 #
 #
-# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.5 2009/03/24 19:11:21 makc Exp $
+# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.8 2010/03/31 18:07:05 makc Exp $
 
-CMAKE_MAINTAINER=  kde@FreeBSD.org
+CMAKE_MAINTAINER=	kde@FreeBSD.org
 
 #
 # CMAKE_BIN is the location where the cmake port installs the cmake
@@ -54,7 +56,12 @@
 #
 # Default build type and sourcedir
 #
-CMAKE_SOURCE_PATH?=	.
+CMAKE_SOURCE_PATH?=	${WRKSRC}
+.if defined(CMAKE_OUTSOURCE)
+CONFIGURE_WRKSRC=	${WRKDIR}/.build
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
+.endif
 CMAKE_INSTALL_PREFIX?=	${PREFIX}
 CMAKE_BUILD_TYPE?=	#none
 
@@ -89,6 +96,6 @@
 #
 .if !target(do-configure)
 do-configure:
+	${MKDIR} ${CONFIGURE_WRKSRC}
 	@cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
 .endif
-

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#6 (text+ko) ====

@@ -1,7 +1,7 @@
 # -*- mode: Makefile; tab-width: 4; -*-
 # ex: ts=4
 #
-# $FreeBSD: ports/Mk/bsd.database.mk,v 1.37 2009/07/21 08:02:18 ale Exp $
+# $FreeBSD: ports/Mk/bsd.database.mk,v 1.44 2010/04/26 13:42:05 mandree Exp $
 #
 
 .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)
@@ -111,8 +111,7 @@
 MYSQL41_LIBVER=		14
 MYSQL50_LIBVER=		15
 MYSQL51_LIBVER=		16
-MYSQL54_LIBVER=		16
-MYSQL60_LIBVER=		16
+MYSQL55_LIBVER=		16
 
 # Setting/finding MySQL version we want.
 .if exists(${LOCALBASE}/bin/mysql)
@@ -225,7 +224,7 @@
 
 .if defined(USE_BDB)
 
-_DB_PORTS=	2 3 40 41 42 43 44 45 46 47 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+
+_DB_PORTS=	2 3 40 41 42 43 44 45 46 47 48 50 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ 50+
 # Dependence lines for different db versions
 db2_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 db3_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
@@ -237,6 +236,8 @@
 db45_DEPENDS=	db-4.5.0:${PORTSDIR}/databases/db45
 db46_DEPENDS=	db-4.6.0:${PORTSDIR}/databases/db46
 db47_DEPENDS=	db-4.7.0:${PORTSDIR}/databases/db47
+db48_DEPENDS=	db-4.8.0:${PORTSDIR}/databases/db48
+db50_DEPENDS=	db-5.0.0:${PORTSDIR}/databases/db50
 # Detect db versions by finding some files
 db3_FIND=	${LOCALBASE}/include/db3/db.h
 db40_FIND=	${LOCALBASE}/include/db4/db.h
@@ -247,6 +248,8 @@
 db45_FIND=	${LOCALBASE}/include/db45/db.h
 db46_FIND=	${LOCALBASE}/include/db46/db.h
 db47_FIND=	${LOCALBASE}/include/db47/db.h
+db48_FIND=	${LOCALBASE}/include/db48/db.h
+db50_FIND=	${LOCALBASE}/include/db50/db.h
 
 # For specifying [3, 40, 41, ..]+
 _DB_3P=		3 ${_DB_40P}
@@ -257,7 +260,9 @@
 _DB_44P=	44 ${_DB_45P}
 _DB_45P=	45 ${_DB_46P}
 _DB_46P=	46 ${_DB_47P}
-_DB_47P=	47
+_DB_47P=	47 ${_DB_48P}
+_DB_48P=	48 ${_DB_50P}
+_DB_50P=	50
 
 # Override the global WITH_BDB_VER with the
 # port specific <UNIQUENAME>_WITH_BDB_VER
@@ -393,6 +398,14 @@
 BDB_LIB_NAME=		db-4.7
 BDB_LIB_CXX_NAME=	db_cxx-4.7
 BDB_LIB_DIR=		${LOCALBASE}/lib/db47
+.  elif ${_BDB_VER} == 48
+BDB_LIB_NAME=		db-4.8
+BDB_LIB_CXX_NAME=	db_cxx-4.8
+BDB_LIB_DIR=		${LOCALBASE}/lib/db48
+.  elif ${_BDB_VER} == 50
+BDB_LIB_NAME=		db-5.0
+BDB_LIB_CXX_NAME=	db_cxx-5.0
+BDB_LIB_DIR=		${LOCALBASE}/lib/db50
 .  endif
 BDB_LIB_NAME?=		db${_BDB_VER}
 BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx
@@ -462,8 +475,6 @@
 LIB_DEPENDS+=	fbclient.2:${PORTSDIR}/databases/firebird20-client
 .elif ${FIREBIRD_VER} == "20"
 LIB_DEPENDS+=	fbclient.2:${PORTSDIR}/databases/firebird20-client
-.elif ${FIREBIRD_VER} == "1"
-LIB_DEPENDS+=	fbclient.1:${PORTSDIR}/databases/firebird-client
 .else
 IGNORE=		cannot install: unknown Firebird version: ${FIREBIRD_VER}
 .endif

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: ports/Mk/bsd.emacs.mk,v 1.81 2009/06/23 15:05:31 pgollucci Exp $
+#	$FreeBSD: ports/Mk/bsd.emacs.mk,v 1.83 2010/05/14 08:04:38 bsam Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -7,7 +7,7 @@
 Emacs_Include=			bsd.emacs.mk
 Emacs_Include_MAINTAINER=	ports@FreeBSD.org
 
-EMACS_PORT_NAME?=	emacs22
+EMACS_PORT_NAME?=	emacs23
 
 #
 # This file for ports which depend on emacs family.
@@ -87,6 +87,23 @@
 EMACS_MAJOR_VER=	22
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
+EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs22
+EMACS_COMMON_PORT=	NO
+EMACS_HAS_MULE=		YES
+EMACS_NO_SUBDIRSEL=	NO
+.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
+PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+.endif
+
+# Emacs-23.x
+.elif (${EMACS_PORT_NAME} == "emacs23")
+EMACS_NAME=		emacs
+EMACS_VER=		23.2
+EMACS_MAJOR_VER=	23
+EMACS_LIBDIR?=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
 EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
 EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
@@ -191,7 +208,7 @@
 check-makevars::
 	@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
 	@${ECHO} "Valid values are:"
-	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs-devel"
+	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs23 emacs-devel"
 	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
 	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
 	@${FALSE}

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#7 (text+ko) ====

@@ -14,12 +14,12 @@
 #
 # For example:
 #   USE_GCC=	4.2+		# port requires GCC 4.2 or later.
-#   USE_GCC=	4.3			# port requires GCC 4.3.
+#   USE_GCC=	4.5			# port requires GCC 4.5.
 #
 # If your port needs a Fortran compiler, please specify that with the
 # USE_FORTRAN= knob.  Here is the list of options for that knob:
 #
-#   USE_FORTRAN=	yes		# use gfortran43 (lang/gcc43)
+#   USE_FORTRAN=	yes		# use gfortran44 (lang/gcc44)
 #   USE_FORTRAN=	g77		# use g77-34 (lang/gcc34; FreeBSD>=7)
 #							# or system f77 (/usr/bin/f77; FreeBSD<=6)
 #   USE_FORTRAN=	ifort	# use the Intel compiler (lang/ifc)
@@ -30,33 +30,42 @@
 # 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.31 2009/07/12 22:35:13 gerald Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.41 2010/05/02 17:39:06 gerald Exp $
 #
 
 GCC_Include_MAINTAINER=		gerald@FreeBSD.org
 
-#
-# All GCC versions supported by the ports framework.
-# Please keep them in ascending order.
-#
-GCCVERSIONS=	030402 040200 040300 040400
+# All GCC versions supported by the ports framework.  Keep them in
+# ascending order and in sync with the table below. 
+GCCVERSIONS=	030402 040200 040300 040400 040500 040600
 
-#
-# Versions of GCC shipped.
-# The first field if the OSVERSION in which it appeared in the base system.
-# The second field is the OSVERSION in which it disappeared from
-# the base system.
+# The first field if the OSVERSION in which it appeared in the base.
+# The second field is the OSVERSION in which it disappeared from the base.
 # The third field is the version as USE_GCC would use.
-#
 GCCVERSION_030402=	502126 700042 3.4
 GCCVERSION_040200=	700042 999999 4.2
 GCCVERSION_040300=	999999 999999 4.3
 GCCVERSION_040400=	999999 999999 4.4
+GCCVERSION_040500=	999999 999999 4.5
+GCCVERSION_040600=	999999 999999 4.6
 
 #
 # No configurable parts below this.
 #
 
+# Extract the fields from GCCVERSION_...
+.for v in ${GCCVERSIONS}
+. for j in ${GCCVERSION_${v}}
+.  if !defined(_GCCVERSION_${v}_L)
+_GCCVERSION_${v}_L=	${j}
+.  elif !defined(_GCCVERSION_${v}_R)
+_GCCVERSION_${v}_R=	${j}
+.  elif !defined(_GCCVERSION_${v}_V)
+_GCCVERSION_${v}_V=	${j}
+.  endif
+. endfor
+.endfor
+
 #
 # bsd.gcc.mk can also be used only for FC, F77 settings; in this case we
 # do not define USE_GCC.
@@ -64,14 +73,11 @@
 
 .if defined (USE_FORTRAN)
 
-# gfortran43 from lang/gcc43 is the default for now.
+# The default case, with a current lang/gcc port.
 . if ${USE_FORTRAN} == yes
-BUILD_DEPENDS+=	gfortran43:${PORTSDIR}/lang/gcc43
-RUN_DEPENDS+=	gfortran43:${PORTSDIR}/lang/gcc43
-FC:=	gfortran43
-F77:=	gfortran43
-CC:=	gcc43
-CXX:=	g++43
+_USE_GCC:=	4.4
+FC:=	gfortran44
+F77:=	gfortran44
 
 # Intel Fortran compiler from lang/ifc.
 . elif ${USE_FORTRAN} == ifort
@@ -114,21 +120,11 @@
 _GCC_ORLATER:=	true
 .endif
 
-#
-# Extract the fields from GCCVERSION_ and check if USE_GCC points to a valid
-# version.
-#
+# Check if USE_GCC points to a valid version.
 .for v in ${GCCVERSIONS}
 . for j in ${GCCVERSION_${v}}
-.  if !defined(_GCCVERSION_${v}_L)
-_GCCVERSION_${v}_L=	${j}
-.  elif !defined(_GCCVERSION_${v}_R)
-_GCCVERSION_${v}_R=	${j}
-.  elif !defined(_GCCVERSION_${v}_V)
-_GCCVERSION_${v}_V=	${j}
-.   if ${_USE_GCC}==${j}
+.  if ${_USE_GCC}==${j}
 _GCCVERSION_OKAY=	true;
-.   endif
 .  endif
 . endfor
 .endfor
@@ -181,10 +177,13 @@
 _USE_GCC:=${_GCC_FOUND}
 .endif
 
-#
-# Determine if the installed OS already has this GCCVERSION, and if not
-# then set BUILD_DEPENDS, CC, and CXX.
-#
+.endif # defined(USE_GCC)
+
+
+.if defined(_USE_GCC)
+# A concrete version has been selected.  Determine if the installed OS 
+# features this version in the base, and if not then set proper ports
+# dependencies, CC, CXX, and flags.
 .for v in ${GCCVERSIONS}
 . if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
 .  if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R}
@@ -193,6 +192,10 @@
 _GCC_PORT_DEPENDS:=	gcc${V}
 CC:=			gcc${V}
 CXX:=			g++${V}
+.   if ${_USE_GCC} != 3.4
+CFLAGS+=		-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}
+LDFLAGS+=		-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}
+.   endif
 .  endif
 . endif
 .endfor
@@ -200,11 +203,12 @@
 
 .if defined(_GCC_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS}
+. if ${_USE_GCC} != 3.4
+RUN_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS}
+. endif
 .endif
+.endif # defined(_USE_GCC)
 
-.endif
-# defined(USE_GCC)
-
 
 test-gcc:
 	@echo USE_GCC=${USE_GCC}
@@ -225,7 +229,8 @@
 .endfor
 	@echo Using GCC version ${_USE_GCC}
 .endif
-	@echo CC=${CC} - CXX=${CXX} - CFLAGS=${CFLAGS}
-	@echo F77=${F77} - FC=${FC} - FFLAGS=${FFLAGS}
-	@echo BUILD_DEPENDS=${BUILD_DEPENDS}
-	@echo RUN_DEPENDS=${RUN_DEPENDS}
+	@echo CC=${CC} - CXX=${CXX} - CFLAGS=\"${CFLAGS}\"
+	@echo F77=${F77} - FC=${FC} - FFLAGS=\"${FFLAGS}\"
+	@echo LDFLAGS=\"${LDFLAGS}\"
+	@echo "BUILD_DEPENDS=${BUILD_DEPENDS}"
+	@echo "RUN_DEPENDS=${RUN_DEPENDS}"

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#5 (text+ko) ====

@@ -4,8 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.14 2009/07/18 11:10:10 dinoex Exp $
-#   $MCom: ports/Mk/bsd.gecko.mk,v 1.10 2009/04/04 19:54:48 marcus Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.20 2010/03/28 06:30:26 dinoex Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -15,7 +14,7 @@
 # WITH_GECKO=	firefox
 #
 # The valid backends are:
-# firefox flock nvu seamonkey thunderbird xulrunner
+# firefox flock seamonkey thunderbird
 #
 # See below for more details.
 # ======================= /USERS ================================
@@ -65,7 +64,7 @@
 #  
 #  post-patch:
 #	@${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
-#		${WRKSRC}/configure
+#		${MOZSRC}/configure
 #
 #  If you want your port to check the ${GECKO} variable to see which backend
 #  has been chosen.
@@ -76,10 +75,10 @@
 #  post-patch:
 #  .if ${GECKO}=="seamonkey"
 #	@${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \
-#		${WRKSRC}/configure
+#		${MOZSRC}/configure
 #  .endif
 
-_GECKO_ALL=	firefox nvu seamonkey thunderbird xulrunner flock mozilla \
+_GECKO_ALL=	firefox seamonkey thunderbird flock mozilla \
 		libxul
 
 thunderbird_PORTSDIR=	mail
@@ -258,6 +257,7 @@
 		ice xproto
 
 MOZILLA_SUFX?=	none
+MOZSRC?=	${WRKSRC}
 WRKSRC?=	${WRKDIR}/mozilla
 FAKEDIR?=	${WRKDIR}/fake
 PLIST?=		${WRKDIR}/plist
@@ -275,7 +275,7 @@
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
 MOZCONFIG?=		${WRKSRC}/.mozconfig
 MOZILLA_PLIST_DIRS?=	bin include lib share/idl
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 PKGINSTALL?=	${WRKDIR}/pkg-install
 PKGDEINSTALL?=	${WRKDIR}/pkg-deinstall
 MASTER_MOZDIR?=	${PORTSDIR}/www/mozilla
@@ -320,7 +320,7 @@
 
 dbm_EXTRACT_AFTER_ARGS=		--exclude mozilla/dbm
 
-jpeg_LIB_DEPENDS=	jpeg.10:${PORTSDIR}/graphics/jpeg
+jpeg_LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
 jpeg_EXTRACT_AFTER_ARGS=	--exclude mozilla/jpeg
 
@@ -334,7 +334,7 @@
 nss_LDFLAGS+=		-L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 
 
-png_LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+png_LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
 
 xft_LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
@@ -501,17 +501,17 @@
 	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g ; \
 		s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
 		s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
-			${WRKSRC}/build/unix/mozilla-config.in
+			${MOZSRC}/build/unix/mozilla-config.in
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
 		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+		${MOZSRC}/intl/uconv/native/nsNativeUConvService.cpp \
+		${MOZSRC}/xpcom/io/nsNativeCharsetUtils.cpp
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		${WRKSRC}/config/autoconf.mk.in
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
 		s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
+		${MOZSRC}/security/coreconf/FreeBSD.mk \
+		${MOZSRC}/js/src/Makefile.in
 	@if [ -d ${WRKSRC}/directory/c-sdk ]; then \
 		${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 			${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
@@ -524,14 +524,14 @@
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-			${WRKSRC}/build/unix/run-mozilla.sh
+			${MOZSRC}/build/unix/run-mozilla.sh
 	@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
-		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+		${MOZSRC}/widget/src/gtk2/nsSound.cpp
 	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
-		${WRKSRC}/*/*/*/nsDeviceContextSpecG.cpp
+		${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
 		s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
+		${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
 
 # handles mozilla pis scripts.
 gecko-moz-pis-patch:
@@ -542,13 +542,13 @@
 post-configure: gecko-post-configure
 
 gecko-post-configure:
-	@${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/mozilla-config.h
+	@${ECHO_CMD} "#define JNIIMPORT" >> ${MOZSRC}/mozilla-config.h
 
 post-build: gecko-post-build
 
 gecko-post-build:
 	@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \
-		${WRKSRC}/build/unix/*.pc || ${TRUE}
+		${MOZSRC}/build/unix/*.pc || ${TRUE}
 
 pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist
 

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#5 (text+ko) ====

@@ -1,12 +1,19 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.156 2009/06/03 05:15:14 marcus Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.160 2010/05/11 08:38:08 kwm Exp $
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.479 2009/03/14 05:55:36 marcus Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.490 2010/03/14 18:13:44 marcus Exp $
 #
 # Please view me with 4 column tabs!
 
+#######################################################
+#
+# *** WARNING: Disable MARCUSCOM before merge in FreeBSD!
+#     Please also remove this section before merging into FreeBSD.
+#
+#MARCUSCOM_CVS=yes
+
 # ======================= USERS =================================
 #
 # There are no significant user-definable settings in here.
@@ -351,9 +358,9 @@
 libgtkhtml_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc
 libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2
 
-gnomedesktop_LIB_DEPENDS=	gnome-desktop-2.11:${PORTSDIR}/x11/gnome-desktop
+gnomedesktop_LIB_DEPENDS=	gnome-desktop-2.17:${PORTSDIR}/x11/gnome-desktop
 gnomedesktop_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
-gnomedesktop_USE_GNOME_IMPL=	libgnomeui gnomedocutils
+gnomedesktop_USE_GNOME_IMPL=	gconf2 gnomedocutils pygtk2
 gnomedesktop_GNOME_DESKTOP_VERSION=2
 
 gnomedesktopsharp20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc
@@ -365,7 +372,7 @@
 libwnck_DETECT=		${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
 libwnck_USE_GNOME_IMPL=	gtk20
 
-vte_LIB_DEPENDS=	vte.10:${PORTSDIR}/x11-toolkits/vte
+vte_LIB_DEPENDS=	vte.9:${PORTSDIR}/x11-toolkits/vte
 vte_DETECT=		${LOCALBASE}/libdata/pkgconfig/vte.pc
 vte_USE_GNOME_IMPL=	gtk20
 
@@ -383,7 +390,7 @@
 
 gnomepanel_LIB_DEPENDS=	panel-applet-2.0:${PORTSDIR}/x11/gnome-panel
 gnomepanel_DETECT=	${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
-gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2
+gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 libbonoboui
 gnomepanel_GNOME_DESKTOP_VERSION=2
 
 nautilus2_LIB_DEPENDS=	nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
@@ -401,7 +408,7 @@
 
 gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center
 gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
-gnomecontrolcenter2_USE_GNOME_IMPL=metacity nautilus2 gnomemenus desktopfileutils libgnomekbd gnomepanel
+gnomecontrolcenter2_USE_GNOME_IMPL=metacity gnomemenus desktopfileutils libgnomekbd gnomedesktop librsvg2
 
 libgda2_LIB_DEPENDS=	gda-2.3:${PORTSDIR}/databases/libgda2
 libgda2_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgda.pc
@@ -433,11 +440,11 @@
 
 libgsf_LIB_DEPENDS=			gsf-1.114:${PORTSDIR}/devel/libgsf
 libgsf_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc
-libgsf_USE_GNOME_IMPL=		gconf2 glib20 libxml2
+libgsf_USE_GNOME_IMPL=		glib20 libxml2
 
 libgsf_gnome_LIB_DEPENDS=	gsf-gnome-1.114:${PORTSDIR}/devel/libgsf-gnome
 libgsf_gnome_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgsf-gnome-1.pc
-libgsf_gnome_USE_GNOME_IMPL=	libgsf gnomevfs2
+libgsf_gnome_USE_GNOME_IMPL=	gconf2 libgsf gnomevfs2
 
 pygtk2_DETECT=			${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc
 pygtk2_BUILD_DEPENDS=	${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2
@@ -461,7 +468,7 @@
 
 gtkhtml3_LIB_DEPENDS=	gtkhtml-3.14.19:${PORTSDIR}/www/gtkhtml3
 gtkhtml3_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc
-gtkhtml3_USE_GNOME_IMPL=libgnomeui
+gtkhtml3_USE_GNOME_IMPL=libglade2
 
 gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech
 gnomespeech_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
@@ -469,7 +476,7 @@
 
 evolutiondataserver_LIB_DEPENDS=edataserver-1.2.11:${PORTSDIR}/databases/evolution-data-server
 evolutiondataserver_DETECT=		${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc
-evolutiondataserver_USE_GNOME_IMPL=libgnomeui
+evolutiondataserver_USE_GNOME_IMPL=gconf2 libxml2
 
 desktopfileutils_BUILD_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
 desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
@@ -515,8 +522,8 @@
 gnomesharp20_USE_GNOME_IMPL=	gnomepanel gtkhtml3 gtksharp20 librsvg2 vte
 
 libgnomekbd_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd_LIB_DEPENDS=	gnomekbd.3:${PORTSDIR}/x11/libgnomekbd
-libgnomekbd_USE_GNOME_IMPL=	libgnomeui
+libgnomekbd_LIB_DEPENDS=	gnomekbd.4:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_USE_GNOME_IMPL=	gconf2
 
 pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
 pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.56 2009/03/20 09:14:26 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.61 2010/05/23 21:03:45 dinoex Exp $
 #
 # This file contains some variable definitions that are supposed to
 # make your life easier when dealing with ports related to the GNUstep.
@@ -23,23 +23,11 @@
 # GNUSTEP_WITH_BASE_GCC=yes
 #	use system compiler (does not work on all architectures).
 #
-# GNUSTEP_WITH_GCC32=yes
-#	use gcc 3.2.x with objective C shared libraries.
-#
-# GNUSTEP_WITH_GCC33=yes
-#	use gcc 3.3.x with objective C shared libraries.
-#
 # GNUSTEP_WITH_GCC34=yes
-#	use gcc 3.4.x with objective C shared libraries (default).
+#	use gcc 3.4.x with objective C shared libraries.
 #
-# GNUSTEP_WITH_GCC40=yes
-#	use gcc 4.0.x with objective C shared libraries.
-#
-# GNUSTEP_WITH_GCC41=yes
-#	use gcc 4.1.x with objective C shared libraries.
-#
 # GNUSTEP_WITH_GCC42=yes
-#	use gcc 4.2.x with objective C shared libraries.
+#	use gcc 4.2.x with objective C shared libraries (default).
 #
 #
 # Options for a port before include this file:
@@ -119,7 +107,6 @@
 
 GNUstep_Include_MAINTAINER=	dinoex@FreeBSD.org
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
 .if !defined(GNUSTEP_WITHOUT_LIBOBJC)
 .if !defined(GNUSTEP_WITH_BASE_GCC)
 BUILD_DEPENDS+=	${TARGLIB}/libobjc.so:${PORTSDIR}/${GNUSTEP_GCC_PORT}
@@ -223,28 +210,20 @@
 PLIST_SUB+=	MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1}
 
 .if !defined(GNUSTEP_WITH_BASE_GCC)
-.if !defined(GNUSTEP_WITH_GCC32) && !defined(GNUSTEP_WITH_GCC33) && !defined(GNUSTEP_WITH_GCC34)
-.if !defined(GNUSTEP_WITH_GCC40) && !defined(GNUSTEP_WITH_GCC41) && !defined(GNUSTEP_WITH_GCC42)
+.if !defined(GNUSTEP_WITH_GCC34)
+.if !defined(GNUSTEP_WITH_GCC42)
+.if ${ARCH} == i386 || ${ARCH} == amd64
 GNUSTEP_WITH_GCC42=	yes
-.endif
-.endif
+.else
+# alpha ia64 powerpc arm sparc64 sun4v
+GNUSTEP_WITH_GCC34=	yes
+.endif # ARCH
+.endif # GNUSTEP_WITH_GCC42
+.endif # GNUSTEP_WITH_GCC34
 
-.if defined(GNUSTEP_WITH_GCC32)
-GCCSUFFIX=32
-GNUSTEP_GCC_PORT?=	lang/gcc-objc

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005250000.o4P00nIB030704>