FreeBSD Bugzilla – Attachment 61726 Details for
Bug 92445
[patch] change all bogus uses of BROKEN to IGNORE
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 15.81 KB, created by
Mark Linimon
on 2006-01-28 04:40:02 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Mark Linimon
Created:
2006-01-28 04:40:02 UTC
Size:
15.81 KB
patch
obsolete
>--- Mk/bsd.port.mk Fri Jan 27 21:54:32 2006 >+++ Mk/bsd.port.mk.combined Thu Jan 26 23:27:46 2006 >@@ -1191,7 +1191,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) >@@ -1525,7 +1534,7 @@ > .elif ${WANT_OPENLDAP_VER} == 23 > LIB_DEPENDS+= ldap-2.3.1:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client > .else >-BROKEN= unknown OpenLDAP version: ${WANT_OPENLDAP_VER} >+IGNORE= unknown OpenLDAP version: ${WANT_OPENLDAP_VER} > .endif > .endif > >@@ -1537,7 +1546,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) >@@ -1549,7 +1558,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 > >Index: Mk/bsd.ruby.mk >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.ruby.mk,v >retrieving revision 1.150 >diff -u -r1.150 bsd.ruby.mk >--- Mk/bsd.ruby.mk 21 Jan 2006 17:37:01 -0000 1.150 >+++ Mk/bsd.ruby.mk 27 Jan 2006 05:23:19 -0000 >@@ -114,12 +114,12 @@ > > .if defined(RUBY) > .if !exists(${RUBY}) >-BROKEN= You set the variable RUBY to "${RUBY}", but it does not seem to exist. Please specify an already installed ruby executable. >+IGNORE= 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= You set the variable RUBY to "${RUBY}", but it failed to include rbconfig. Please specify a properly installed ruby executable. > .endif > > _RUBY_CONFIG= ${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 >Index: Mk/bsd.sdl.mk >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.sdl.mk,v >retrieving revision 1.9 >diff -u -r1.9 bsd.sdl.mk >--- Mk/bsd.sdl.mk 21 Jan 2006 17:37:01 -0000 1.9 >+++ Mk/bsd.sdl.mk 27 Jan 2006 05:22:39 -0000 >@@ -145,7 +145,7 @@ > _USE_SDL= > .for component in ${USE_SDL} > . if ${_USE_SDL_ALL:M${component}}=="" >-BROKEN= Unknown SDL component ${component} >+IGNORE= Unknown SDL component ${component} > . endif > _USE_SDL+= ${_REQUIRES_${component}} ${component} > .endfor >Index: databases/ip4r/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/databases/ip4r/Makefile,v >retrieving revision 1.2 >diff -u -r1.2 Makefile >--- databases/ip4r/Makefile 19 Jan 2006 04:21:46 -0000 1.2 >+++ databases/ip4r/Makefile 27 Jan 2006 07:21:50 -0000 >@@ -20,7 +20,7 @@ > # 74 is not strictly true, but requires extracting the appropriate > # postgresql-contrib tarball, and associated heavy lifting. > # In order to keep this port simple, we assume >= 8.0 >-BROKEN_WITH_PGSQL= 73 74 >+IGNORE_WITH_PGSQL= 73 74 > > MAKE_ARGS= USE_PGXS=1 > >Index: databases/mysql-administrator/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/databases/mysql-administrator/Makefile,v >retrieving revision 1.25 >diff -u -r1.25 Makefile >--- databases/mysql-administrator/Makefile 19 Nov 2005 19:54:29 -0000 1.25 >+++ databases/mysql-administrator/Makefile 27 Jan 2006 07:22:59 -0000 >@@ -33,7 +33,7 @@ > USE_GNOME= libglade2 gnomehack > USE_MYSQL= yes > DEFAULT_MYSQL_VER= 41 >-BROKEN_WITH_MYSQL= 323 40 >+IGNORE_WITH_MYSQL= 323 40 > GNU_CONFIGURE= yes > > LIB_DEPENDS+= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \ >@@ -53,7 +53,7 @@ > .include <bsd.port.pre.mk> > > .if ${OSVERSION} < 500000 >-BROKEN= "can not build on 4.x" >+BROKEN= can not build on 4.x > .endif > > ONLY_FOR_ARCHS= i386 amd64 >Index: databases/mysql-connector-odbc/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/databases/mysql-connector-odbc/Makefile,v >retrieving revision 1.18 >diff -u -r1.18 Makefile >--- databases/mysql-connector-odbc/Makefile 17 Jan 2006 20:50:45 -0000 1.18 >+++ databases/mysql-connector-odbc/Makefile 27 Jan 2006 07:23:38 -0000 >@@ -16,7 +16,7 @@ > COMMENT= ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER} > > USE_MYSQL= yes >-BROKEN_WITH_MYSQL= 323 >+IGNORE_WITH_MYSQL= 323 > > USE_REINOPLACE= yes > USE_GMAKE= yes >Index: databases/mysqlcc/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/databases/mysqlcc/Makefile,v >retrieving revision 1.8 >diff -u -r1.8 Makefile >--- databases/mysqlcc/Makefile 4 Mar 2004 06:56:08 -0000 1.8 >+++ databases/mysqlcc/Makefile 27 Jan 2006 07:24:32 -0000 >@@ -19,7 +19,7 @@ > BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake > > USE_MYSQL= yes >-BROKEN_WITH_MYSQL=323 >+IGNORE_WITH_MYSQL=323 > > USE_REINPLACE= yes > GNU_CONFIGURE= yes >--- databases/pgadmin3/Makefile.blah Fri Jan 27 22:03:45 2006 >+++ databases/pgadmin3/Makefile Fri Jan 27 22:03:04 2006 >@@ -15,7 +15,7 @@ > COMMENT= PostgreSQL database design and management system > > USE_PGSQL= yes >-BROKEN_WITH_PGSQL= 73 >+IGNORE_WITH_PGSQL= 73 > USE_REINPLACE= yes > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --with-wx=${X11BASE} --with-wx-config=${WX_CONFIG} >Index: deskutils/phprojekt/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/deskutils/phprojekt/Makefile,v >retrieving revision 1.3 >diff -u -r1.3 Makefile >--- deskutils/phprojekt/Makefile 12 Dec 2005 04:28:00 -0000 1.3 >+++ deskutils/phprojekt/Makefile 27 Jan 2006 07:26:31 -0000 >@@ -16,7 +16,7 @@ > > USE_PHP= yes > DEFAULT_PHP_VER=4 >-BROKEN_WITH_PHP=5 >+IGNORE_WITH_PHP=5 > WANT_PHP_MOD= yes > > NO_BUILD= yes >Index: devel/pear-PHPUnit2/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/devel/pear-PHPUnit2/Makefile,v >retrieving revision 1.13 >diff -u -r1.13 Makefile >--- devel/pear-PHPUnit2/Makefile 11 Jan 2006 18:45:30 -0000 1.13 >+++ devel/pear-PHPUnit2/Makefile 27 Jan 2006 07:27:00 -0000 >@@ -23,7 +23,7 @@ > NO_PACKAGE= "Conflicting dependences between PHP4 and PHP5" > > DEFAULT_PHP_VER=5 >-BROKEN_WITH_PHP=4 >+IGNORE_WITH_PHP=4 > > USE_REINPLACE= yes > >Index: devel/pear-PHP_Beautifier/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/devel/pear-PHP_Beautifier/Makefile,v >retrieving revision 1.7 >diff -u -r1.7 Makefile >--- devel/pear-PHP_Beautifier/Makefile 9 Dec 2005 19:24:33 -0000 1.7 >+++ devel/pear-PHP_Beautifier/Makefile 27 Jan 2006 07:27:19 -0000 >@@ -21,7 +21,7 @@ > NO_PACKAGE= Conflicting dependences between PHP4 and PHP5 > > DEFAULT_PHP_VER=5 >-BROKEN_WITH_PHP=4 >+IGNORE_WITH_PHP=4 > > CATEGORY= PHP > FILES= Beautifier.php Beautifier/Filter.php Beautifier/Decorator.php \ >Index: graphics/jpgraph/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/graphics/jpgraph/Makefile,v >retrieving revision 1.18 >diff -u -r1.18 Makefile >--- graphics/jpgraph/Makefile 23 Jan 2006 07:23:23 -0000 1.18 >+++ graphics/jpgraph/Makefile 27 Jan 2006 07:27:37 -0000 >@@ -16,7 +16,7 @@ > > NO_BUILD= yes > USE_PHP= gd >-BROKEN_WITH_PHP=5 >+IGNORE_WITH_PHP=5 > > NO_CDROM= The free version cannot be used in a commercial context > >Index: lang/php4-extensions/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/lang/php4-extensions/Makefile,v >retrieving revision 1.7 >diff -u -r1.7 Makefile >--- lang/php4-extensions/Makefile 9 Dec 2005 19:38:11 -0000 1.7 >+++ lang/php4-extensions/Makefile 27 Jan 2006 07:27:58 -0000 >@@ -17,7 +17,7 @@ > COMMENT= A "meta-port" to install PHP extensions > > DEFAULT_PHP_VER=4 >-BROKEN_WITH_PHP=5 >+IGNORE_WITH_PHP=5 > USE_PHP_BUILD= yes > > NO_BUILD= yes >Index: lang/php5-extensions/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/lang/php5-extensions/Makefile,v >retrieving revision 1.9 >diff -u -r1.9 Makefile >--- lang/php5-extensions/Makefile 16 Jan 2006 12:08:20 -0000 1.9 >+++ lang/php5-extensions/Makefile 27 Jan 2006 07:28:11 -0000 >@@ -17,7 +17,7 @@ > COMMENT= A "meta-port" to install PHP extensions > > DEFAULT_PHP_VER=5 >-BROKEN_WITH_PHP=4 >+IGNORE_WITH_PHP=4 > USE_PHP_BUILD= yes > > NO_BUILD= yes >Index: net/torrentflux/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/net/torrentflux/Makefile,v >retrieving revision 1.1 >diff -u -r1.1 Makefile >--- net/torrentflux/Makefile 20 Oct 2005 18:37:55 -0000 1.1 >+++ net/torrentflux/Makefile 27 Jan 2006 07:28:33 -0000 >@@ -23,7 +23,7 @@ > USE_PHP= pcre session sqlite > WANT_PHP_WEB= yes > DEFAULT_PHP_VER?= 5 >-BROKEN_WITH_PHP= 4 >+IGNORE_WITH_PHP= 4 > USE_PYTHON_RUN= yes > USE_REINPLACE= yes > >Index: print/phppdflib/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/print/phppdflib/Makefile,v >retrieving revision 1.6 >diff -u -r1.6 Makefile >--- print/phppdflib/Makefile 8 Jan 2006 22:01:23 -0000 1.6 >+++ print/phppdflib/Makefile 27 Jan 2006 07:28:49 -0000 >@@ -18,7 +18,7 @@ > WANT_PHP_MOD= yes > PHP_PORT?= ${PORTSDIR}/www/mod_php4 > >-BROKEN_WITH_PHP=5 >+IGNORE_WITH_PHP=5 > > .if defined(WITH_APACHE) > RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/libphp4.so:${PHP_PORT} >Index: security/pecl-filter/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/security/pecl-filter/Makefile,v >retrieving revision 1.1 >diff -u -r1.1 Makefile >--- security/pecl-filter/Makefile 24 Jan 2006 17:09:46 -0000 1.1 >+++ security/pecl-filter/Makefile 28 Jan 2006 04:27:11 -0000 >@@ -24,7 +24,7 @@ > PHP_MODNAME= filter > > DEFAULT_PHP_VER= 5 >-BROKEN_WITH_VER= 4 >+IGNORE_WITH_VER= 4 > > CONFIGURE_ARGS+= --with-pcre-dir=${LOCALBASE} > >Index: shells/bush/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/shells/bush/Makefile,v >retrieving revision 1.5 >diff -u -r1.5 Makefile >--- shells/bush/Makefile 1 Sep 2005 21:07:24 -0000 1.5 >+++ shells/bush/Makefile 27 Jan 2006 07:29:16 -0000 >@@ -30,7 +30,7 @@ > MAKEFILE= GNUmakefile > USE_SDL= sdl image > USE_MYSQL= yes >-BROKEN_WITH_MYSQL= 323 >+IGNORE_WITH_MYSQL= 323 > USE_REINPLACE= yes > REINPLACE_ARGS= -i "" > >Index: www/autoindex/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/autoindex/Makefile,v >retrieving revision 1.4 >diff -u -r1.4 Makefile >--- www/autoindex/Makefile 11 Dec 2005 17:39:41 -0000 1.4 >+++ www/autoindex/Makefile 27 Jan 2006 07:29:31 -0000 >@@ -17,7 +17,7 @@ > > WRKSRC= ${WRKDIR}/${PORTNAME} > >-BROKEN_WITH_PHP= 5 >+IGNORE_WITH_PHP= 5 > USE_PHP= session > CONFLICTS= AutoIndex-2* > NO_BUILD= yes >Index: www/autoindex2/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/autoindex2/Makefile,v >retrieving revision 1.6 >diff -u -r1.6 Makefile >--- www/autoindex2/Makefile 11 Dec 2005 18:29:41 -0000 1.6 >+++ www/autoindex2/Makefile 27 Jan 2006 07:29:45 -0000 >@@ -18,7 +18,7 @@ > > USE_PHP= session > DEFAULT_PHP_VER= 5 >-BROKEN_WITH_PHP= 4 >+IGNORE_WITH_PHP= 4 > CONFLICTS= AutoIndex-1* > LATEST_LINK= AutoIndex2 > NO_BUILD= yes >Index: www/campsite/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/campsite/Makefile,v >retrieving revision 1.6 >diff -u -r1.6 Makefile >--- www/campsite/Makefile 16 Jan 2006 21:13:48 -0000 1.6 >+++ www/campsite/Makefile 27 Jan 2006 07:30:02 -0000 >@@ -31,7 +31,7 @@ > > USE_APACHE= YES > >-BROKEN_WITH_PHP= 5 >+IGNORE_WITH_PHP= 5 > USE_PHP= mysql curl pcre xml xmlrpc > WANT_PHP_CLI= YES > USE_PHP_BUILD= YES >Index: www/eaccelerator/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/eaccelerator/Makefile,v >retrieving revision 1.28 >diff -u -r1.28 Makefile >--- www/eaccelerator/Makefile 14 Dec 2005 14:01:48 -0000 1.28 >+++ www/eaccelerator/Makefile 27 Jan 2006 07:31:18 -0000 >@@ -18,7 +18,7 @@ > USE_PHP= session > USE_PHPIZE= yes > USE_PHP_BUILD= yes >-BROKEN_WITH_PHP= 5 >+IGNORE_WITH_PHP= 5 > > CONFIGURE_ARGS= --enable-eaccelerator=shared > >Index: www/mod_auth_cookie_mysql/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/mod_auth_cookie_mysql/Makefile,v >retrieving revision 1.6 >diff -u -r1.6 Makefile >--- www/mod_auth_cookie_mysql/Makefile 4 Dec 2005 14:08:55 -0000 1.6 >+++ www/mod_auth_cookie_mysql/Makefile 27 Jan 2006 07:31:36 -0000 >@@ -18,7 +18,7 @@ > USE_MYSQL= YES > > # If someone can test it with MySQL 4.1 ;-) >-BROKEN_WITH_MYSQL= 41 >+IGNORE_WITH_MYSQL= 41 > > USE_APACHE= 13 > >Index: www/mod_auth_cookie_mysql2/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/mod_auth_cookie_mysql2/Makefile,v >retrieving revision 1.6 >diff -u -r1.6 Makefile >--- www/mod_auth_cookie_mysql2/Makefile 4 Dec 2005 16:22:33 -0000 1.6 >+++ www/mod_auth_cookie_mysql2/Makefile 27 Jan 2006 07:32:30 -0000 >@@ -16,7 +16,7 @@ > > USE_MYSQL= YES > # If someone can test it with MySQL 5.0 ;-) >-BROKEN_WITH_MYSQL= 50 >+IGNORE_WITH_MYSQL= 50 > > USE_APACHE= 20+ > >Index: www/siteframe/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/siteframe/Makefile,v >retrieving revision 1.1 >diff -u -r1.1 Makefile >--- www/siteframe/Makefile 15 Jan 2006 17:42:54 -0000 1.1 >+++ www/siteframe/Makefile 27 Jan 2006 07:33:00 -0000 >@@ -19,10 +19,10 @@ > WITH_APACHE2= yes > USE_PHP= mysqli simplexml xml session gd > DEFAULT_PHP_VER= 5 >-BROKEN_WITH_PHP= 4 >+IGNORE_WITH_PHP= 4 > USE_MYSQL= yes > DEFAULT_MYSQL_VER= 41 >-BROKEN_WITH_MYSQL= 40 >+IGNORE_WITH_MYSQL= 40 > > NO_PACKAGE= Conflicting Apache dependencies > >Index: www/usermanager/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/usermanager/Makefile,v >retrieving revision 1.5 >diff -u -r1.5 Makefile >--- www/usermanager/Makefile 11 Oct 2005 20:41:15 -0000 1.5 >+++ www/usermanager/Makefile 27 Jan 2006 07:33:15 -0000 >@@ -16,7 +16,7 @@ > > WRKSRC= ${WRKDIR}/ftp > >-BROKEN_WITH_PHP= 5 >+IGNORE_WITH_PHP= 5 > USE_PHP= mysql pcre posix session > > NO_BUILD= yes >Index: www/xaraya/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/www/xaraya/Makefile,v >retrieving revision 1.4 >diff -u -r1.4 Makefile >--- www/xaraya/Makefile 23 Jan 2006 07:04:10 -0000 1.4 >+++ www/xaraya/Makefile 27 Jan 2006 07:33:37 -0000 >@@ -22,7 +22,7 @@ > .else > USE_PHP= mysql > .endif >-BROKEN_WITH_PHP= 5 >+IGNORE_WITH_PHP= 5 > NO_BUILD= yes > WRKSRC= ${WRKDIR}/${PORTNAME}-1.0.0-rc3 > >Index: x11-toolkits/php-gtk/Makefile >=================================================================== >RCS file: /home/FreeBSD/pcvs/ports/x11-toolkits/php-gtk/Makefile,v >retrieving revision 1.22 >diff -u -r1.22 Makefile >--- x11-toolkits/php-gtk/Makefile 15 Nov 2005 06:52:05 -0000 1.22 >+++ x11-toolkits/php-gtk/Makefile 27 Jan 2006 07:34:00 -0000 >@@ -20,7 +20,7 @@ > USE_PHP= pcre > USE_PHP_BUILD= yes > WANT_PHP_SCR= yes >-BROKEN_WITH_PHP= 5 >+IGNORE_WITH_PHP= 5 > USE_GMAKE= yes > USE_PERL5_BUILD=yes > USE_GNOME= gtk12
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 92445
:
61725
| 61726