Date: Mon, 18 Aug 2008 23:02:19 GMT From: Alejandro Pulver <alepulver@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 147784 for review Message-ID: <200808182302.m7IN2J4r058574@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147784 Change 147784 by alepulver@alepulver_deimos on 2008/08/18 23:01:43 - Update from depot Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.java.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ldap.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.lua.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.subdir.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.qt.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#3 integrate Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#2 (text+ko) ==== @@ -20,7 +20,7 @@ # Default: ${PREFIX} # # -# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.1 2008/05/27 22:12:02 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.2 2008/08/10 15:43:46 miwi Exp $ CMAKE_MAINTAINER= kde@FreeBSD.org @@ -78,7 +78,7 @@ # # Force makefile verbosity if needed # -.if defined(CMAKE_VERBOSE) +.if defined(CMAKE_VERBOSE) || defined(BATCH) CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.29 2008/06/09 06:01:41 vanilla Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.30 2008/07/26 08:38:53 ale Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -102,6 +102,7 @@ MYSQL41_LIBVER= 14 MYSQL50_LIBVER= 15 MYSQL51_LIBVER= 16 +MYSQL60_LIBVER= 16 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#3 (text+ko) ==== @@ -31,7 +31,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.17 2008/06/28 16:52:40 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.20 2008/08/17 06:57:17 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -40,7 +40,7 @@ # All GCC versions supported by the ports framework. # Please keep them in ascending order. # -GCCVERSIONS= 020702 020801 029500 030200 030301 030402 040100 040200 040300 +GCCVERSIONS= 020801 029500 030301 030402 040100 040200 040300 # # Versions of GCC shipped. @@ -49,10 +49,8 @@ # the base system. # The third field is the version as USE_GCC would use. # -GCCVERSION_020702= 000000 000000 2.7 GCCVERSION_020801= 000000 400012 2.8 GCCVERSION_029500= 400012 500035 2.95 -GCCVERSION_030200= 500039 501103 3.2 GCCVERSION_030301= 501103 502126 3.3 GCCVERSION_030402= 502126 700042 3.4 GCCVERSION_040100= 999999 999999 4.1 @@ -196,8 +194,6 @@ BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} .endif -MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" - .endif # defined(USE_GCC) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson <ahze@FreeBSD.org> # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.2 2008/07/04 08:14:21 adamw Exp $ +# $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 $ # # 4 column tabs prevent hair loss and tooth decay! @@ -12,10 +12,10 @@ # ======================= USERS ================================= # To specify which gecko-based backend you prefer, use something like: # -# WITH_GECKO= firefox3 +# WITH_GECKO= firefox # # The valid backends are: -# firefox firefox3 flock nvu seamonkey thunderbird xulrunner +# firefox flock nvu seamonkey thunderbird xulrunner # # See below for more details. # ======================= /USERS ================================ @@ -79,12 +79,7 @@ # ${WRKSRC}/configure # .endif -.if ${OSVERSION} >= 500000 -.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64" -_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock firefox3 -.endif -.endif -_GECKO_ALL+= mozilla +_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla thunderbird_PORTSDIR= mail ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.50 2008/06/20 15:13:50 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.51 2008/08/12 09:26:51 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -265,11 +265,7 @@ # using any backend # .if defined(USE_GNUSTEP_BACK) -.if defined(WITH_GNUSTEP_DEVEL) BACKSUFFIX?= -014 -.else -BACKSUFFIX?= -012 -.endif .if defined(WITH_GNUSTEP_XDPS) GNUSTEP_WITH_XDPS=yes .elif defined(WITH_GNUSTEP_LIBART) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.java.mk#2 (text+ko) ==== @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.java.mk,v 1.82 2007/10/28 15:09:43 hq Exp $ +# $FreeBSD: ports/Mk/bsd.java.mk,v 1.84 2008/08/18 15:42:41 glewis Exp $ # .if !defined(Java_Include) @@ -169,6 +169,8 @@ # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor +_JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO= PORT=java/diablo-jdk16 HOME=${LOCALBASE}/diablo-jdk1.6.0 \ + VERSION=1.6.0 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \ VERSION=1.5.0 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \ @@ -201,15 +203,15 @@ _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \ - (${ARCH} == "i386" && ${OSVERSION} < 700000) -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 +. if (${OSVERSION} >= 600000 && ${OSVERSION} < 800000) +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 . else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 . endif # List all JDK ports -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ +__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \ + JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \ @@ -249,34 +251,30 @@ . endfor # Error checking: JAVA_VERSION +.if !defined(_JAVA_VERSION_LIST_REGEXP) _JAVA_VERSION_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_VERSION_LIST}" | ${SED} "s/ /\\\|/g" -_ERROR_CHECKING_JAVA_VERSION!= ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" \ - | ${GREP} -v "${_JAVA_VERSION_LIST_REGEXP}" || true -. if (${_ERROR_CHECKING_JAVA_VERSION} != "") +.endif check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; - @${FALSE} -. endif + @test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VERSION_LIST_REGEXP}" || \ + (${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})) || true # Error checking: JAVA_VENDOR +.if !defined(_JAVA_VENDOR_LIST_REGEXP) _JAVA_VENDOR_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_VENDOR_LIST}" | ${SED} "s/ /\\\|/g" -_ERROR_CHECKING_JAVA_VENDOR!= ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" \ - | ${GREP} -v "${_JAVA_VENDOR_LIST_REGEXP}" || true -. if (${_ERROR_CHECKING_JAVA_VENDOR} != "") +.endif check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; - @${FALSE} -. endif + @test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VENDOR_LIST_REGEXP}" || \ + (${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \ + ${FALSE})) || true # Error checking: JAVA_OS +.if !defined(_JAVA_OS_LIST_REGEXP) _JAVA_OS_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_OS_LIST}" | ${SED} "s/ /\\\|/g" -_ERROR_CHECKING_JAVA_OS!= ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" \ - | ${GREP} -v "${_JAVA_OS_LIST_REGEXP}" || true -. if (${_ERROR_CHECKING_JAVA_OS} != "") +.endif check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; - @${FALSE} -. endif + @test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_OS_LIST_REGEXP}" || \ + (${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \ + ${FALSE})) || true # Set default values for JAVA_BUILD and JAVA_RUN # When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre @@ -313,18 +311,30 @@ A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9])\.([0-9])(.*)/\1.\2/} A_JAVA_PORT_OS= ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,} A_JAVA_PORT_VENDOR= ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,} +.if !defined(_JAVA_PORTS_INSTALLED) A_JAVA_PORT_INSTALLED!= ${TEST} -x "${A_JAVA_PORT_HOME}/${_JDK_FILE}" \ && ${ECHO_CMD} "${A_JAVA_PORT}" \ || ${TRUE} __JAVA_PORTS_INSTALLED!= ${ECHO_CMD} "${__JAVA_PORTS_INSTALLED} ${A_JAVA_PORT_INSTALLED}" -A_JAVA_PORT_POSSIBLE!= ${ECHO_CMD} "${_JAVA_VERSION}" | ${GREP} -q "${A_JAVA_PORT_VERSION}" \ - && ${ECHO_CMD} "${_JAVA_OS}" | ${GREP} -q "${A_JAVA_PORT_OS}" \ - && ${ECHO_CMD} "${_JAVA_VENDOR}" | ${GREP} -q "${A_JAVA_PORT_VENDOR}" \ - && ${ECHO_CMD} "${A_JAVA_PORT}" \ - || ${TRUE} -__JAVA_PORTS_POSSIBLE!= ${ECHO_CMD} "${__JAVA_PORTS_POSSIBLE} ${A_JAVA_PORT_POSSIBLE}" +.endif + +# The magic here is that we want to test for a substring using only shell builtins (to avoid forking) +# Our shell does not have an explicit substring operator, but we can build one by using the '#' +# deletion operator ('%' would also work). We try to delete the pattern "*${substr}*" and compare it +# to the original string. If they differ, the substring matched. +# +# We can't do this in make because it doesn't allow nested modifiers ${foo:${bar}} +# +A_JAVA_PORT_POSSIBLE!= ver="${_JAVA_VERSION}"; os="${_JAVA_OS}"; vendor="${_JAVA_VENDOR}"; \ + ${TEST} "$${ver\#*${A_JAVA_PORT_VERSION}*}" != "${_JAVA_VERSION}" -a \ + "$${os\#*${A_JAVA_PORT_OS}*}" != "${_JAVA_OS}" -a \ + "$${vendor\#*${A_JAVA_PORT_VENDOR}*}" != "${_JAVA_VENDOR}" && \ + ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} +__JAVA_PORTS_POSSIBLE:= ${__JAVA_PORTS_POSSIBLE} ${A_JAVA_PORT_POSSIBLE} . endfor +.if !defined(_JAVA_PORTS_INSTALLED) _JAVA_PORTS_INSTALLED= ${__JAVA_PORTS_INSTALLED:C/ [ ]+/ /g} +.endif _JAVA_PORTS_POSSIBLE= ${__JAVA_PORTS_POSSIBLE:C/ [ ]+/ /g} @@ -337,20 +347,28 @@ . undef _JAVA_PORTS_INSTALLED_POSSIBLE . for A_JAVA_PORT in ${_JAVA_PORTS_POSSIBLE} -A_JAVA_PORT_INSTALLED_POSSIBLE!= ${ECHO_CMD} "${_JAVA_PORTS_INSTALLED}" | ${GREP} -q "${A_JAVA_PORT}" \ - && ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} -__JAVA_PORTS_INSTALLED_POSSIBLE!= ${ECHO_CMD} "${__JAVA_PORTS_INSTALLED_POSSIBLE} ${A_JAVA_PORT_INSTALLED_POSSIBLE}" +A_JAVA_PORT_INSTALLED_POSSIBLE!= inst="${_JAVA_PORTS_INSTALLED}"; \ + ${TEST} "$${inst\#*${A_JAVA_PORT}*}" != "${_JAVA_PORTS_INSTALLED}" && \ + ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} +__JAVA_PORTS_INSTALLED_POSSIBLE:= ${__JAVA_PORTS_INSTALLED_POSSIBLE} ${A_JAVA_PORT_INSTALLED_POSSIBLE} . endfor -_JAVA_PORTS_INSTALLED_POSSIBLE= ${__JAVA_PORTS_INSTALLED_POSSIBLE:C/ [ ]+/ /g} +_JAVA_PORTS_INSTALLED_POSSIBLE= ${__JAVA_PORTS_INSTALLED_POSSIBLE:C/[ ]+//g} . if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != "" -_JAVA_PORT!= ${ECHO_CMD} "${_JAVA_PORTS_INSTALLED_POSSIBLE}" \ - | ${AWK} '{ print $$1 }' - +. for i in ${_JAVA_PORTS_INSTALLED_POSSIBLE} +. if !defined(_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit) +_JAVA_PORT= $i +_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit= 1 +. endif +. endfor # If no installed JDK port fits, then pick one from the list of possible ones . else -_JAVA_PORT!= ${ECHO_CMD} "${_JAVA_PORTS_POSSIBLE}" \ - | ${AWK} '{ print $$1 }' +. for i in ${_JAVA_PORTS_POSSIBLE} +. if !defined(_JAVA_PORTS_POSSIBLE_shortcircuit) +_JAVA_PORT= $i +_JAVA_PORTS_POSSIBLE_shortcircuit= 1 +. endif +. endfor . endif _JAVA_PORT_INFO:= ${_JAVA_PORT:S/^/\${_/:S/$/_INFO}/} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.76 2008/04/19 17:46:02 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.78 2008/08/18 09:21:32 miwi Exp $ # # Please view me with 4 column tabs! @@ -34,11 +34,11 @@ # USE_KDEBASE_VER section .if defined(USE_KDEBASE_VER) .if ${USE_KDEBASE_VER} == CVS -LIB_DEPENDS+= kfontinst:${PORTSDIR}/x11/kdebase +LIB_DEPENDS+= kfontinst.0:${PORTSDIR}/x11/kdebase USE_KDELIBS_VER=CVS .elif ${USE_KDEBASE_VER} == 3 # kdebase 3.x common stuff -LIB_DEPENDS+= kfontinst:${PORTSDIR}/x11/kdebase3 +LIB_DEPENDS+= kfontinst.0:${PORTSDIR}/x11/kdebase3 USE_KDELIBS_VER=3 .endif # ${USE_KDEBASE_VER} == 3 .endif # defined(USE_KDEBASE_VER) @@ -64,12 +64,12 @@ .endif .if ${USE_KDELIBS_VER} == CVS -LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs +LIB_DEPENDS+= kimproxy.0:${PORTSDIR}/x11/kdelibs USE_QT_VER= CVS PREFIX= ${KDE_CVS_PREFIX} .elif ${USE_KDELIBS_VER} == 3 # kdelibs 3.x common stuff -LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3 +LIB_DEPENDS+= kimproxy.0:${PORTSDIR}/x11/kdelibs3 USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} .else @@ -102,7 +102,7 @@ # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.8 +KDE_VERSION= 3.5.9 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.12 2008/04/29 19:20:52 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.13 2008/08/15 12:29:42 bsam Exp $ # # Variables: @@ -105,6 +105,20 @@ BRANDELF_DIRS?= BRANDELF_FILES?= +# For ports that define PORTDOCS, be sure not to install +# documentation if NOPORTDOCS is defined +. if defined(PORTDOCS) && defined(NOPORTDOCS) +pre-patch: linux-rpm-clean-portdocs + +. if !target(linux-rpm-clean-portdocs) +linux-rpm-clean-portdocs: +. for x in ${PORTDOCS} + @${RM} -f ${WRKDIR}/${DOCSDIR_REL}/${x} +. endfor + @${RMDIR} ${WRKDIR}/${DOCSDIR_REL} +. endif +. endif + . if defined(AUTOMATIC_PLIST) . if ${USE_LINUX} == "fc4" || ${USE_LINUX:L} == "yes" ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.lua.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.16 2008/02/18 18:41:26 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.18 2008/08/10 19:29:42 alepulver Exp $ # # bsd.lua.mk - Support for Lua based ports. # @@ -105,6 +105,26 @@ # running. # USE_LUA_NOT=5.1 # +# Notes about the integration of lua related ports with bsd.lua.mk: +# (please read when updating ports referred here, see lang/lua[0-9]*) +# +# The lua/tolua ports have to be patched so they can coexist, as the internal +# application build infrastructure does not handle it automatically. Currently +# the framework provides variables to the lua ports themselves, so changing +# some things here won't require changes in lang/{lua,tolua}*. +# +# For lua ports: if they install a static library, use the same method for +# tolua ports, otherwise in addition the libraries have to be symlinked to the +# common library directory with a versioned name, and linked with the -soname +# parameter (so when a port links with -L/usr/local/lib/lua51 -llua, it stores +# the dynamic dependency as the name which figures under /usr/local/lib). +# +# For tolua ports: as it is a static library (.a), installing binaries, +# headers and libraries under a versioned directory is fine (binary has also a +# symlink). +# +# The lua modules install in a separate directory, so there is no problem. +# LUA_Include_MAINTAINER= alepulver@FreeBSD.org @@ -150,7 +170,7 @@ _LUA_PORT_lua_5.0= lang/lua50 _LUA_DEPTYPE_lua_5.0= lib -_LUA_PORT_tolua_5.0= lang/tolua +_LUA_PORT_tolua_5.0= lang/tolua50 _LUA_PORT_ruby_5.0= lang/ruby-lua _LUA_PORT_app_5.0= devel/lua50-app @@ -164,13 +184,14 @@ _LUA_PORT_socket_5.0= net/lua50-luasocket _LUA_PORT_lua_5.1= lang/lua -_LUA_DEPTYPE_lua_5.1= build +_LUA_DEPTYPE_lua_5.1= lib _LUA_PORT_filename_5.1= devel/lua-filename _LUA_PORT_gettext_5.1= devel/lua-gettext _LUA_PORT_posix_5.1= devel/lua-posix _LUA_PORT_pty_5.1= devel/lua-pty _LUA_PORT_socket_5.1= net/luasocket +_LUA_PORT_tolua_5.1= lang/tolua . for comp in ${_LUA_COMPS_ALL} _LUA_COMP= ${comp} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.38 2008/03/30 11:38:02 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.39 2008/08/05 09:33:07 dinoex Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # @@ -121,11 +121,14 @@ exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) # find installed port and use it for dependency PKG_DBDIR?= ${DESTDIR}/var/db/pkg -OPENSSL_INSTALLED!= grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \ +.if !defined(OPENSSL_INSTALLED) +OPENSSL_INSTALLED!= find "${PKG_DBDIR}" -type f -name "+CONTENTS" -print0 | \ + xargs -0 grep -l "^lib/libssl.so." | \ while read contents; do \ sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \ if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \ echo "$${contents}"; break; fi; done +.endif OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2 OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#2 (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.45 2008/01/21 07:19:24 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.46 2008/07/11 10:57:15 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 @@ -234,7 +234,7 @@ # Extensions .if defined(_POSTMKINCLUDED) && ${USE_PHP:L} != "yes" # non-version specific components -_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dbase \ +_USE_PHP_ALL= apc bcmath bitset bz2 calendar ctype curl dba dbase \ exif fileinfo fribidi ftp gd gettext gmp \ hash iconv imap interbase json ldap mbstring mcrypt \ memcache mhash mssql mysql ncurses odbc \ @@ -249,6 +249,7 @@ pdo_mysql pdo_sqlite \ simplexml soap spl sqlite tidy xmlreader xmlwriter xsl +apc_DEPENDS= www/pecl-APC bcmath_DEPENDS= math/php${PHP_VER}-bcmath bitset_DEPENDS= math/pecl-bitset bz2_DEPENDS= archivers/php${PHP_VER}-bz2 ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.595 2008/06/30 20:16:17 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.601 2008/08/09 16:52:04 miwi Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -312,9 +312,6 @@ # GMAKE - Set to path of GNU make if not in $PATH. # Default: gmake ## -# USE_GETOPT_LONG -# - If set, this port uses getopt_long. May be obsolete. -## # USE_ICONV - If set, this port uses libiconv. # USE_GETTEXT - If set, this port uses GNU gettext (libintl). ## @@ -384,7 +381,7 @@ # Supported components are: glut, glu, glw, gl and linux. # If set to "yes", this is equivalent to "glu". Note that # glut depends on glu, glw and glu depend on gl. -# USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XPM. +# USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XORG+= xpm # NO_OPENMOTIF - If set, this port uses a custom Motif toolkit # instead of Openmotif. # Used only when USE_MOTIF is set. @@ -394,14 +391,13 @@ ## # USE_SDL - If set, this port uses the sdl libraries. # See bsd.sdl.mk for more information. -# USE_XPM - If set, this port uses the xpm graphics libraries. ## # USE_OPENSSL - If set, this port relies on the OpenSSL package. ## # USE_OPENLDAP - If set, this port uses the OpenLDAP libraries. # Implies: WANT_OPENLDAP_VER?=23 # WANT_OPENLDAP_VER -# - Legal values are: 22, 23, 24 +# - Legal values are: 23, 24 # If set to an unkown value, the port is marked BROKEN. # WANT_OPENLDAP_SASL # - If set, the system should use OpenLDAP libraries @@ -465,10 +461,15 @@ # USE_KDELIBS_VER - Set to 3 to use the KDE libraries. # Implies inclusion of bsd.kde.mk. # +# USE_KDE4 - A list of the KDE4 dependencies the port has (e.g., +# kdelibs, kdebase). Implies that the port needs KDE. +# Implies inclusion of bsd.kde4.mk. See bsd.kde4.mk +# for more details. +# # USE_QT_VER - Set to 3 or 4 to use the respective version # of the QT libraries. # Implies inclusion of bsd.kde.mk. -## +# # USE_LINUX - Set to yes to say the port needs the default linux base port. # Set to value <X>, if the port needs emulators/linux_base-<X>. # If set to "7", a dependency is registered to emulators/linux_base. @@ -594,7 +595,7 @@ # - A command to install binary executables. (By # default, also strips them, unless ${STRIP} is # overridden to be the empty string). -# INSTALL_KLD - As INSTALL_KLD, but without the STRIP. +# INSTALL_KLD - As INSTALL_PROGRAM, but without the STRIP. # INSTALL_SCRIPT # - A command to install executable scripts. # INSTALL_DATA - A command to install sharable data. @@ -807,7 +808,7 @@ # FETCH_BINARY - Path to ftp/http fetch command if not in $PATH. # Default: "/usr/bin/fetch" # FETCH_ARGS - Arguments to ftp/http fetch command. -# Default: "-ARr" +# Default: "-ApRr" # FETCH_CMD - ftp/http fetch command. # Default: ${FETCH_BINARY} ${FETCH_ARGS} # FETCH_BEFORE_ARGS @@ -1129,13 +1130,13 @@ .else -# Look for ${WRKSRC}/.../*.orig files, and (re-)create +# Look for ${PATCH_WRKSRC}/.../*.orig files, and (re-)create # ${FILEDIR}/patch-* files from them. .if !target(makepatch) makepatch: @cd ${.CURDIR} && ${MKDIR} ${FILESDIR} - @(cd ${WRKSRC}; \ + @(cd ${PATCH_WRKSRC}; \ for i in `find . -type f -name '*.orig'`; do \ ORG=$$i; \ NEW=$${i%.orig}; \ @@ -1241,14 +1242,13 @@ UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} .endif OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options -_OPTIONSFILE!= ${ECHO_CMD} "${OPTIONSFILE}" .if defined(OPTIONS) # include OPTIONSFILE first if exists -. if exists(${_OPTIONSFILE}) && !make(rmconfig) -. include "${_OPTIONSFILE}" +. if exists(${OPTIONSFILE}) && !make(rmconfig) +. include "${OPTIONSFILE}" . endif -. if exists(${_OPTIONSFILE}.local) -. include "${_OPTIONSFILE}.local" +. if exists(${OPTIONSFILE}.local) +. include "${OPTIONSFILE}.local" . endif WITHOUT:= WITH:= @@ -1504,7 +1504,7 @@ .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) +.if defined(WANT_GNOME) || defined(USE_GNOME) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -1532,6 +1532,10 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif +.if defined(USE_KDE4) || defined(KDE4_BUILDENV) +.include "${PORTSDIR}/Mk/bsd.kde4.mk" +.endif + # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if (${PREFIX:C,(^.).*,\1,} != "/") @@ -1545,8 +1549,6 @@ # Location of mounted CDROM(s) to search for files CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT} -WANT_OPENLDAP_VER?= 23 - # Owner and group of the WWW user WWWOWN?= www WWWGRP?= www @@ -1587,6 +1589,10 @@ PLIST_REINPLACE_RMTRY=s!^@rmtry \(.*\)!@unexec rm -f %D/\1 2>/dev/null || true! PLIST_REINPLACE_STOPDAEMON=s!^@stopdaemon \(.*\)!@unexec %D/etc/rc.d/\1${RC_SUBR_SUFFIX} forcestop 2>/dev/null || true! +# kludge to strip trailing whitespace from CFLAGS; +# sub-configure will not # survive double space +CFLAGS:= ${CFLAGS:C/ $//} + .if defined(WITHOUT_CPU_CFLAGS) .if defined(_CPUCFLAGS) .if !empty(_CPUCFLAGS) @@ -1654,7 +1660,7 @@ HAVE_COMPAT_IA32_LIBS?= YES .endif .if !defined(HAVE_COMPAT_IA32_KERN) -HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -a compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi +HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi .endif .endif @@ -1690,26 +1696,8 @@ .include "${PORTSDIR}/Mk/bsd.gcc.mk" .endif -.if defined(USE_OPENLDAP_VER) -USE_OPENLDAP?= yes -WANT_OPENLDAP_VER= ${USE_OPENLDAP_VER} -.endif - -.if defined(USE_OPENLDAP) -.if defined(WANT_OPENLDAP_SASL) -_OPENLDAP_FLAVOUR= -sasl -.else -_OPENLDAP_FLAVOUR= -.endif -.if ${WANT_OPENLDAP_VER} == 22 -LIB_DEPENDS+= ldap-2.2.7:${PORTSDIR}/net/openldap22${_OPENLDAP_FLAVOUR}-client -.elif ${WANT_OPENLDAP_VER} == 23 -LIB_DEPENDS+= ldap-2.3.2:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client -.elif ${WANT_OPENLDAP_VER} == 24 -LIB_DEPENDS+= ldap-2.4.2:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client -.else -IGNORE= cannot be built with unknown OpenLDAP version: ${WANT_OPENLDAP_VER} -.endif +.if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER) +.include "${PORTSDIR}/Mk/bsd.ldap.mk" .endif .if defined(USE_FAM) @@ -1834,7 +1822,7 @@ .endif .if defined(USE_MOTIF) -USE_XPM= yes +USE_XORG+= xpm .if defined(WANT_LESSTIF) LIB_DEPENDS+= Xm:${PORTSDIR}/x11-toolkits/lesstif NO_OPENMOTIF= yes @@ -1880,7 +1868,7 @@ .endif .if defined(USE_XPM) -USE_XORG+= xpm +IGNORE= USE_XPM is deprecated. Use USE_XORG=xpm instead. .endif XAWVER= 8 @@ -2017,7 +2005,7 @@ .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) +.if defined(WANT_GNOME) || defined(USE_GNOME) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -2025,6 +2013,10 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif +.if defined(USE_KDE4) +.include "${PORTSDIR}/Mk/bsd.kde4.mk" +.endif + .if defined(USE_CMAKE) .include "${PORTSDIR}/Mk/bsd.cmake.mk" .endif @@ -2112,8 +2104,9 @@ MAKEFILE?= Makefile MAKE_ENV+= PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ - MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" + MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \ + CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ + MANPREFIX="${MANPREFIX}" # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher. # gcc 4.x enable strict aliasing optimization with -O2 which is known to break @@ -2257,7 +2250,7 @@ MAKE_ENV+= ${INSTALL_MACROS} SCRIPTS_ENV+= ${INSTALL_MACROS} -# Macro for coping entire directory tree with correct permissions +# Macro for copying entire directory tree with correct permissions .if ${UID} == 0 COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ 2>&1) && \ @@ -2357,7 +2350,7 @@ .include "${PORTSDIR}/Mk/bsd.licenses.mk" # Popular master sites -.include "bsd.sites.mk" +.include "${PORTSDIR}/Mk/bsd.sites.mk" # Empty declaration to avoid "variable MASTER_SITES recursive" error MASTER_SITES?= @@ -3286,8 +3279,8 @@ .endif .if defined(_OPTIONS_READ) @${ECHO_MSG} "===> Found saved configuration for ${_OPTIONS_READ}" -.if ${OPTIONSFILE} != ${_OPTIONSFILE} - @${ECHO_MSG} "===> *** CAUTION *** Using wrong configuration file ${_OPTIONSFILE}" +.if ${OPTIONSFILE} != ${OPTIONSFILE} + @${ECHO_MSG} "===> *** CAUTION *** Using wrong configuration file ${OPTIONSFILE}" .endif .endif @@ -5303,14 +5296,46 @@ # If this ever changes, portmgr should contact the portsnap maintainer # first to avoid gratuitous breakage. -.if !target(describe) +# XXX Older versions do not support the :u make modifier. The .else +# clause can be removed once 6.3-RELEASE is no longer supported. +.if ${OSVERSION} >= 603104 +. if !target(describe) +_EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} ${_LIB_DEPENDS} +_RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} ${_LIB_DEPENDS} +. if exists(${DESCR}) +_DESCR=${DESCR} +. else +_DESCR=/dev/null +. endif + +describe: + @${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|"; \ + ${ECHO_CMD} -n ${COMMENT:Q}; \ + ${ECHO_CMD} -n "|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|"; \ + while read one two discard; do \ + case "$$one" in \ + WWW:) case "$$two" in \ + https://*|http://*|ftp://*) ${ECHO_CMD} -n "$$two" ;; \ + *) ${ECHO_CMD} -n "http://$$two" ;; \ + esac; \ + break; \ + ;; \ + esac; \ + done < ${DESCR}; ${ECHO_CMD} +. endif +.else +. if !target(describe) describe: @${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|" -.if defined(COMMENT) +. if defined(COMMENT) @${ECHO_CMD} -n ${COMMENT:Q} -.else +. else @${ECHO_CMD} -n '** No Description' -.endif +. endif @perl -e ' \ if ( -f q{${DESCR}} ) { \ print q{|${DESCR}}; \ @@ -5365,6 +5390,7 @@ } \ } \ print qq{\n};' +. endif .endif www-site: @@ -5792,23 +5818,23 @@ .if !defined(OPTIONS) @${ECHO_MSG} "===> No options to configure" .else -.if ${OPTIONSFILE} != ${_OPTIONSFILE} - @${ECHO_MSG} "===> Using wrong configuration file ${_OPTIONSFILE}" +.if ${OPTIONSFILE} != ${OPTIONSFILE} + @${ECHO_MSG} "===> Using wrong configuration file ${OPTIONSFILE}" @exit 1 .endif .if ${UID} != 0 && !defined(INSTALL_AS_USER) - @optionsdir=${_OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ + @optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ ${ECHO_MSG} "===> Switching to root credentials to create $${optionsdir}"; \ (${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \ ${ECHO_MSG} "===> Returning to user credentials" .else - @(optionsdir=${_OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ + @(optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ ${MKDIR} $${optionsdir} 2> /dev/null) || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1) .endif - -@if [ -e ${_OPTIONSFILE} ]; then \ - . ${_OPTIONSFILE}; \ + -@if [ -e ${OPTIONSFILE} ]; then \ + . ${OPTIONSFILE}; \ fi; \ set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ @@ -5858,11 +5884,11 @@ fi; \ done; \ if [ `${ID} -u` != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ - ${ECHO_MSG} "===> Switching to root credentials to write ${_OPTIONSFILE}"; \ - ${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${_OPTIONSFILE}"; \ + ${ECHO_MSG} "===> Switching to root credentials to write ${OPTIONSFILE}"; \ + ${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}"; \ ${ECHO_MSG} "===> Returning to user credentials"; \ else \ - ${CAT} $${TMPOPTIONSFILE} > ${_OPTIONSFILE}; \ + ${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}; \ fi; \ ${RM} -f $${TMPOPTIONSFILE} .endif @@ -5879,9 +5905,9 @@ .if !target(config-conditional) config-conditional: .if defined(OPTIONS) -.if exists(${_OPTIONSFILE}) +.if exists(${OPTIONSFILE}) # scan saved options and invalidate them, if the set of options does not match - @. ${_OPTIONSFILE}; \ + @. ${OPTIONSFILE}; \ set ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ withvar=WITH_$$1; \ @@ -5913,8 +5939,8 @@ showconfig: .if defined(OPTIONS) @${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME}:" - -@if [ -e ${_OPTIONSFILE} ]; then \ - . ${_OPTIONSFILE}; \ + -@if [ -e ${OPTIONSFILE} ]; then \ + . ${OPTIONSFILE}; \ fi; \ set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ @@ -5939,16 +5965,16 @@ .if !target(rmconfig) rmconfig: -.if defined(OPTIONS) && exists(${_OPTIONSFILE}) +.if defined(OPTIONS) && exists(${OPTIONSFILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ - optionsdir=${_OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ + optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ if [ `${ID} -u` != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ - ${ECHO_MSG} "===> Switching to root credentials to remove ${_OPTIONSFILE} and $${optionsdir}"; \ - ${SU_CMD} "${RM} -f ${_OPTIONSFILE} ; \ + ${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \ + ${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \ ${RMDIR} $${optionsdir}"; \ ${ECHO_MSG} "===> Returning to user credentials"; \ else \ - ${RM} -f ${_OPTIONSFILE}; \ + ${RM} -f ${OPTIONSFILE}; \ ${RMDIR} $${optionsdir}; \ fi .else ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.subdir.mk#2 (text+ko) ==== @@ -2,7 +2,7 @@ # ex:ts=4 # # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.74 2008/03/12 00:13:06 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.75 2008/07/19 17:59:41 kris Exp $ # # The include file <bsd.port.subdir.mk> contains the default targets # for building ports subdirectories. @@ -63,13 +63,15 @@ STRIP?= -s .endif +# These are variables that are invariant for the lifetime of a recursive port traversal +# (index build, etc), so it is more efficient to precompute them here and pass them in +# to child makes explicitly, instead of recomputing them tens of thousands of times. + .if !defined(NOPRECIOUSMAKEVARS) .if !defined(ARCH) ARCH!= ${UNAME} -p .endif -.if !defined(OSREL) -OSREL!= ${UNAME} -r | ${SED} -e 's/[-(].*//' -.endif + .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h @@ -79,23 +81,76 @@ OSVERSION!= ${SYSCTL} -n kern.osreldate .endif .endif + +.if !defined(_OSRELEASE) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808182302.m7IN2J4r058574>