Date: Sat, 28 Jul 2007 17:45:22 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 124274 for review Message-ID: <200707281745.l6SHjMxn067415@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=124274 Change 124274 by gabor@gabor_server on 2007/07/28 17:44:56 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/MOVED#15 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#6 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#38 edit .. //depot/projects/soc2006/gabor_destdir/UPDATING#12 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/MOVED#15 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1432 2007/07/26 13:44:57 bsam Exp $ +# $FreeBSD: ports/MOVED,v 1.1436 2007/07/28 16:41:27 chinsan Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -1130,7 +1130,6 @@ security/drwebd|security/drweb|2004-06-29|functionality already in security/drweb www/drivel|deskutils/drivel|2004-06-30|moved to category deskutils devel/autoconf257||2004-07-01|autotools cleanup -devel/automake17||2004-07-01|autotools cleanup devel/libtool14||2004-07-01|autotools cleanup math/libgmp-freebsd|math/libgmp4|2004-07-02|superseded by API compatible version devel/umbrello|devel/kdesdk3|2004-07-02|Umbrello was integrated into kdesdk package @@ -1210,7 +1209,6 @@ audio/libvorbis-aotuv|audio/libvorbis|2004-10-13|The aoTuV enhancement has been merged into the mainstream graphics/kolourpaint|graphics/kdegraphics3|2004-10-13|kolourpaint was integrated into the kdegraphics3 port graphics/kimagemapeditor|www/kdewebdev|2004-10-13|kimagemapeditor was integrated into the kdewebdev port -devel/automake18|devel/automake19|2004-10-15|automake18 replaced with automake19 www/zope-cmftransforms|www/zope-portaltransforms|2004-10-16|renamed by authors dns/bind9-sdb-mysql||2004-10-17|No longer maintained www/phpnuke||2004-10-17|security vulnerabilities and no longer maintained @@ -3110,3 +3108,7 @@ german/de-py-qt4-eric4|german/eric4|2007-07-25|Moved to german/eric4 russian/ru-py-qt4-eric4|russian/eric4|2007-07-25|Moved to russian/eric4 devel/py-qt4-eric4|devel/eric4|2007-07-25|Moved to devel/eric4 +science/liblr|science/liblinear|2007-07-28|Project renamed +games/freeciv-gtk|games/freeciv|2007-07-28|Dropped gtk1 support +games/freeciv-gtk2|games/freeciv|2007-07-28|Gtk2 is supported by default now +math/cvcl||2007-07-28|Has expired: CVC Lite is no longer supported. Please use CVC3 (math/cvc3) for all your validity checking needs! ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.29 2007/06/16 19:03:50 pav Exp $ +# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.30 2007/07/28 06:33:42 ade Exp $ # # Please view me with 4 column tabs! # @@ -11,21 +11,6 @@ Autotools_Include_MAINTAINER= ade@FreeBSD.org #--------------------------------------------------------------------------- -# IMPORTANT! READ ME! YES, THAT MEANS YOU! -# -# The "versioned" autotools referenced here are for BUILDING other ports -# only. THIS CANNOT BE STRESSED HIGHLY ENOUGH. Things WILL BREAK if you -# try to use them for anything other than ports/ work. This particularly -# includes use as a run-time dependency. -# -# If you need unmodified versions of autotools, such as for use in an -# IDE, then you MUST use the devel/gnu-* equivalents, and NOT these. -# See devel/anjuta and devel/kdevelop for examples. -# -# You have been WARNED! -#--------------------------------------------------------------------------- - -#--------------------------------------------------------------------------- # Entry point into the autotools system #--------------------------------------------------------------------------- # @@ -34,6 +19,10 @@ # 'tool' can currently be one of: # libtool, libltdl, autoconf, autoheader, automake, aclocal # +# There is also a special tool, called 'autotools', which is +# a convenience function to simply bring in dependencies of +# all the autotools. +# # 'version' is tool dependent # # ':env' is used to pecify that the environment variables are needed, @@ -75,10 +64,23 @@ AUTOTOOL_${item:C/^([^:]+).*/\1/}${item:M*\:*\:*:C/^[^:]+:[^:]+:([^:]+)/_\1/}= ${item:C/^[^:]+:([^:]+).*/\1/} .endfor -# XXX: temporary to highlight any missed ports in the conversion -# -.if defined(AUTOTOOL_libtool_inc) -IGNORE+= error: libtool:${AUTOTOOL_libtool_inc}:inc construct no longer available +#--------------------------------------------------------------------------- +# AUTOTOOLS handling (for build, runtime, and both) +#--------------------------------------------------------------------------- +.if defined(AUTOTOOL_autotools) +AUTOTOOLS_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools + +. if ${AUTOTOOL_autotools} == "build" +BUILD_DEPENDS+= ${AUTOTOOLS_DEPENDS} +. elif ${AUTOTOOL_autotools} == "run" +RUN_DEPENDS+= ${AUTOTOOLS_DEPENDS} +. elif ${AUTOTOOL_autotools} == "both" +BUILD_DEPENDS+= ${AUTOTOOLS_DEPENDS} +RUN_DEPENDS+= ${AUTOTOOLS_DEPENDS} +. else +IGNORE+= Unknown autotools stanza: ${AUTOTOOL_autotools} +. endif + .endif #--------------------------------------------------------------------------- @@ -97,6 +99,7 @@ .if defined(AUTOTOOL_automake_env) AUTOMAKE_VERSION= ${AUTOTOOL_automake_env} +AUTOMAKE_SUFFIX= ${AUTOMAKE_VERSION:C/([0-9])(.*)/\1.\2/} # Make sure we specified a legal version of automake # @@ -106,12 +109,11 @@ # Set up the automake environment # -AUTOMAKE= ${LOCALBASE}/bin/automake${AUTOMAKE_VERSION} -AUTOMAKE_DIR= ${LOCALBASE}/share/automake${AUTOMAKE_VERSION} -ACLOCAL= ${LOCALBASE}/bin/aclocal${AUTOMAKE_VERSION} -ACLOCAL_DIR= ${LOCALBASE}/share/aclocal${AUTOMAKE_VERSION} -AUTOMAKE_PATH= ${LOCALBASE}/libexec/automake${AUTOMAKE_VERSION}: -AUTOMAKE_VARS= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} +AUTOMAKE= ${LOCALBASE}/bin/automake-${AUTOMAKE_SUFFIX} +AUTOMAKE_DIR= ${LOCALBASE}/share/automake-${AUTOMAKE_SUFFIX} +ACLOCAL= ${LOCALBASE}/bin/aclocal-${AUTOMAKE_SUFFIX} +ACLOCAL_DIR= ${LOCALBASE}/share/aclocal-${AUTOMAKE_SUFFIX} +AUTOMAKE_VARS= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} AUTOMAKE_DEPENDS= ${AUTOMAKE}:${PORTSDIR}/devel/automake${AUTOMAKE_VERSION} BUILD_DEPENDS+= ${AUTOMAKE_DEPENDS} @@ -143,6 +145,7 @@ .if defined(AUTOTOOL_autoconf_env) AUTOCONF_VERSION= ${AUTOTOOL_autoconf_env} +AUTOCONF_SUFFIX= ${AUTOCONF_VERSION:C/([0-9])(.*)/\1.\2/} # Make sure we specified a legal version of autoconf # @@ -152,16 +155,15 @@ # Set up the autoconf/autoheader environment # -AUTOCONF= ${LOCALBASE}/bin/autoconf${AUTOCONF_VERSION} -AUTOCONF_DIR= ${LOCALBASE}/share/autoconf${AUTOCONF_VERSION} -AUTOHEADER= ${LOCALBASE}/bin/autoheader${AUTOCONF_VERSION} -AUTOIFNAMES= ${LOCALBASE}/bin/ifnames${AUTOCONF_VERSION} -AUTOM4TE= ${LOCALBASE}/bin/autom4te${AUTOCONF_VERSION} -AUTORECONF= ${LOCALBASE}/bin/autoreconf${AUTOCONF_VERSION} -AUTOSCAN= ${LOCALBASE}/bin/autoscan${AUTOCONF_VERSION} -AUTOUPDATE= ${LOCALBASE}/bin/autoupdate${AUTOCONF_VERSION} -AUTOCONF_PATH= ${LOCALBASE}/libexec/autoconf${AUTOCONF_VERSION}: -AUTOCONF_VARS= AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} AUTOIFNAMES=${AUTOIFNAMES} AUTOM4TE=${AUTOM4TE} AUTORECONF=${AUTORECONF} AUTOSCAN=${AUTOSCAN} AUTOUPDATE=${AUTOUPDATE} +AUTOCONF= ${LOCALBASE}/bin/autoconf-${AUTOCONF_SUFFIX} +AUTOCONF_DIR= ${LOCALBASE}/share/autoconf-${AUTOCONF_SUFFIX} +AUTOHEADER= ${LOCALBASE}/bin/autoheader-${AUTOCONF_SUFFIX} +AUTOIFNAMES= ${LOCALBASE}/bin/ifnames-${AUTOCONF_SUFFIX} +AUTOM4TE= ${LOCALBASE}/bin/autom4te-${AUTOCONF_SUFFIX} +AUTORECONF= ${LOCALBASE}/bin/autoreconf-${AUTOCONF_SUFFIX} +AUTOSCAN= ${LOCALBASE}/bin/autoscan-${AUTOCONF_SUFFIX} +AUTOUPDATE= ${LOCALBASE}/bin/autoupdate-${AUTOCONF_SUFFIX} +AUTOCONF_VARS= AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} AUTOIFNAMES=${AUTOIFNAMES} AUTOM4TE=${AUTOM4TE} AUTORECONF=${AUTORECONF} AUTOSCAN=${AUTOSCAN} AUTOUPDATE=${AUTOUPDATE} AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOCONF_DEPENDS= ${AUTOCONF}:${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION} BUILD_DEPENDS+= ${AUTOCONF_DEPENDS} @@ -221,21 +223,8 @@ # Now that we've got our environments defined for autotools, add them # in so that the rest of the world can handle them # -AUTOTOOLS_PATH= ${AUTOMAKE_PATH}${AUTOCONF_PATH} AUTOTOOLS_VARS= ${AUTOMAKE_VARS} ${AUTOCONF_VARS} ${LIBTOOL_VARS} -.if defined(AUTOTOOLS_PATH) && (${AUTOTOOLS_PATH} != "") -AUTOTOOLS_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -CONFIGURE_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -MAKE_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -SCRIPTS_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -. for item in automake aclocal autoconf autoheader libtool -. if defined(AUTOTOOL_${item}_env) -${item:U}_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -. endif -. endfor -.endif - .if defined(AUTOTOOLS_VARS) && (${AUTOTOOLS_VARS} != "") AUTOTOOLS_ENV+= ${AUTOTOOLS_VARS} CONFIGURE_ENV+= ${AUTOTOOLS_VARS} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#5 (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.13 2007/07/12 01:57:10 maho Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.14 2007/07/27 21:40:10 pav Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -96,7 +96,7 @@ . endif . endif -MAKE_ENV+= F77="${F77}" FC="${FC}" +MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" .endif .if defined(USE_GCC) @@ -195,7 +195,7 @@ BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} .endif -MAKE_ENV+= CC="${CC}" CXX="${CXX}" +MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" test-gcc: @echo USE_GCC=${USE_GCC} @@ -204,7 +204,7 @@ .else @echo Port cannot use later versions. .endif - @echo WITH_FORTRAN=${WITH_FORTRAN} + @echo USE_FORTRAN=${USE_FORTRAN} .for v in ${GCCVERSIONS} @echo -n "GCC version: ${_GCCVERSION_${v}_V} " .if defined(_GCC_FOUND${v}) @@ -214,5 +214,7 @@ # @echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V} .endfor @echo Using GCC version ${_USE_GCC} - @echo CC:${CC} - CXX:${CXX} - F77:${F77} - FC:${FC} - BUILD_DEPENDS:${BUILD_DEPENDS} + @echo CC=${CC} - CXX=${CXX} - CFLAGS=${CFLAGS} + @echo F77=${F77} - FC=${FC} - FFLAGS=${FFLAGS} + @echo BUILD_DEPENDS=${BUILD_DEPENDS} .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#38 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.576 2007/07/23 09:35:27 rafan Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.577 2007/07/27 21:40:11 pav Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -1173,29 +1173,6 @@ MASTER_PORT?= .endif -# Check the compatibility layer for amd64/ia64 - -.if ${ARCH} == "amd64" || ${ARCH} =="ia64" -.if exists(/usr/lib32) -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 -.endif -.endif - -.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386" -.if ${ARCH} == "amd64" || ${ARCH} == "ia64" -.if !defined(HAVE_COMPAT_IA32_KERN) -IGNORE= you need a kernel with compiled-in IA32 compatibility to use this port. -.elif !defined(HAVE_COMPAT_IA32_LIBS) -IGNORE= you need the 32-bit libraries installed under /usr/lib32 to use this port. -.endif -.else -IGNORE= you have to use i386 (or compatible) platform to use this port. -.endif -.endif - # If they exist, include Makefile.inc, then architecture/operating # system specific Makefiles, then local Makefile.local. @@ -1640,6 +1617,34 @@ .endif .endif +# Check the compatibility layer for amd64/ia64 + +.if ${ARCH} == "amd64" || ${ARCH} =="ia64" +.if exists(/usr/lib32) +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 +.endif +.endif + +.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386" +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" +.if !defined(HAVE_COMPAT_IA32_KERN) +IGNORE= requires a kernel with compiled-in IA32 compatibility +.elif !defined(HAVE_COMPAT_IA32_LIBS) +IGNORE= requires 32-bit libraries installed under /usr/lib32 +.endif +_LDCONFIG_FLAGS=-32 +LIB32DIR= lib32 +.else +IGNORE= requires i386 (or compatible) platform to run +.endif +.else +LIB32DIR= lib +.endif +PLIST_SUB+= LIB32DIR=${LIB32DIR} + .if defined(USE_ZIP) EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif @@ -1673,7 +1678,7 @@ .elif ${WANT_OPENLDAP_VER} == 24 LIB_DEPENDS+= ldap-2.4.2:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client .else -IGNORE= unknown OpenLDAP version: ${WANT_OPENLDAP_VER} +IGNORE= cannot be built with unknown OpenLDAP version: ${WANT_OPENLDAP_VER} .endif .endif @@ -1691,7 +1696,7 @@ .if defined(WANT_FAM_SYSTEM) .if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM}!=${WANT_FAM_SYSTEM} -IGNORE= The port wants to use ${WANT_FAM_SYSTEM} as its FAM system and you wish to use ${WITH_FAM_SYSTEM} +IGNORE= wants to use ${WANT_FAM_SYSTEM} as its FAM system, while you wish to use ${WITH_FAM_SYSTEM} .endif FAM_SYSTEM= ${WANT_FAM_SYSTEM} .elif defined(WITH_FAM_SYSTEM) @@ -1706,14 +1711,14 @@ .if defined(_HAVE_FAM_SYSTEM) .if ${_HAVE_FAM_SYSTEM}!= ${FAM_SYSTEM} -BROKEN= FAM system mismatch: ${_HAVE_FAM_SYSTEM} is installed and desired FAM system is ${FAM_SYSTEM} +BROKEN= FAM system mismatch: ${_HAVE_FAM_SYSTEM} is installed, while desired FAM system is ${FAM_SYSTEM} .endif .endif .if defined(FAM_SYSTEM_${FAM_SYSTEM:U}) LIB_DEPENDS+= ${FAM_SYSTEM_${FAM_SYSTEM:U}} .else -IGNORE= unknown FAM system: ${FAM_SYSTEM} +IGNORE= cannot be built with unknown FAM system: ${FAM_SYSTEM} .endif .endif # USE_FAM @@ -1791,7 +1796,7 @@ . if ${USE_LINUX:L} == "yes" LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-fc4 . else -IGNORE= There is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT. +IGNORE= cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT . endif . endif @@ -1847,7 +1852,7 @@ X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable .else -IGNORE= cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4' and 'xorg' +IGNORE= cannot be installed: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4' and 'xorg' .endif .if defined(USE_IMAKE) @@ -1902,7 +1907,7 @@ . for _component in ${USE_GL} . if !defined(_GL_${_component}_LIB_DEPENDS) && \ !defined(_GL_${_component}_RUN_DEPENDS) -IGNORE= uses unknown GL component +IGNORE= uses unknown GL component . else LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS} RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS} @@ -2095,18 +2100,6 @@ REINPLACE_ARGS?= -i.bak REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} -# Macro for coping entire directory tree with correct permissions -COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ - 2>&1) && \ - ${CHOWN} -R ${BINOWN}:${BINGRP} $$1 && \ - ${FIND} $$1 -type d -exec chmod 755 {} \; && \ - ${FIND} $$1 -type f -exec chmod ${BINMODE} {} \;' -- -COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ - 2>&1) && \ - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ - ${FIND} $$1/ -type d -exec chmod 755 {} \; && \ - ${FIND} $$1/ -type f -exec chmod ${SHAREMODE} {} \;' -- - # Names of cookies used to skip already completed stages EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g} CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g} @@ -2275,6 +2268,29 @@ MAKE_ENV+= ${INSTALL_MACROS} SCRIPTS_ENV+= ${INSTALL_MACROS} +# Macro for coping entire directory tree with correct permissions +.if ${UID} == 0 +COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${BINOWN}:${BINGRP} $$1 && \ + ${FIND} $$1 -type d -exec chmod 755 {} \; && \ + ${FIND} $$1 -type f -exec chmod ${BINMODE} {} \;' -- +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ + ${FIND} $$1/ -type d -exec chmod 755 {} \; && \ + ${FIND} $$1/ -type f -exec chmod ${SHAREMODE} {} \;' -- +.else +COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${FIND} $$1 -type d -exec chmod 755 {} \; && \ + ${FIND} $$1 -type f -exec chmod ${BINMODE} {} \;' -- +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${FIND} $$1/ -type d -exec chmod 755 {} \; && \ + ${FIND} $$1/ -type f -exec chmod ${SHAREMODE} {} \;' -- +.endif + # The user can override the NO_PACKAGE by specifying this from # the make command line .if defined(FORCE_PACKAGE) @@ -3067,20 +3083,20 @@ .if defined(ONLY_FOR_ARCHS) IGNORE= is only for ${ONLY_FOR_ARCHS}, .else # defined(NOT_FOR_ARCHS) -IGNORE= does not run on ${NOT_FOR_ARCHS}. +IGNORE= does not run on ${NOT_FOR_ARCHS}, .endif -IGNORE+= and you are running ${ARCH}. +IGNORE+= while you are running ${ARCH} .if defined(ONLY_FOR_ARCHS_REASON_${ARCH}) -IGNORE+= Reason: ${ONLY_FOR_ARCHS_REASON_${ARCH}} +IGNORE+= (reason: ${ONLY_FOR_ARCHS_REASON_${ARCH}}) .elif defined(ONLY_FOR_ARCHS_REASON) -IGNORE+= Reason: ${ONLY_FOR_ARCHS_REASON} +IGNORE+= (reason: ${ONLY_FOR_ARCHS_REASON}) .endif .if defined(NOT_FOR_ARCHS_REASON_${ARCH}) -IGNORE+= Reason: ${NOT_FOR_ARCHS_REASON_${ARCH}} +IGNORE+= (reason: ${NOT_FOR_ARCHS_REASON_${ARCH}}) .elif defined(NOT_FOR_ARCHS_REASON) -IGNORE+= Reason: ${NOT_FOR_ARCHS_REASON} +IGNORE+= (reason: ${NOT_FOR_ARCHS_REASON}) .endif .endif @@ -3088,23 +3104,23 @@ # Check the user interaction and legal issues .if !defined(NO_IGNORE) .if (defined(IS_INTERACTIVE) && defined(BATCH)) -IGNORE= is an interactive port +IGNORE= is an interactive port .elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE)) -IGNORE= is not an interactive port +IGNORE= is not an interactive port .elif (defined(NO_CDROM) && defined(FOR_CDROM)) -IGNORE= may not be placed on a CDROM: ${NO_CDROM} +IGNORE= may not be placed on a CDROM: ${NO_CDROM} .elif (defined(RESTRICTED) && defined(NO_RESTRICTED)) -IGNORE= is restricted: ${RESTRICTED} +IGNORE= is restricted: ${RESTRICTED} .elif defined(BROKEN) .if !defined(TRYBROKEN) -IGNORE= is marked as broken: ${BROKEN} +IGNORE= is marked as broken: ${BROKEN} .endif .elif defined(FORBIDDEN) -IGNORE= is forbidden: ${FORBIDDEN} +IGNORE= is forbidden: ${FORBIDDEN} .endif .if (defined(MANUAL_PACKAGE_BUILD) && defined(PACKAGE_BUILDING)) -IGNORE= has to be built manually: ${MANUAL_PACKAGE_BUILD} +IGNORE= has to be built manually: ${MANUAL_PACKAGE_BUILD} clean: @${IGNORECMD} .endif @@ -3914,6 +3930,12 @@ .endif # This can be removed once all ports have been converted to USE_LDCONFIG. .if defined(INSTALLS_SHLIB) +.if defined(USE_LDCONFIG) + @${ECHO_MSG} "===> INSTALLS_SHLIB and USE_LDCONFIG both defined." +.endif +.if defined(USE_LDCONFIG32) + @${ECHO_MSG} "===> INSTALLS_SHLIB and USE_LDCONFIG32 both defined." +.endif .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Running ldconfig" ${LDCONFIG_CMD} @@ -4909,7 +4931,7 @@ dir=$${dir%%:*}; \ fi; \ ${ECHO_MSG} -n "===> ${PKGNAME} depends on shared library: $$lib"; \ - if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ + if ${LDCONFIG} ${_LDCONFIG_FLAGS} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ ${ECHO_MSG} " - found"; \ if [ ${_DEPEND_ALWAYS} = 1 ]; then \ ${ECHO_MSG} " (but building it anyway)"; \ @@ -4927,7 +4949,7 @@ ${ECHO_MSG} " => No directory for $$lib. Skipping.."; \ else \ ${_INSTALL_DEPENDS} \ - if ! ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ + if ! ${LDCONFIG} ${_LDCONFIG_FLAGS} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ ${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \ ${FALSE}; \ fi; \ ==== //depot/projects/soc2006/gabor_destdir/UPDATING#12 (text+ko) ==== @@ -6,6 +6,25 @@ time you update your ports collection, before attempting any port upgrades. +20070727: + AFFECTS: autotools + AUTHOR: ade@FreeBSD.org + +Extensive reworking of the autotools ports has occurred, putting them in +the canonical locations, along with a suitable wrapper port to make +developing autotools-using code (as opposed to just building ports) +considerably easier. + +Upgrade path is as follows for portupgrade, substitute the appropriate +commands if you are using portmaster: + + 1. portupgrade -f 'autoconf*' 'automake*' + 2. cd /usr/ports/devel/autotools; make install + 3. portupgrade -a + +The second step is optional, but is recommended to bring in all versions +of autoconf and automake. + 20070723: AFFECTS: users of x11/nvidia-driver and slave ports AUTHOR: danfe@FreeBSD.org @@ -5446,4 +5465,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.529 2007/07/23 13:56:16 danfe Exp $ +$FreeBSD: ports/UPDATING,v 1.530 2007/07/28 06:33:42 ade Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707281745.l6SHjMxn067415>