Date: Wed, 5 Jul 2006 12:51:34 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 100624 for review Message-ID: <200607051251.k65CpY21030437@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100624 Change 100624 by gabor@gabor_spitfire on 2006/07/05 12:50:51 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#3 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.autotools.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gcc.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.kde.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#10 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sdl.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.wx.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/addport#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#2 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#4 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#3 (text+ko) ==== @@ -10,6 +10,28 @@ All ports committers are allowed to commit to this file. +20070705: +AUTHOR: portmgr@FreeBSD.org +The following functional changes were made to bsd.port.mk: + + * Change all bogus uses of BROKEN to IGNORE. (Note: the BROKEN_WITH_* + forms are retained for compatibility but deprecated.) Internally, + these variables all had already set IGNORE, not BROKEN, so they + were really misnomers. + + * Fix USE_LDCONFIG with non-default PREFIX. + + * Fix DESKTOP_ENTRIES processing on 4.x. + + * Add 'make missing' to show missing dependencies. + + * Add bsd.scons.mk and bsd.wx.mk. + +20060616: +AUTHOR: portmgr@FreeBSD.org + The patch in ports/95841 to get rid of remnants of FORCE_PKG_REGISTER + was backed out because it broke kdelibs3*. + 20060616: AUTHOR: portmgr@FreeBSD.org The following functional changes were made to bsd.port.mk: @@ -1081,4 +1103,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.53 2006/06/19 00:10:03 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.54 2006/07/05 02:18:27 linimon Exp $ ==== //depot/projects/soc2006/gabor_ports/MOVED#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1084 2006/06/27 18:17:49 garga Exp $ +# $FreeBSD: ports/MOVED,v 1.1086 2006/07/04 14:04:27 vd Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2393,4 +2393,12 @@ audio/mpck|audio/checkmate|2006-06-24|project was renamed www/xpi-tablesort|www/xpi-tabletools|2006-06-27|Extension renamed mail/rssyl|mail/sylpheed-claws-rssyl|2006-06-27|Moved to follow the rest of sypheed-claws nameing scheme -net/rwhois|net/rwhoisd/2006-06-27|Moved to an accurate name +net/rwhois|net/rwhoisd|2006-06-27|Moved to an accurate name +lang/linux-libgcc||2006-06-29|Obsoleted by emulators/linux_base-fc3 and emulators/linux_base-fc4 +x11-wm/aewm++||2006-07-04|Has expired: The project is dead, a fork exists: xaewm +emulators/linux_base-fc3||2006-07-04|Has expired: superseeded by linux_base-fc4 port +misc/linux-opengroupware||2006-07-04|Has expired +net/opengk||2006-07-04|Has expired: Latest version is from 2003-02-03. Use net/gatekeeper instead +security/p5-Crypt-OpenPGP||2006-07-04|Has expired: Crypt-OpenPGP was abandoned in 2002, use security/gnupg instead +textproc/sed_inplace||2006-07-04|Has expired: This port is not required anymore +textproc/xml4j||2006-07-04|Has expired: it has been replaced by textproc/xerces-j 8 years ago ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.autotools.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.23 2006/02/23 10:43:34 ade Exp $ +# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.24 2006/07/05 02:18:08 linimon Exp $ # # Please view me with 4 column tabs! # @@ -77,7 +77,7 @@ # XXX: temporary to highlight any missed ports in the conversion # .if defined(AUTOTOOL_libtool_inc) -BROKEN+=libtool:${AUTOTOOL_libtool_inc}:inc construct no longer available +IGNORE+= error: libtool:${AUTOTOOL_libtool_inc}:inc construct no longer available .endif #--------------------------------------------------------------------------- @@ -100,7 +100,7 @@ # Make sure we specified a legal version of automake # . if !exists(${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}/Makefile) -BROKEN+= Unknown AUTOMAKE version: ${AUTOMAKE_VERSION} +IGNORE+= cannot install: unknown AUTOMAKE version: ${AUTOMAKE_VERSION} . endif # Set up the automake environment @@ -146,7 +146,7 @@ # Make sure we specified a legal version of autoconf # . if !exists(${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION}/Makefile) -BROKEN+= Unknown AUTOCONF version: ${AUTOCONF_VERSION} +IGNORE+= cannot install: unknown AUTOCONF version: ${AUTOCONF_VERSION} . endif # Set up the autoconf/autoheader environment @@ -189,7 +189,7 @@ # Make sure we specified a legal version of libtool # . if !exists(${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}/Makefile) -BROKEN+= Unknown LIBTOOL version: ${LIBTOOL_VERSION} +IGNORE+= cannot install: unknown LIBTOOL version: ${LIBTOOL_VERSION} . endif # Set up the libtool environment ==== //depot/projects/soc2006/gabor_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.13 2006/06/28 11:38:42 rafan Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.14 2006/07/05 02:18:08 linimon Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -25,7 +25,7 @@ # Default: 50. # WANT_MYSQL_VER # - Maintainer can set an arbitrary version of MySQL by using it. -# BROKEN_WITH_MYSQL +# IGNORE_WITH_MYSQL # - This variable can be defined if the ports doesn't support # one or more version of MySQL. # WITH_MYSQL_VER @@ -44,7 +44,7 @@ # WANT_PGSQL_VER # - Maintainer can set an arbitrary version of PostgreSQL by # using it. -# BROKEN_WITH_PGSQL +# IGNORE_WITH_PGSQL # - This variable can be defined if the ports doesn't support # one or more versions of PostgreSQL. # PGSQL_VER @@ -116,13 +116,17 @@ # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) +# compatability shim .if defined(BROKEN_WITH_MYSQL) -. for VER in ${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 ${BROKEN_WITH_MYSQL}) +IGNORE= cannot install: doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${IGNORE_WITH_MYSQL}) . endif . endfor -.endif # BROKEN_WITH_MYSQL +.endif # IGNORE_WITH_MYSQL LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} @@ -155,13 +159,17 @@ # And now we are checking if we can use it .if defined(PGSQL${PGSQL_VER}_LIBVER) +# compatability shim .if defined(BROKEN_WITH_PGSQL) -. for VER in ${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 (${BROKEN_WITH_PGSQL} not supported) +IGNORE= cannot install: does not work with postgresql${PGSQL_VER}-client PostgresSQL (${IGNORE_WITH_PGSQL} not supported) . endif . endfor -.endif # BROKEN_WITH_PGSQL +.endif # IGNORE_WITH_PGSQL LIB_DEPENDS+= pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .else IGNORE= cannot install: unknown PostgreSQL version: ${PGSQL_VER} @@ -220,7 +228,7 @@ # Detect bdb version _BDB_VER= no -_BDB_BROKEN= no +_BDB_IGNORE= no # Override the user defined WITH_BDB_VER with the WANT_BDB_VER .if defined(WANT_BDB_VER) @@ -242,7 +250,7 @@ . for dbx in ${_DB_${_MATCHED_DB_VER}P} . if exists(${db${dbx}_FIND}) _BRKDB= no -# Skip versions we are broken with +# Skip versions we are incompatible with . if defined(INVALID_BDB_VER) _CHK_BDB:= ${dbx} . for BRKDB in ${INVALID_BDB_VER} @@ -282,20 +290,20 @@ # INVALID_BDB_VER is specified as VER+ . if ${_CHK_PLUS} != "${VER}" . if ${_BDB_VER} == "${_CHK_PLUS} -_BDB_BROKEN= yes +_BDB_IGNORE= yes . else . for VER_P in ${_DB_${_CHK_PLUS}P} . if ${_BDB_VER} == "${VER_P}" -_BDB_BROKEN= yes +_BDB_IGNORE= yes . endif . endfor . endif . elif ${_BDB_VER} == "${VER}" -_BDB_BROKEN= yes +_BDB_IGNORE= yes . endif . endfor . endif -. if ${_BDB_BROKEN} == "yes" +. if ${_BDB_IGNORE} == "yes" IGNORE= cannot install: does not work with bdb version: ${_BDB_VER} (${INVALID_BDB_VER} not supported) . else # Now add the dependancy on Berkeley DB ${_BDB_VER) version ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gcc.mk#2 (text+ko) ==== @@ -18,7 +18,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.7 2006/01/21 17:37:01 krion Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.8 2006/07/05 02:18:08 linimon Exp $ # GCC_Include_MAINTAINER= portmgr@FreeBSD.org @@ -78,7 +78,7 @@ .endfor .if !defined(_GCCVERSION_OKAY) -BROKEN= Unknown version of GCC specified (USE_GCC=${USE_GCC}) +IGNORE= Unknown version of GCC specified (USE_GCC=${USE_GCC}) .endif # @@ -94,7 +94,7 @@ . endif .endfor .if !defined(_GCCVERSION) -BROKEN= Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION}) +IGNORE= Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION}) .endif # ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.129 2006/06/14 02:51:02 marcus Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.130 2006/07/05 02:18:08 linimon Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.370 2006/04/27 01:40:22 ahze Exp $ # @@ -613,18 +613,18 @@ # Then use already expanded USE_GNOME_IMPL to expand USE_GNOME. # Also, check to see if each component has a desktop requirement. If it does, # and if the user's chosen desktop is not of the same version, mark the -# port as broken. +# port as IGNORE. . for component in ${USE_GNOME} . if defined(GNOME_DESKTOP_VERSION) && \ defined(${component}_GNOME_DESKTOP_VERSION) . if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION} -BROKEN= ${PORTNAME} wants to use the GNOME -BROKEN+=${${component}_GNOME_DESKTOP_VERSION} desktop, but you wish to use -BROKEN+=the GNOME ${GNOME_DESKTOP_VERSION} desktop +IGNORE= cannot install: ${PORTNAME} wants to use the GNOME +IGNORE+=${${component}_GNOME_DESKTOP_VERSION} desktop, but you wish to use +IGNORE+=the GNOME ${GNOME_DESKTOP_VERSION} desktop . endif . endif . if ${_USE_GNOME_ALL:M${component}}=="" -BROKEN= Unknown component ${component} +IGNORE= cannot install: unknown component ${component} . endif _USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component} . endfor @@ -647,7 +647,7 @@ done; .else . if ${USE_GNOME:Mltverhack}!="" -BROKEN= ${PORTNAME} uses the ltverhack GNOME component but does not use libtool +IGNORE= cannot install: ${PORTNAME} uses the ltverhack GNOME component but does not use libtool . endif .endif ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#2 (text+ko) ==== @@ -6,7 +6,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # Date: 4 Oct 2004 # -# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.20 2006/06/09 18:00:26 ahze Exp $ +# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.21 2006/07/05 02:18:08 linimon Exp $ # $MCom: ports/Mk/bsd.gstreamer.mk,v 1.24 2006/04/25 14:45:31 ahze Exp $ .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include) @@ -246,7 +246,7 @@ BUILD_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX} RUN_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX} . else -BROKEN= Unknown gstreamer-plugin -- ${ext} +IGNORE= cannot install: unknown gstreamer-plugin -- ${ext} . endif .endfor .endif @@ -256,7 +256,7 @@ BUILD_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} . else -BROKEN= Unknown gstreamer-plugin -- ${ext} +IGNORE= cannot install: unknown gstreamer-plugin -- ${ext} . endif .endfor .endif ==== //depot/projects/soc2006/gabor_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.61 2006/06/05 19:23:51 lofi Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.62 2006/07/05 02:18:08 linimon Exp $ # # Please view me with 4 column tabs! @@ -68,7 +68,7 @@ USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} .else -IGNORE= Unsupported value in USE_KDELIBS_VER +IGNORE= cannot install: unsupported value in USE_KDELIBS_VER .endif # ${USE_KDELIBS_VER} == 3 .endif # defined(USE_KDELIBS_VER) @@ -128,7 +128,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif # !defined(QT_NONSTANDARD) .else -IGNORE= Unsupported value of USE_QT_VER +IGNORE= cannot install: unsupported value of USE_QT_VER .endif # defined(USE_QT_VER) # End of USE_QT_VER section ==== //depot/projects/soc2006/gabor_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.30 2006/06/16 04:53:43 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.31 2006/07/05 02:18:08 linimon 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 @@ -18,7 +18,7 @@ # The port can set these options in its Makefile before bsd.ports.pre.mk: # # DEFAULT_PHP_VER=N - Use PHP version N if PHP is not yet installed. -# BROKEN_WITH_PHP=N - The port doesn't work with PHP version N. +# IGNORE_WITH_PHP=N - The port doesn't work with PHP version N. # USE_PHPIZE=yes - Use to build a PHP extension. # USE_PHPEXT=yes - Use to build, install and register a PHP extension. # USE_PHP_BUILD=yes - Set PHP also as a build dependency. @@ -70,10 +70,14 @@ .endif PHP_EXT_INC?= "" +# compatability shim .if defined(BROKEN_WITH_PHP) -. for VER in ${BROKEN_WITH_PHP} +IGNORE_WITH_PHP=${BROKEN_WITH_PHP} +.endif +.if defined(IGNORE_WITH_PHP) +. for VER in ${IGNORE_WITH_PHP} . if ${PHP_VER} == "${VER}" -BROKEN= Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP}) +IGNORE= cannot install: doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${IGNORE_WITH_PHP}) . endif . endfor .endif ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#10 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.535 2006/06/26 23:39:09 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.536 2006/07/05 02:18:08 linimon Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -293,7 +293,7 @@ # compression. # USE_ZIP - If set, this port distfile uses zip, not tar w/[bg]zip # for compression. -# USE_DOS2UNIX - If set to "YES", remove the ^M from all files +# USE_DOS2UNIX - If set to "YES", remove the ^M from all files # under ${WRKSRC}. If set to a string, remove in all # files under ${WRKSRC} with one of these names the ^Ms. # USE_GCC - If set, this port requires this version of gcc, either in @@ -395,13 +395,16 @@ # USE_FAM - If set, this port uses the File Alteration Monitor. # # WANT_FAM_SYSTEM -# - Legal values are: gamin (default),fam -# If set to an unknown value, the port is marked BROKEN. +# - Legal values are: gamin (default),fam +# If set to an unknown value, the port is marked IGNORE. ## # USE_AUTOTOOLS - If set, this port uses various GNU autotools # (libtool, autoconf, autoheader, automake et al.) # See bsd.autotools.mk for more details. ## +# USE_SCONS - If set, this port uses the Python-based SCons build system +# See bsd.scons.mk for more details. +## # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see # that file for more information on USE_JAVA_*). @@ -464,15 +467,15 @@ # usable in *_DEPENDS (e.g. BUILD_DEPENDS=${LINUX_BASE_PORT}). # It honors USE_LINUX=foo and OVERRIDE_LINUX_BASE_PORT. # USE_RC_SUBR - If set, the ports startup/shutdown script uses the common -# routines found in etc/rc.subr and may need to -# depend on the sysutils/rc_subr port. -# If this is set to a list of files, these files will be -# automatically added to ${SUB_FILES}, some %%VAR%%'s will -# automatically be expanded, they will be installed in -# ${PREFIX}/etc/rc.d and added to the packing list. +# routines found in etc/rc.subr and may need to +# depend on the sysutils/rc_subr port. +# If this is set to a list of files, these files will be +# automatically added to ${SUB_FILES}, some %%VAR%%'s will +# automatically be expanded, they will be installed in +# ${PREFIX}/etc/rc.d and added to the packing list. # USE_RCORDER - List of rc.d startup scripts to be called early in the boot -# process. This acts exactly like USE_RC_SUBR except that -# scripts are installed in /etc/rc.d. +# process. This acts exactly like USE_RC_SUBR except that +# scripts are installed in /etc/rc.d. # RC_SUBR - Set to path of rc.subr. # Default: ${LOCALBASE}/etc/rc.subr. ## @@ -964,7 +967,7 @@ # - Different checksum algorithms to check for verifying the # integrity of the distfiles. The absence of the algorithm # in distinfo doesn't make it fail. -# Default: md5 +# Default: md5 sha256 # NO_CHECKSUM - Don't verify the checksum. Typically used when # when you noticed the distfile you just fetched has # a different checksum and you intend to verify if @@ -1193,6 +1196,9 @@ # where 'make config' records user configuration options PORT_DBDIR?= /var/db/ports +LDCONFIG_DIR= libdata/ldconfig +LDCONFIG32_DIR= libdata/ldconfig32 + .if defined(LATEST_LINK) UNIQUENAME?= ${LATEST_LINK} .else @@ -1247,7 +1253,7 @@ .if defined(PORTVERSION) .if ${PORTVERSION:M*[-_,]*}x != x -BROKEN= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ',' +IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ',' .endif DISTVERSION?= ${PORTVERSION:S/:/::/g} .elif defined(DISTVERSION) @@ -1455,18 +1461,22 @@ .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif +.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) +.include "${PORTSDIR}/Mk/bsd.wx.mk" +.endif + .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80) .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .endif +.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL) +.include "${PORTSDIR}/Mk/bsd.mail.mk" +.endif + .if defined(USE_SDL) || defined(WANT_SDL) .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif -.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL) -.include "${PORTSDIR}/Mk/bsd.mail.mk" -.endif - .if ${OSVERSION} >= 502123 X_WINDOW_SYSTEM ?= xorg .elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \ @@ -1591,7 +1601,7 @@ .elif ${WANT_OPENLDAP_VER} == 24 LIB_DEPENDS+= ldap-2.4.1:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client .else -BROKEN= unknown OpenLDAP version: ${WANT_OPENLDAP_VER} +IGNORE= unknown OpenLDAP version: ${WANT_OPENLDAP_VER} .endif .endif @@ -1609,7 +1619,7 @@ .if defined(WANT_FAM_SYSTEM) .if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM}!=${WANT_FAM_SYSTEM} -BROKEN= The port wants to use ${WANT_FAM_SYSTEM} as its FAM system and you wish to use ${WITH_FAM_SYSTEM} +IGNORE= The port wants to use ${WANT_FAM_SYSTEM} as its FAM system and you wish to use ${WITH_FAM_SYSTEM} .endif FAM_SYSTEM= ${WANT_FAM_SYSTEM} .elif defined(WITH_FAM_SYSTEM) @@ -1631,7 +1641,7 @@ .if defined(FAM_SYSTEM_${FAM_SYSTEM:U}) LIB_DEPENDS+= ${FAM_SYSTEM_${FAM_SYSTEM:U}} .else -BROKEN= unknown FAM system: ${FAM_SYSTEM} +IGNORE= unknown FAM system: ${FAM_SYSTEM} .endif .endif # USE_FAM @@ -1660,14 +1670,12 @@ .endif .endif -LDCONFIG_DIR= libdata/ldconfig -LDCONFIG32_DIR= libdata/ldconfig32 - .if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) -.if ${OSVERSION} < 504105 || \ - (${OSVERSION} >= 700000 && ${OSVERSION} < 700012) || \ - (${OSVERSION} >= 600000 && ${OSVERSION} < 600104) +.if ( ${OSVERSION} < 504105 ) || \ + ( ${OSVERSION} >= 700000 && ${OSVERSION} < 700012 ) || \ + ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600104 ) RUN_DEPENDS+= ${LOCALBASE}/${LDCONFIG_DIR}:${PORTSDIR}/misc/ldconfig_compat +NO_LDCONFIG_MTREE= yes .endif .if defined(USE_LDCONFIG) && ${USE_LDCONFIG:L} == "yes" USE_LDCONFIG= ${PREFIX}/lib @@ -1713,6 +1721,9 @@ . endif . endif +# NOTE: when you update the default linux_base version (case "yes"), +# don't forget to update the Handbook! + . if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX}) LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} . else @@ -1902,6 +1913,10 @@ .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" .endif +.if defined(USE_SCONS) +.include "${PORTSDIR}/Mk/bsd.scons.mk" +.endif + .if defined(USE_SDL) || defined(WANT_SDL) .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif @@ -1914,6 +1929,10 @@ .include "${PORTSDIR}/Mk/bsd.tcl.mk" .endif +.if defined(USE_WX) || defined(USE_WX_NOT) +.include "${PORTSDIR}/Mk/bsd.wx.mk" +.endif + .if defined(USE_APACHE) || defined(APACHE_COMPAT) .include "${PORTSDIR}/Mk/bsd.apache.mk" .endif @@ -1926,6 +1945,7 @@ .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif + .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" USE_SUBMAKE= yes @@ -3727,11 +3747,17 @@ .endif .if ${USE_LDCONFIG:L} != "${PREFIX}/lib" @${ECHO_MSG} "===> Installing ldconfig configuration file" +.if defined(NO_LDCONFIG_MTREE) + @${MKDIR} ${LDCONFIG_DIR} +.endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} +.if defined(NO_LDCONFIG_MTREE) + @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1" >> ${TMPPLIST} .endif .endif +.endif .if defined(USE_LDCONFIG32) .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Running ldconfig" @@ -3741,10 +3767,16 @@ -${LDCONFIG} -32 -m ${USE_LDCONFIG32} .endif @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" +.if defined(NO_LDCONFIG_MTREE) + @${MKDIR} ${LDCONFIG_32DIR} +.endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} +.if defined(NO_LDCONFIG_MTREE) + @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} .endif +.endif # This can be removed once, all ports have been converted to USE_LDCONFIG. .if defined(INSTALLS_SHLIB) .if !defined(INSTALL_AS_USER) @@ -4926,6 +4958,16 @@ (cd $$dir; ${MAKE} package-noinstall); \ done +# Show missing dependiencies +missing: + @for dir in $$(${ALL-DEPENDS-LIST}); do \ + THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \ + installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \ + if [ -z $$installed ]; then \ + ${ECHO_CMD} $$THISORIGIN; \ + fi \ + done + ################################################################ # Everything after here are internal targets and really # shouldn't be touched by anybody but the release engineers. @@ -5622,7 +5664,7 @@ check-desktop-entries: .if defined(DESKTOP_ENTRIES) @set ${DESKTOP_ENTRIES} XXX; \ - if [ $$((($$# - 1) % 6)) -ne 0 ]; then \ + if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \ ${ECHO_CMD} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \ exit 1; \ fi; \ @@ -5668,7 +5710,7 @@ exit 1; \ fi; \ shift 6; \ - num=$$((num + 1)); \ + num=`${EXPR} $$num + 1`; \ done .else @${DO_NADA} ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#3 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA <knu@FreeBSD.org> # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.151 2006/05/17 03:18:15 knu Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.152 2006/07/05 02:18:09 linimon Exp $ # .if !defined(Ruby_Include) @@ -114,12 +114,12 @@ .if defined(RUBY) .if !exists(${DESTDIR}${RUBY}) -BROKEN= You set the variable RUBY to "${RUBY}", but it does not seem to exist. Please specify an already installed ruby executable. +IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it does not seem to exist. Please specify an already installed ruby executable. .endif _RUBY_TEST!= ${RUBY} -e 'begin; require "rbconfig"; rescue LoadError; puts "error"; end' .if !empty(_RUBY_TEST) -BROKEN= You set the variable RUBY to "${RUBY}", but it failed to include rbconfig. Please specify a properly installed ruby executable. +IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it failed to include rbconfig. Please specify a properly installed ruby executable. .endif _RUBY_CONFIG= ${DESTDIR}${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e @@ -147,7 +147,7 @@ RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION} #MASTER_SITE_SUBDIR_RUBY= snapshots .elif defined(RUBY_VER) && ${RUBY_VER} == 1.7 -BROKEN= Ruby 1.7 is obsolete; set RUBY_VER to 1.8 instead. +IGNORE= Ruby 1.7 is obsolete; set RUBY_VER to 1.8 instead. .else RUBY_VERSION?= 1.6.8 RUBY_DISTVERSION?= ${RUBY_VERSION}-2004.07.28 ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sdl.mk#2 (text+ko) ==== @@ -29,7 +29,7 @@ # # -# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.9 2006/01/21 17:37:01 krion Exp $ +# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.10 2006/07/05 02:18:09 linimon Exp $ # SDL_Include_MAINTAINER= edwin@FreeBSD.org @@ -145,7 +145,7 @@ _USE_SDL= .for component in ${USE_SDL} . if ${_USE_SDL_ALL:M${component}}=="" -BROKEN= Unknown SDL component ${component} +IGNORE= cannot install: unknown SDL component ${component} . endif _USE_SDL+= ${_REQUIRES_${component}} ${component} .endfor ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#3 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.372 2006/06/23 02:25:30 ahze Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.373 2006/07/02 15:27:49 arved Exp $ # # Where to put distfiles that don't have any other master site @@ -438,7 +438,6 @@ .if !defined(IGNORE_MASTER_SITE_GNUPG) MASTER_SITE_GNUPG+= \ - ftp://ftp.gnupg.org/gcrypt/%SUBDIR%/ \ http://ftp.sunsite.dk/pub/security/gcrypt/%SUBDIR%/ \ http://ftp.linux.it/pub/mirrors/gnupg/%SUBDIR%/ \ ftp://ftp.demon.nl/pub/mirrors/gnupg/%SUBDIR%/ \ @@ -450,7 +449,8 @@ ftp://sunsite.cnlab-switch.ch/mirror/gcrypt/%SUBDIR%/ \ ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/gnupg/&,} \ - ftp://igloo.linux.gr/pub/crypto/gnupg/%SUBDIR%/ + ftp://igloo.linux.gr/pub/crypto/gnupg/%SUBDIR%/ \ + ftp://ftp.gnupg.org/gcrypt/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_GNUSTEP) ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#2 (text+ko) ==== @@ -86,7 +86,11 @@ echo "<td align='right'>$n_duds</td>" >> ${TMPFILE} # column: missing count - n_missing=`expr $n_index - $n_packages - $n_errors - $n_duds` + if [ $n_index -ne 0 ]; then + n_missing=`expr $n_index - $n_packages - $n_errors - $n_duds` + else # index currently being rebuilt + n_missing=0 + fi echo "<td align='right'>$n_missing</td>" >> ${TMPFILE} # column: done flag ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/addport#2 (text+ko) ==== @@ -32,7 +32,7 @@ # # Id: addport,v 1.2 2000/04/02 06:21:13 will Exp (original shell script) # Id: addport,v 1.5 2000/04/22 22:19:43 mharo Exp (perl conversion) -# $FreeBSD: ports/Tools/scripts/addport,v 1.48 2006/05/16 15:44:29 garga Exp $ +# $FreeBSD: ports/Tools/scripts/addport,v 1.49 2006/07/04 23:12:10 garga Exp $ # # MAINTAINER= garga@FreeBSD.org # @@ -267,6 +267,7 @@ while(<MAKEFILE>) { chomp; ($orig) = (m/^# Whom:\s+(\w.*)$/) if (/^# Whom:/); + $orig =~ s/\@/ at /; ($portversion) = (m/^PORTVERSION=\s+(\w.*)$/) if (/^PORTVERSION=/); } close(MAKEFILE); ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#2 (text+ko) ==== @@ -30,7 +30,7 @@ # Originally written by Vasil Dimov <vd@FreeBSD.org> # Others: # -# $FreeBSD: ports/Tools/scripts/rmport,v 1.5 2006/05/02 11:31:54 vd Exp $ +# $FreeBSD: ports/Tools/scripts/rmport,v 1.6 2006/07/05 08:31:49 vd Exp $ # # MAINTAINER= vd@FreeBSD.org # @@ -49,6 +49,13 @@ echo "==> $*" >&2 } +escape() +{ + # escape characters that may appear in ports' names and + # break regular expressions + echo "${1}" |sed -E 's/(\+|\.)/\\\1/g' +} + pkgname() { make -C ${PORTSDIR}/${1} -V PKGNAME @@ -193,7 +200,9 @@ log "${cat}/${port}: removing from CVSROOT/modules" - ${SED} -e "/^(ports_)?(..-)?${port}[[:space:]]+ports\/${cat}\/${port}\$/d" \ + portesc=`escape ${port}` + + ${SED} -e "/^(ports_)?(..-)?${portesc}[[:space:]]+ports\/${cat}\/${portesc}\$/d" \ CVSROOT/modules } @@ -219,7 +228,9 @@ log "${cat}/${port}: removing from ${cat}/Makefile" - ${SED} -e "/^[[:space:]]*SUBDIR[[:space:]]*\+=[[:space:]]*${port}([[:space:]]+#.*)?$/d" \ + portesc=`escape ${port}` + + ${SED} -e "/^[[:space:]]*SUBDIR[[:space:]]*\+=[[:space:]]*${portesc}([[:space:]]+#.*)?$/d" \ ports/${cat}/Makefile } ==== //depot/projects/soc2006/gabor_ports/UPDATING#4 (text+ko) ==== @@ -6,6 +6,64 @@ time you update your ports collection, before attempting any port upgrades. +20060703: + AFFECTS: users of audio/amarok + AUTHOR: mich@FreeBSD.org + + A bunch of port options have been removed, so you should remove your + current options, before attempting to build the port. + + - Enter the amarok port directory, and run `make rmconfig' + +20060703: + AFFECTS: users of sysutils/portupgrade + AUTHOR: sem@FreeBSD.org + + Because of portupgrade had a bug with detecting of Berkley DB version 2+, + and a default database now set to use this version you can get portupgrade + don't work with old databases. A quick fix is removing the databases: + `rm /var/db/pkg/pkgdb.db /usr/ports/INDEX*.db'. portupgrade will recreate + them automaticaly. It's absolutely no harm. + + If you don't want remove the databases you should detect what database + type do you use, and set port options accordly. Follow the instructions: + + - run `pkgdb -fu' *before* upgrading and take a look on the output. + You can see database format there as: format:XXX, where XXX is your + current database format. + - Go to portupgrade port directory and configure the port with + `make config' command. If you have bdb_* format then turn on BDB4 option, + if you have bdb1_* format then turn off BDB4 and turn on BDB1 option. + If you have dbd_hash format then turn off all option. + - Upgrade portupgrade. + + Note: if you change database format with changing port options, + you should remove ruby-bdb* port that you don't need anymore or to hard + code database format in your pkgtools.conf. + +20060702: + AFFECTS: users of multimedia/handbrake + AUTHOR: multimedia@FreeBSD.org + + The GTK+2 version in the 0.7.x has been disabled by the author, because it + does not work anymore. If you still want to keep with GTK+2 version, go + with multimedia/handbrake-gtk2 (still 0.6.x) instead. The name of binary + has been renamed to handbrake-gtk2 too. + +20060701: + AFFECTS: users of www/phpbb + AUTHOR: miwi@FreeBSD.org + + The default install location has changed from + ${PREFIX}/www/data/phpbb to ${PREFIX}/www/phpbb. + +20060629: + AFFECTS: users of www/mediawiki + AUTHOR: miwi@FreeBSD.org + + The default install location has changed from + ${PREFIX}/www/data-dist/mediawiki to ${PREFIX}/www/mediawiki. + 20060624: AFFECTS: users of audio/mt-daapd AUTHOR: alex@foxybanana.com @@ -3712,4 +3770,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.350 2006/06/25 13:19:27 itetcu Exp $ +$FreeBSD: ports/UPDATING,v 1.356 2006/07/04 00:48:39 lioux Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607051251.k65CpY21030437>