Attachment 61725 Details for Bug 92445 – file.diff

[patch] file.diff

file.diff (text/plain), 9.02 KB, created by Mark Linimon on 2006-01-28 04:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2006-01-28 04:40:02 UTC

Size: 9.02 KB

patch

obsolete

>Index: Mk/bsd.autotools.mk
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.autotools.mk,v
>retrieving revision 1.22
>diff -u -r1.22 bsd.autotools.mk
>--- Mk/bsd.autotools.mk	21 Jan 2006 17:37:00 -0000	1.22
>+++ Mk/bsd.autotools.mk	27 Jan 2006 05:20:58 -0000
>@@ -99,7 +99,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+=	Unknown AUTOMAKE version: ${AUTOMAKE_VERSION}
> . endif
> 
> # Set up the automake environment
>@@ -145,7 +145,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+=	Unknown AUTOCONF version: ${AUTOCONF_VERSION}
> . endif
> 
> # Set up the autoconf/autoheader environment
>@@ -193,7 +193,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+=	Unknown LIBTOOL version: ${LIBTOOL_VERSION}
> . endif
> 
> # Set up the libtool environment
>Index: Mk/bsd.database.mk
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.database.mk,v
>retrieving revision 1.4
>diff -u -r1.4 bsd.database.mk
>--- Mk/bsd.database.mk	21 Jan 2006 17:37:01 -0000	1.4
>+++ Mk/bsd.database.mk	27 Jan 2006 05:21:09 -0000
>@@ -25,7 +25,7 @@
> #				  Default: 41.
> # 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.
> # MYSQL_VER		- Internal variable for MySQL version.
>@@ -43,7 +43,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.
> ##
>@@ -72,7 +72,7 @@
> 
> .if defined(WANT_MYSQL_VER)
> .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER}
>-BROKEN=		The port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client.
>+IGNORE=		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)
>@@ -87,19 +87,19 @@
> 
> .if defined(_MYSQL_VER)
> .if ${_MYSQL_VER} != ${MYSQL_VER}
>-BROKEN=	MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
>+IGNORE=	MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
> .endif
> .endif
> 
> # And now we are checking if we can use it
> .if defined(MYSQL${MYSQL_VER}_LIBVER)
>-.if defined(BROKEN_WITH_MYSQL)
>-.	for VER in ${BROKEN_WITH_MYSQL}
>+.if defined(IGNORE_WITH_MYSQL)
>+.	for VER in ${IGNORE_WITH_MYSQL}
> .		if (${MYSQL_VER} == "${VER}")
>-IGNORE=		Doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${BROKEN_WITH_MYSQL})
>+IGNORE=		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=		Unknown MySQL version: ${MYSQL_VER}
>@@ -119,7 +119,7 @@
> .endif
> 
> .if defined(WANT_PGSQL_VER) && defined(_PGSQL_VER) && ${WANT_PGSQL_VER} != ${_PGSQL_VER}
>-BROKEN=		the port wants postgresql${WANT_PGSQL_VER}-client but you have postgresql${_PGSQL_VER}-client installed
>+IGNORE=		the port wants postgresql${WANT_PGSQL_VER}-client but you have postgresql${_PGSQL_VER}-client installed
> .endif
> 
> .if defined(_PGSQL_VER)
>@@ -132,13 +132,13 @@
> 
> # And now we are checking if we can use it
> .if defined(PGSQL${PGSQL_VER}_LIBVER)
>-.if defined(BROKEN_WITH_PGSQL)
>-.	for VER in ${BROKEN_WITH_PGSQL}
>+.if defined(IGNORE_WITH_PGSQL)
>+.	for VER in ${IGNORE_WITH_PGSQL}
> .		if (${PGSQL_VER} == "${VER}")
>-IGNORE=		Does not work with postgresql${PGSQL_VER}-client PostgresSQL (${BROKEN_WITH_PGSQL} not supported)
>+IGNORE=		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=		Unknown PostgreSQL version: ${PGSQL_VER}
>Index: Mk/bsd.gcc.mk
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.gcc.mk,v
>retrieving revision 1.7
>diff -u -r1.7 bsd.gcc.mk
>--- Mk/bsd.gcc.mk	21 Jan 2006 17:37:01 -0000	1.7
>+++ Mk/bsd.gcc.mk	27 Jan 2006 05:21:26 -0000
>@@ -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
> 
> #
>Index: Mk/bsd.gnome.mk
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.gnome.mk,v
>retrieving revision 1.106
>diff -u -r1.106 bsd.gnome.mk
>--- Mk/bsd.gnome.mk	22 Jan 2006 20:35:15 -0000	1.106
>+++ Mk/bsd.gnome.mk	27 Jan 2006 05:21:40 -0000
>@@ -596,13 +596,13 @@
> .      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=	${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=	Unknown component ${component}
> .  endif
> _USE_GNOME+=	${${component}_USE_GNOME_IMPL} ${component}
> . endfor
>@@ -628,7 +628,7 @@
> 						done;
> .else
> .if ${USE_GNOME:Mltverhack}!=""
>-BROKEN= ${PORTNAME} uses the ltverhack GNOME component but does not use libtool
>+IGNORE= ${PORTNAME} uses the ltverhack GNOME component but does not use libtool
> .endif
> .endif
> 
>Index: Mk/bsd.gstreamer.mk
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.gstreamer.mk,v
>retrieving revision 1.13
>diff -u -r1.13 bsd.gstreamer.mk
>--- Mk/bsd.gstreamer.mk	21 Jan 2006 17:37:01 -0000	1.13
>+++ Mk/bsd.gstreamer.mk	27 Jan 2006 05:21:44 -0000
>@@ -237,7 +237,7 @@
> RUN_DEPENDS+=   ${_GST_LIB_BASE}/libgst${ext}.so:${PORTSDIR}/${${ext}_DEPENDS}
> .  endif
> . else
>-BROKEN=	Unknown gstreamer-plugin -- ${ext}
>+IGNORE=	Unknown gstreamer-plugin -- ${ext}
> . endif
> .endfor
> 
>Index: Mk/bsd.kde.mk
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.kde.mk,v
>retrieving revision 1.55
>diff -u -r1.55 bsd.kde.mk
>--- Mk/bsd.kde.mk	21 Jan 2006 17:37:01 -0000	1.55
>+++ Mk/bsd.kde.mk	27 Jan 2006 05:23:30 -0000
>@@ -68,7 +68,7 @@
> USE_QT_VER=		3
> PREFIX=			${KDE_PREFIX}
> .else
>-BROKEN=			Unknown value in USE_KDELIBS_VER
>+IGNORE=			Unknown value in USE_KDELIBS_VER
> .endif # ${USE_KDELIBS_VER} == 3
> .endif # defined(USE_KDELIBS_VER)
> 
>@@ -122,7 +122,7 @@
> CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
> .endif # !defined(QT_NONSTANDARD)
> .else
>-BROKEN=Unsupported value of USE_QT_VER
>+IGNORE=Unsupported value of USE_QT_VER
> .endif # defined(USE_QT_VER)
> 
> # End of USE_QT_VER section
>Index: Mk/bsd.php.mk
>===================================================================
>RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.php.mk,v
>retrieving revision 1.23
>diff -u -r1.23 bsd.php.mk
>--- Mk/bsd.php.mk	21 Jan 2006 17:37:01 -0000	1.23
>+++ Mk/bsd.php.mk	27 Jan 2006 05:20:13 -0000
>@@ -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.
>@@ -71,10 +71,10 @@
> .endif
> PHP_EXT_INC?=	""
> 
>-.if defined(BROKEN_WITH_PHP)
>-.	for VER in ${BROKEN_WITH_PHP}
>+.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=		Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${IGNORE_WITH_PHP})
> .		endif
> .	endfor
> .endif

Actions: View | Diff

Attachments on bug 92445: 61725 | 61726