From owner-p4-projects@FreeBSD.ORG Mon May 25 23:59:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD2081065676; Mon, 25 May 2009 23:59:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 887D11065674 for ; Mon, 25 May 2009 23:59:20 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 756F58FC17 for ; Mon, 25 May 2009 23:59:20 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PNxKJl056529 for ; Mon, 25 May 2009 23:59:20 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PNxKwU056526 for perforce@freebsd.org; Mon, 25 May 2009 23:59:20 GMT (envelope-from alepulver@freebsd.org) Date: Mon, 25 May 2009 23:59:20 GMT Message-Id: <200905252359.n4PNxKwU056526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver To: Perforce Change Reviews Cc: Subject: PERFORCE change 162748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 23:59:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=162748 Change 162748 by alepulver@alepulver_deimos on 2009/05/25 23:59:06 Integrate changes in ports/Mk from CVS. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gstreamer.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.java.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ldap.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.lua.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.octave.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.perl.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.qt.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.scons.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.tcl.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.xfce.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.xorg.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#2 integrate Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/GIDs,v 1.62 2008/08/11 20:09:15 mm Exp $ +# $FreeBSD: ports/GIDs,v 1.71 2009/04/07 11:49:11 rafan Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -66,12 +66,15 @@ _spamd:*:132: freeradius:*:133: undernet:*:134: +rabbitmq:*:135: +dhcpd:*:136: dovecot:*:143: rbldns:*:153: sfs:*:171: agk:*:172: polipo:*:173: flowtools:*:174: +rt:*:180: nagios:*:181: moinmoin:*:192: cups:*:193: @@ -101,6 +104,7 @@ stunnel:*:341: openfire:*:342: _iodined:*:353: +httptunnel:*:361: ldap:*:389: tiarra:*:398: drweb:*:426: @@ -109,7 +113,7 @@ nullmail:*:522: dkimproxy:*:525: pgbouncer:*:534: -ejabberd:*:544: +ejabberd:*:543: qtss:*:554: ircdru:*:555: messagebus:*:556: @@ -132,3 +136,7 @@ iserv:*:911: _relayd:*:913: bitlbee:*:914: +logcheck:*:915: +ssmtp:*:916: +prayer:*:917: +nefu:*:918: ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#3 (text+ko) ==== @@ -7,11 +7,12 @@ # Default: ${CONFIGURE_ENV} # CMAKE_ARGS - Arguments passed to cmake # Default: see below -# CMAKE_USE_PTHREAD - Instruct cmake to use pthreads when +# CMAKE_USE_PTHREAD - Instruct cmake to use pthreads when # compiling/linking # Default: not set -# CMAKE_BUILD_TYPE - Type of build (release, debug) -# Default: Release +# CMAKE_BUILD_TYPE - Type of build (cmake predefined build types), +# affects on CFALGS and thus should not be set. +# Default: none (which respects CFLAGS) # CMAKE_VERBOSE - Verbose build # Default: not set # CMAKE_SOURCE_PATH - Path to sourcedir for cmake @@ -20,7 +21,7 @@ # Default: ${PREFIX} # # -# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.2 2008/08/10 15:43:46 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.5 2009/03/24 19:11:21 makc Exp $ CMAKE_MAINTAINER= kde@FreeBSD.org @@ -47,14 +48,15 @@ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ -DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \ - -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" + -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ + -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES # # Default build type and sourcedir # -CMAKE_BUILD_TYPE?= Release CMAKE_SOURCE_PATH?= . CMAKE_INSTALL_PREFIX?= ${PREFIX} +CMAKE_BUILD_TYPE?= #none # # Instruct cmake to compile/link with pthreads @@ -69,10 +71,10 @@ .endif # -# Force DEBUG buildtype if needed +# Strip binaries # -.if defined(CMAKE_DEBUG) || defined(WITH_DEBUG) -CMAKE_BUILD_TYPE=DEBUG +.if !defined(WITH_DEBUG) +INSTALL_TARGET?= install/strip .endif # @@ -87,6 +89,6 @@ # .if !target(do-configure) do-configure: - @cd ${WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} + @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.30 2008/07/26 08:38:53 ale Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.35 2009/03/31 05:18:22 danfe Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -10,24 +10,26 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # This file contains some routines to interact with different databases, such -# as mysql, postgresql and berkley DB. For including this file define macro -# USE_[DATABASE], for example USE_MYSQL. Defining macro like USE_[DATABASE]_VER -# or WANT_[DATABSE]_VER will include this file too. +# as MySQL, PostgreSQL, and Berkley DB. To include this file, define macro +# USE_[DATABASE], for example USE_MYSQL. Defining macro like +# USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well. # ## -# USE_MYSQL - Add MySQL client dependency. +# USE_MYSQL - Add MySQL (client/server/embedded) dependency (default: +# client). # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if -# necessary (MySQL5.0 = 50). +# necessary (MySQL-5.0 = 50). # DEFAULT_MYSQL_VER -# - MySQL default version. Can be overriden within a port. +# - MySQL default version. Can be overridden within a port. # Default: 50. # WANT_MYSQL_VER -# - Maintainer can set an arbitrary version of MySQL by using it. +# - Maintainer can set an arbitrary version of MySQL to always +# build this port with (overrides WITH_MYSQL_VER). # IGNORE_WITH_MYSQL -# - This variable can be defined if the ports doesn't support -# one or more version of MySQL. +# - This variable can be defined if the ports does not support +# one or more versions of MySQL. # WITH_MYSQL_VER # - User defined variable to set MySQL version. # MYSQL_VER @@ -39,13 +41,13 @@ # currently installed version. Fall back to default if # necessary (PostgreSQL-8.2 = 82). # DEFAULT_PGSQL_VER -# - PostgreSQL default version. Can be overridden within a port. -# Default: 82. +# - PostgreSQL default version. Can be overridden within a +# port. Default: 82. # WANT_PGSQL_VER -# - Maintainer can set an arbitrary version of PostgreSQL by -# using it. +# - Maintainer can set an arbitrary version of PostgreSQL to +# always build this port with (overrides WITH_PGSQL_VER). # IGNORE_WITH_PGSQL -# - This variable can be defined if the ports doesn't support +# - This variable can be defined if the ports does not support # one or more versions of PostgreSQL. # WITH_PGSQL_VER # - User defined variable to set PostgreSQL version. @@ -58,41 +60,48 @@ # currently installed version. Fall back to default if # necessary (db41+). # INVALID_BDB_VER -# - This variable can be defined when the port doesn't +# - This variable can be defined when the port does not # support one or more versions of Berkeley DB. -# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always +# WANT_BDB_VER +# - Maintainer can set a version of Berkeley DB to always # build this port with (overrides WITH_BDB_VER). -# WITH_BDB_VER - User defined global variable to set Berkeley DB version +# WITH_BDB_VER +# - User defined global variable to set Berkeley DB version. # _WITH_BDB_VER -# - User defined port specific variable to set -# Berkeley DB version +# - User defined port specific variable to set Berkeley DB +# version. # WITH_BDB_HIGHEST -# - Use the highest installed version of Berkeley DB -# BDB_LIB_NAME - This variable is automatically set to the name of the -# Berkeley DB library (default: db41) +# - Use the highest installed version of Berkeley DB. +# BDB_LIB_NAME +# - This variable is automatically set to the name of the +# Berkeley DB library (default: db41). # BDB_LIB_CXX_NAME # - This variable is automatically set to the name of the -# Berkeley DB c++ library (default: db41_cxx) +# Berkeley DB C++ library (default: db41_cxx). # BDB_INCLUDE_DIR # - This variable is automatically set to the location of -# the Berkeley DB include directory. -# (default: ${LOCALBASE}/include/db41) -# BDB_LIB_DIR - This variable is automatically set to the location of +# the Berkeley DB include directory (default: +# ${LOCALBASE}/include/db41). +# BDB_LIB_DIR +# - This variable is automatically set to the location of # the Berkeley DB library directory. -# BDB_VER - Detected Berkeley DB version. +# BDB_VER +# - Detected Berkeley DB version. ## -# USE_SQLITE - Add dependency on sqlite library. Valid values are: -# 3 and 2. If version is not specified directly then -# sqlite3 is used (if USE_SQLITE= yes). -# SQLITE_VER - Detected sqlite version. +# USE_SQLITE - Add dependency on SQLite library. Valid values are: +# 3 and 2. If version is not specified directly then +# SQLite-3 is used (if USE_SQLITE= yes). +# SQLITE_VER +# - Detected SQLite version. ## -# USE_FIREBIRD - Add dependency on Firebird library. Valid values are: -# 2 and 1. If no version is given by the maintainer (if +# USE_FIREBIRD - Add dependency on Firebird library. Valid values are: +# 2 and 1. If no version is given by the maintainer (if # USE_FIREBIRD= yes) and the user did not define # WITH_FIREBIRD_VER variable, fall back to default "2". # WITH_FIREBIRD_VER # - User defined variable to set Firebird version. -# FIREBIRD_VER - Detected Firebird version. +# FIREBIRD_VER +# - Detected Firebird version. .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 50 @@ -111,7 +120,7 @@ .if defined(WANT_MYSQL_VER) .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER} -IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client. +IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client .endif MYSQL_VER= ${WANT_MYSQL_VER} .elif defined(WITH_MYSQL_VER) @@ -126,24 +135,31 @@ .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} -IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client +IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client .endif .endif +.if (${USE_MYSQL} == "embedded") +IGNORE_WITH_MYSQL= 323 40 41 +.endif + # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) -# compatability shim -.if defined(BROKEN_WITH_MYSQL) -IGNORE_WITH_MYSQL=${BROKEN_WITH_MYSQL} -.endif .if defined(IGNORE_WITH_MYSQL) . for VER in ${IGNORE_WITH_MYSQL} . if (${MYSQL_VER} == "${VER}") -IGNORE= cannot install: doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${IGNORE_WITH_MYSQL}) +IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) . endif . endfor .endif # IGNORE_WITH_MYSQL +.if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded") +RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +.if (${USE_MYSQL} == "embedded") +BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +.endif +.else LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client +.endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs @@ -165,7 +181,7 @@ .if defined(WANT_PGSQL_VER) .if defined(WITH_PGSQL_VER) && ${WITH_PGSQL_VER} != ${WANT_PGSQL_VER} -IGNORE= cannot install: the port wants postgresql${WANT_PGSQL_VER}-client and you try to install postgresql${WITH_PGSQL_VER}-client. +IGNORE= cannot install: the port wants postgresql${WANT_PGSQL_VER}-client and you try to install postgresql${WITH_PGSQL_VER}-client .endif PGSQL_VER= ${WANT_PGSQL_VER} .elif defined(WITH_PGSQL_VER) @@ -184,14 +200,14 @@ # And now we are checking if we can use it .if defined(PGSQL${PGSQL_VER}_LIBVER) -# compatability shim +# compatibility shim .if defined(BROKEN_WITH_PGSQL) IGNORE_WITH_PGSQL=${BROKEN_WITH_PGSQL} .endif .if defined(IGNORE_WITH_PGSQL) . for VER in ${IGNORE_WITH_PGSQL} . if (${PGSQL_VER} == "${VER}") -IGNORE= cannot install: does not work with postgresql${PGSQL_VER}-client PostgresSQL (${IGNORE_WITH_PGSQL} not supported) +IGNORE= cannot install: does not work with postgresql${PGSQL_VER}-client (PostgresSQL ${IGNORE_WITH_PGSQL} not supported) . endif . endfor .endif # IGNORE_WITH_PGSQL @@ -316,7 +332,7 @@ # USE_BDB is specified incorrectly, so mark this as IGNORE .if ${_BDB_VER} == "no" -IGNORE= cannot install: unknown bdb version: ${USE_BDB} +IGNORE= cannot install: unknown Berkeley DB version: ${USE_BDB} .else # Now check if we can use it . if defined(INVALID_BDB_VER) @@ -339,9 +355,9 @@ . endfor . endif . if ${_BDB_IGNORE} == "yes" -IGNORE= cannot install: does not work with bdb version: ${_BDB_VER} (${INVALID_BDB_VER} not supported) +IGNORE= cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported) . else -# Now add the dependancy on Berkeley DB ${_BDB_VER) version +# Now add the dependency on Berkeley DB ${_BDB_VER) version .if defined(BDB_BUILD_DEPENDS) BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^db.*://} .else @@ -403,7 +419,7 @@ .endif # USE_BDB -# Handling sqlite dependency +# Handling SQLite dependency .if defined(USE_SQLITE) .if ${USE_SQLITE:L} == "yes" @@ -423,7 +439,7 @@ LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite${_SQLITE_VER} SQLITE_VER= ${_SQLITE_VER} .else -IGNORE= cannot install: unknown sqlite version: ${_SQLITE_VER} +IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER} .endif .endif # defined(USE_SQLITE) @@ -435,17 +451,19 @@ .endif .if ${USE_FIREBIRD:L} == "yes" -FIREBIRD_VER= 2 +FIREBIRD_VER= 20 .else FIREBIRD_VER= ${USE_FIREBIRD} .endif .if ${FIREBIRD_VER} == "2" -LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird2-client +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} +IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} .endif .endif # defined(USE_FIREBIRD) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.73 2008/06/03 14:36:49 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.78 2009/04/02 21:37:31 pav Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -83,7 +83,7 @@ # Emacs-22.x .elif (${EMACS_PORT_NAME} == "emacs22") EMACS_NAME= emacs -EMACS_VER= 22.2 +EMACS_VER= 22.3 EMACS_MAJOR_VER= 22 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} @@ -100,7 +100,7 @@ # Emacs-23.x (development version) .elif (${EMACS_PORT_NAME} == "emacs-devel") EMACS_NAME= emacs -EMACS_VER= 23.0.60 +EMACS_VER= 23.0.92 EMACS_MAJOR_VER= 23 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} @@ -117,7 +117,7 @@ # XEmacs-21.x .elif (${EMACS_PORT_NAME} == "xemacs21") EMACS_NAME= xemacs -EMACS_VER= 21.4.21 +EMACS_VER= 21.4.22 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.fpc.mk,v 1.1 2008/06/24 14:56:05 acm Exp $ +# $FreeBSD: ports/Mk/bsd.fpc.mk,v 1.9 2009/05/24 06:12:44 acm Exp $ # # bsd.fpc.mk - Support for FreePascal based ports. # @@ -23,14 +23,14 @@ # # -.if !defined(_POSTMKINCLUDED) && !defined(_FPCMKINCLUDED) +.if !defined(_FPCMKINCLUDED) _FPCMKINCLUDED= yes FPC_Include_MAINTAINER= acm@FreeBSD.org FPC_Pre_Include= bsd.fpc.mk -DEFAULT_FPC_VER= 2.2.0 +DEFAULT_FPC_VER= 2.2.4 FPC_VER= ${DEFAULT_FPC_VER} .if exists(${LOCALBASE}/bin/fpc) @@ -40,7 +40,7 @@ . endif .endif -BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc +BUILD_DEPENDS+= ppc386:${PORTSDIR}/lang/fpc BUILDNAME= ${ARCH}-freebsd UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME} @@ -55,21 +55,21 @@ @${ECHO_CMD} "" @${ECHO_CMD} "#################################################################" -_FPC_BASE_UNITS=gdbint graph ibase libasync hash httpd mysql netdb odbc oracle \ - pasjpeg paszlib pthreads postgres regexpr sqlite - -_FPC_ALL_UNITS=${_FPC_BASE_UNITS} bfd cairo fcl-base fcl-db fcl-fpcunit fcl-image \ - fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fftw fpmkunit \ - forms fpgtk fv gconf gdbm ggi gnome gtk gtk2 imlib libcurl \ - libgd libpng ncurses opengl openssl pcap svgalib syslog tcl \ - unzip utmp x11 zlib zvt +_FPC_ALL_UNITS= aspell bfd cairo chm fcl-async fcl-base fcl-db fcl-fpcunit fcl-image \ + fcl-json fcl-net fcl-passrc fcl-process fcl-registry fcl-web fcl-xml fftw \ + fpmkunit fpgtk fv gdbint gdbm ggi gnome1 graph gtk1 gtk2 hash httpd13 httpd20 \ + httpd22 ibase iconvenc imagemagick imlib libcurl libgd libpng mysql ncurses numlib \ + odbc opengl openssl oracle pasjpeg paszlib pcap postgres pthreads pxlib \ + regexpr sdl sqlite svgalib symbolic syslog tcl unzip users utmp x11 xforms \ + zlib .if defined(WANT_FPC_BASE) -. if ${WANT_FPC_BASE:L} == "yes" -USE_FPC= ${_FPC_BASE_UNITS} -. else -IGNORE= unknown value, please use "yes" instead of -. endif +. if ${WANT_FPC_BASE:L} == "yes" +USE_FPC= gdbint graph ibase hash httpd13 httpd20 httpd22 mysql odbc oracle \ + pasjpeg paszlib pthreads postgres regexpr sqlite +. else +IGNORE= unknown value, please use "yes" instead of +. endif .endif .if defined(WANT_FPC_ALL) @@ -86,16 +86,17 @@ IGNORE= cannot install: unknown FPC unit ${UNITS} . endif . endfor +.endif # Base units gdbint_UNIT= devel/fpc-gdbint graph_UNIT= graphics/fpc-graph ibase_UNIT= databases/fpc-ibase -libasync_UNIT= net/fpc-libasync hash_UNIT= security/fpc-hash -httpd_UNIT= www/fpc-httpd +httpd13_UNIT= www/fpc-httpd13 +httpd20_UNIT= www/fpc-httpd20 +httpd22_UNIT= www/fpc-httpd22 mysql_UNIT= databases/fpc-mysql -netdb_UNIT= net/fpc-netdb odbc_UNIT= databases/fpc-odbc oracle_UNIT= databases/fpc-oracle pasjpeg_UNIT= graphics/fpc-pasjpeg @@ -106,54 +107,67 @@ sqlite_UNIT= databases/fpc-sqlite # Extra units +aspell_UNIT= textproc/fpc-aspell bfd_UNIT= devel/fpc-bfd cairo_UNIT= graphics/fpc-cairo +chm_UNIT= misc/fpc-chm +fcl_async_UNIT= devel/fpc-fcl-async fcl_base_UNIT= devel/fpc-fcl-base fcl_db_UNIT= devel/fpc-fcl-db fcl_fpcunit_UNIT= devel/fpc-fcl-fpcunit fcl_image_UNIT= devel/fpc-fcl-image +fcl_json_UNIT= devel/fpc-fcl-json fcl_net_UNIT= devel/fpc-fcl-net fcl_passrc_UNIT= devel/fpc-fcl-passrc +fcl_process_UNIT= devel/fpc-fcl-process fcl_registry_UNIT= devel/fpc-fcl-registry fcl_web_UNIT= devel/fpc-fcl-web fcl_xml_UNIT= devel/fpc-fcl-xml fftw_UNIT= math/fpc-fftw fpmkunit_UNIT= devel/fpc-fpmkunit -forms_UNIT= x11-toolkits/fpc-forms fpgtk_UNIT= graphics/fpc-fpgtk fv_UNIT= devel/fpc-fv -gconf_UNIT= devel/fpc-gconf gdbm_UNIT= databases/fpc-gdbm ggi_UNIT= graphics/fpc-ggi -gnome_UNIT= x11-toolkits/fpc-gnome -gtk_UNIT= x11-toolkits/fpc-gtk +gnome1_UNIT= x11-toolkits/fpc-gnome1 +gtk1_UNIT= x11-toolkits/fpc-gtk1 gtk2_UNIT= x11-toolkits/fpc-gtk2 -httpd_UNIT= www/fpc-httpd +iconvenc_UNIT= converters/fpc-iconvenc +imagemagick_UNIT= graphics/fpc-imagemagick imlib_UNIT= graphics/fpc-imlib libcurl_UNIT= ftp/fpc-libcurl libgd_UNIT= graphics/fpc-libgd libpng_UNIT= graphics/fpc-libpng ncurses_UNIT= graphics/fpc-ncurses +numlib_UNIT= math/fpc-numlib opengl_UNIT= graphics/fpc-opengl openssl_UNIT= security/fpc-openssl pcap_UNIT= net/fpc-pcap +pxlib_UNIT= databases/fpc-pxlib +sdl_UNIT= devel/fpc-sdl svgalib_UNIT= graphics/fpc-svgalib +symbolic_UNIT= devel/fpc-symbolic syslog_UNIT= sysutils/fpc-syslog tcl_UNIT= lang/fpc-tcl unzip_UNIT= archivers/fpc-unzip +users_UNIT= sysutils/fpc-users utmp_UNIT= sysutils/fpc-utmp x11_UNIT= x11/fpc-x11 +xforms_UNIT= x11-toolkits/fpc-xforms zlib_UNIT= devel/fpc-zlib -zvt_UNIT= x11-toolkits/fpc-zvt + +.endif + +.if defined(_POSTMKINCLUDED) && defined(USE_FPC) . for UNITS in ${USE_FPC} . if ${_FPC_ALL_UNITS:M${UNITS}}!="" -BUILD_DEPENDS+= ${UNITSDIR}/${UNITS:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} -RUN_DEPENDS+= ${UNITSDIR}/${UNITS:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} +BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} +RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} security-check: fpc-check-install . endif . endfor .endif -.endif +#.endif # End of bsd.fpc.mk file ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#4 (text+ko) ==== @@ -13,17 +13,16 @@ # USE_FORTRAN knob. # # For example: -# USE_GCC= 3.3 # port requires GCC 3.3 to build with. -# USE_GCC= 3.4+ # port requires GCC 3.4 or later to build with. +# USE_GCC= 4.2+ # port requires GCC 4.2 or later to build with. +# USE_GCC= 4.3 # port requires GCC 4.3 to build with. # # 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 gfortran42 (/lang/gcc42) -# USE_FORTRAN= gfortran42 -# 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) +# USE_FORTRAN= yes # use gfortran43 (/lang/gcc43) +# 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) # # Due to object file incompatiblity between Fortran compilers, we strongly # recommend to use only one of them on any system. @@ -31,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.20 2008/08/17 06:57:17 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.29 2009/03/28 23:57:56 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -40,7 +39,7 @@ # All GCC versions supported by the ports framework. # Please keep them in ascending order. # -GCCVERSIONS= 020801 029500 030301 030402 040100 040200 040300 +GCCVERSIONS= 029500 030402 040200 040300 040400 # # Versions of GCC shipped. @@ -49,13 +48,11 @@ # the base system. # The third field is the version as USE_GCC would use. # -GCCVERSION_020801= 000000 400012 2.8 GCCVERSION_029500= 400012 500035 2.95 -GCCVERSION_030301= 501103 502126 3.3 GCCVERSION_030402= 502126 700042 3.4 -GCCVERSION_040100= 999999 999999 4.1 GCCVERSION_040200= 700042 999999 4.2 GCCVERSION_040300= 999999 999999 4.3 +GCCVERSION_040400= 999999 999999 4.4 # # No configurable parts below this. @@ -67,34 +64,46 @@ # .if defined (USE_FORTRAN) -# gfortran42 from lang/gcc42 is the default for now. -. if ${USE_FORTRAN} == yes || ${USE_FORTRAN} == gfortran42 -BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 -FC:= gfortran42 -F77:= gfortran42 -. endif + +# gfortran43 from lang/gcc43 is the default for now. +. 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 # Intel Fortran compiler from lang/ifc. -. if ${USE_FORTRAN} == ifort +. elif ${USE_FORTRAN} == ifort BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc +RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc FC:= ${LOCALBASE}/intel_fc_80/bin/ifort F77:= ${LOCALBASE}/intel_fc_80/bin/ifort -. endif # In some case we want to use g77 from lang/gcc34 (FreeBSD>=7) or f77 # (FreeBSD<=6). -. if ${USE_FORTRAN} == g77 -. if (${OSVERSION} > 700000) +. elif ${USE_FORTRAN} == g77 +. if (${OSVERSION} > 700042) BUILD_DEPENDS+= g77-34:${PORTSDIR}/lang/gcc34 +RUN_DEPENDS+= g77-34:${PORTSDIR}/lang/gcc34 FC:= g77-34 F77:= g77-34 -.else +CC:= gcc34 +CXX:= g++34 +. else F77:= f77 FC:= f77 +CC:= gcc +CXX:= g++ . endif + +. else +IGNORE= specifies unknown value "${USE_FORTRAN}" for USE_FORTRAN . endif -MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" +CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" +MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" .endif @@ -220,3 +229,4 @@ @echo CC=${CC} - CXX=${CXX} - CFLAGS=${CFLAGS} @echo F77=${F77} - FC=${FC} - FFLAGS=${FFLAGS} @echo BUILD_DEPENDS=${BUILD_DEPENDS} + @echo RUN_DEPENDS=${RUN_DEPENDS} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#3 (text+ko) ==== @@ -4,8 +4,8 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.4 2008/08/06 16:26:17 mezz Exp $ -# $MCom: ports-stable/Mk/bsd.gecko.mk,v 1.8 2008/06/20 22:17:41 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.12 2009/05/04 19:23:41 miwi Exp $ +# $MCom: ports/Mk/bsd.gecko.mk,v 1.10 2009/04/04 19:54:48 marcus Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -32,7 +32,7 @@ .if !defined(Gecko_Pre_Include) # Please make sure all changes to this file are passed through the maintainer. # Do not commit them yourself (unless of course you're the Port's Wraith ;). -Gecko_Include_MAINTAINER= gnome@FreeBSD.org +Gecko_Include_MAINTAINER= gecko@FreeBSD.org Gecko_Pre_Include= bsd.gecko.mk # Users should use the following syntax: @@ -79,9 +79,11 @@ # ${WRKSRC}/configure # .endif -_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla +_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla \ + libxul thunderbird_PORTSDIR= mail +libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www @@ -130,9 +132,6 @@ .endif # Generic defines -BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins -BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins - GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` @@ -245,11 +244,12 @@ # CONFIGURE_ARGS instead # -MAINTAINER?= gnome@FreeBSD.org +MAINTAINER?= gecko@FreeBSD.org MOZILLA?= ${PORTNAME} MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin +MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} USE_GNOME+= gtk20 libidl desktopfileutils USE_ICONV= yes @@ -266,7 +266,6 @@ MASTER_DIR?= ${.CURDIR}/../../www/mozilla KRB5_HOME?= /usr -BROWSER_PLUGINS_DIR?= lib/browser_plugins MOZ_PIS_DIR?= lib/${MOZILLA}/init.d ESD_LIB?= libesd.so.2 @@ -288,10 +287,6 @@ --exclude */package/* \ --exclude mozilla/gc/boehm -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so - MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin @@ -403,6 +398,7 @@ --disable-pedantic \ --disable-bidi \ --disable-xterm-updates \ + --disable-xprint \ --enable-xinerama MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} @@ -468,6 +464,11 @@ -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} +.if ${ARCH}=="sparc64" +# Work around miscompilation/mislinkage of the sCanonicalVTable hacks. +MOZ_OPTIONS+= --disable-v1-string-abi +.endif + .else # bsd.port.post.mk post-patch: gecko-post-patch gecko-moz-pis-patch @@ -521,8 +522,9 @@ s|echo aout|echo elf|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ @@ -576,10 +578,10 @@ .endfor @${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \ s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \ - ${FAKEDIR}/bin/${MOZILLA}* + ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}* .endif @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${FAKEDIR}/bin/${MOZILLA}* + ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}* ${RM} -f ${FAKEDIR}/bin/*.bak .endif @@ -592,8 +594,6 @@ .for f in ${GECKO_PLIST_PRE_DIRS} ${ECHO_CMD} "@dirrm ${f}" >> ${PLISTD} .endfor - ${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLISTF} - ${ECHO_CMD} "@dirrmtry ${BROWSER_PLUGINS_DIR}" >> ${PLISTD} ${MKDIR} ${FAKEDIR}/libdata ${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ || ${TRUE} ${RM} -f ${FAKEDIR}/lib/pkgconfig @@ -632,8 +632,6 @@ ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/${pcfile}.pc .endfor - ${MKDIR} ${PREFIX}/${BROWSER_PLUGINS_DIR} - ${TOUCH} -f ${PREFIX}/${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep .endif # !defined(NOGECKO_INSTALL) gecko-moz-pis-pre-install: ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#3 (text+ko) ==== @@ -1,12 +1,19 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.148 2008/06/30 20:16:17 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.155 2009/04/13 19:05:11 marcus Exp $ # $NetBSD: $ -# $MCom: ports-stable/Mk/bsd.gnome.mk,v 1.8 2008/06/16 21:35:56 mezz Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.479 2009/03/14 05:55:36 marcus Exp $ # # Please view me with 4 column tabs! +# ======================= USERS ================================= +# +# There are no significant user-definable settings in here. +# This file is a framework to make it easier to create GNOME ports. +# +# ======================= /USERS ================================ + .if !defined(_POSTMKINCLUDED) && !defined(Gnome_Pre_Include) # Please make sure all changes to this file are passed through the maintainer. @@ -57,11 +64,11 @@ oaf orbit pygnome pygtk # GNOME 2 components -_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \ - gal2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ - gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ +_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \ + gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedesktopsharp20 \ + gnomedocutils gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \ - libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \ + libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 libgda4 \ libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \ libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \ librsvg2 libwnck libxml2 libxslt libzvt linc metacity nautilus2 \ @@ -103,11 +110,6 @@ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier -.if !defined(WITHOUT_HACK) -gnomeprefix_PREFIX=${LOCALBASE} -.endif - -gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} ESD_CONFIG?= ${LOCALBASE}/bin/esd-config esound_LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound @@ -254,7 +256,7 @@ _glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 _glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc -_glib20_USE_GNOME_IMPL= gnometarget pkgconfig +_glib20_USE_GNOME_IMPL= pkgconfig glib20_RUN_DEPENDS= ${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend glib20_DETECT= ${LOCALBASE}/lib/gio/modules/libgiofam.so @@ -309,13 +311,9 @@ gnomevfs2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata -gail_LIB_DEPENDS= gailutil.18:${PORTSDIR}/accessibility/gail -gail_DETECT= ${LOCALBASE}/libdata/pkgconfig/gail.pc -gail_USE_GNOME_IMPL= gtk20 - libgnomecanvas_LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas libgnomecanvas_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc -libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 gail +libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 libartlgpl2_LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl libartlgpl2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc @@ -343,7 +341,7 @@ atspi_LIB_DEPENDS= spi.10:${PORTSDIR}/accessibility/at-spi atspi_DETECT= ${LOCALBASE}/libdata/pkgconfig/cspi-1.0.pc -atspi_USE_GNOME_IMPL= gail libbonobo +atspi_USE_GNOME_IMPL= gtk20 libbonobo libgailgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc libgailgnome_RUN_DEPENDS= ${libgailgnome_DETECT}:${PORTSDIR}/x11-toolkits/libgail-gnome @@ -351,13 +349,18 @@ libgtkhtml_LIB_DEPENDS= gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc -libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 gail +libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 -gnomedesktop_LIB_DEPENDS= gnome-desktop-2.2:${PORTSDIR}/x11/gnome-desktop +gnomedesktop_LIB_DEPENDS= gnome-desktop-2.11:${PORTSDIR}/x11/gnome-desktop gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc gnomedesktop_USE_GNOME_IMPL= libgnomeui gnomedocutils gnomedesktop_GNOME_DESKTOP_VERSION=2 +gnomedesktopsharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc >>> TRUNCATED FOR MAIL (1000 lines) <<<