diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2009-03-17 15:37:36 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2009-03-17 15:37:36 +0000 |
commit | 4cc18f5e580dc76efc1ac3acdc5f8b2002b488ca (patch) | |
tree | 86727c5831ca153d3f1672d5069663dddd4185b9 /net-firewall/fwbuilder | |
parent | Fix cross-compilation, bug 262741. Thanks to Maksim Melnikau. (diff) | |
download | historical-4cc18f5e580dc76efc1ac3acdc5f8b2002b488ca.tar.gz historical-4cc18f5e580dc76efc1ac3acdc5f8b2002b488ca.tar.bz2 historical-4cc18f5e580dc76efc1ac3acdc5f8b2002b488ca.zip |
Removed unused patch.
Package-Manager: portage-2.1.6.8/cvs/Linux x86_64
Diffstat (limited to 'net-firewall/fwbuilder')
-rw-r--r-- | net-firewall/fwbuilder/ChangeLog | 6 | ||||
-rw-r--r-- | net-firewall/fwbuilder/Manifest | 13 | ||||
-rw-r--r-- | net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch | 63 |
3 files changed, 6 insertions, 76 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog index 580c7f686810..163e11ca9680 100644 --- a/net-firewall/fwbuilder/ChangeLog +++ b/net-firewall/fwbuilder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/fwbuilder # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.76 2009/03/08 14:23:28 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.77 2009/03/17 15:37:35 dev-zero Exp $ + + 17 Mar 2009; Tiziano Müller <dev-zero@gentoo.org> + -files/fwbuilder-2.1.13-build-with-external-antlr.patch: + Removed unused patch. 08 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -fwbuilder-2.1.13-r2.ebuild, -fwbuilder-2.1.14.ebuild: diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest index cdf06aecef9c..95797ffdd471 100644 --- a/net-firewall/fwbuilder/Manifest +++ b/net-firewall/fwbuilder/Manifest @@ -1,17 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX fwbuilder-2.1.13-build-with-external-antlr.patch 2231 RMD160 9356ee2f594189bda1e5b3e9776258ea9358fa9f SHA1 e4c906033690160437b6722038d58ab94b2d36a8 SHA256 8f5e490b90ad1a30104c0103cbd23c6cc66739fb152b0263beea5e56678f8599 DIST fwbuilder-2.0.12.tar.gz 1389953 RMD160 7d3ae613ac015650333d2e9f980c8d688e320cd2 SHA1 5947236e365ef085ebebd4fec85935cb99b9b64c SHA256 a1132c207eb8296301b21e6025fe36435354ff9b3a90a6dc18145307b9c9162d DIST fwbuilder-2.1.18.tar.gz 1967764 RMD160 a2fc780dad2e130a359747cfb973342e1fbbc406 SHA1 0595146b81c296301702d71665cb853a4b0bec94 SHA256 2670e87ecc88ca5601e7faab1908605d200fdb2afb65cf474f996fb93c469b2b EBUILD fwbuilder-2.0.12.ebuild 1250 RMD160 3720a41610dc2919e34d2b0dc7bb1bf482c6fb0c SHA1 9f797123486424b65ed4ab935d6b9c5304e37386 SHA256 68408d9eda61b0f88756e731e3e4770deedba8ad07ae6973a5715162445ac9e1 EBUILD fwbuilder-2.1.18.ebuild 1949 RMD160 c925c1c5936b5d5bfd4a0785a6f9e3a3d33fa6c5 SHA1 28e7b7041bd3749cfa73d9f3964295a4d2a0f251 SHA256 b19078552fe5a5317ba03be43abba976af3c073c4b4f8baf06b367b0aafd1375 -MISC ChangeLog 12494 RMD160 7a77113e75d6d0a72c582e82372ec5af025083c1 SHA1 3b03bfdf5550df406f2216a08b43d8830b84fc2a SHA256 feebb25137c4eb4c33e533ef7465fb3f84d157c9f2abcd585ff23ba683dcce74 +MISC ChangeLog 12629 RMD160 0250153822481be66fde29b32a67e9ccbe92df08 SHA1 a1171c2e44621df48b6d7dee5ed54a9fc906531d SHA256 60cff0eda49000775a6edb7ab4846aa8471976c3037e59ffdb5f6c8659dfa4a2 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) - -iEYEARECAAYFAkmz1T0ACgkQcxLzpIGCsLQFQACfXxPUb9zp+7b0VTjiJRpJkfoy -vtkAn0vPmze1FXO5JoJyEJTjN5IWz2qb -=CQsF ------END PGP SIGNATURE----- diff --git a/net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch b/net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch deleted file mode 100644 index 256c5c8e6521..000000000000 --- a/net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur fwbuilder-2.1.13/configure.in fwbuilder-2.1.13_external_antlr/configure.in ---- fwbuilder-2.1.13/configure.in 2007-06-07 03:33:53.000000000 +0100 -+++ fwbuilder-2.1.13_external_antlr/configure.in 2007-07-29 13:38:44.000000000 +0100 -@@ -248,11 +248,31 @@ - - AC_LANG_CPLUSPLUS - -+AC_PATH_PROG(ANTLR_CONFIG, antlr-config, , [$EXTENDED_PATH]) -+AC_MSG_CHECKING(antlr) - HAVE_ANTLR_RUNTIME="1" --ANTLR_INCLUDEPATH="`pwd`/src/" --ANTLR_LIBS="`pwd`/src/antlr/libantlr.a" -+HAVE_EXTERNAL_ANTLR="0"; -+if test x$ANTLR_CONFIG = x; then -+ ANTLR_INCLUDEPATH="`pwd`/src/" -+ ANTLR_LIBS="`pwd`/src/antlr/libantlr.a" -+ AC_MSG_RESULT(using provided) -+else -+ ANTLR_VERSION="`$ANTLR_CONFIG --version`" -+ if test x$ANTLR_VERSION != x2.7.7; then -+ ANTLR_INCLUDEPATH="`pwd`/src/" -+ ANTLR_LIBS="`pwd`/src/antlr/libantlr.a" -+ AC_MSG_RESULT(using provided) -+ else -+ ANTLR_INCLUDEPATH="`$ANTLR_CONFIG --cflags`" -+ ANTLR_LIBS="`$ANTLR_CONFIG --libs`" -+ HAVE_EXTERNAL_ANTLR="1" -+ AC_MSG_RESULT(using external version $ANTLR_VERSION) -+ fi -+fi - AC_DEFINE_UNQUOTED(HAVE_ANTLR_RUNTIME, 1) -+AC_DEFINE_UNQUOTED(HAVE_EXTERNAL_ANTLR, $HAVE_EXTERNAL_ANTLR) - AC_SUBST(HAVE_ANTLR_RUNTIME) -+AC_SUBST(HAVE_EXTERNAL_ANTLR) - AC_SUBST(ANTLR_LIBS) - AC_SUBST(ANTLR_INCLUDEPATH) - -diff -Naur fwbuilder-2.1.13/qmake.inc.in fwbuilder-2.1.13_external_antlr/qmake.inc.in ---- fwbuilder-2.1.13/qmake.inc.in 2007-05-18 04:16:09.000000000 +0100 -+++ fwbuilder-2.1.13_external_antlr/qmake.inc.in 2007-07-29 13:38:44.000000000 +0100 -@@ -11,6 +11,7 @@ - UI_DIR = ui - - HAVE_ANTLR_RUNTIME = @HAVE_ANTLR_RUNTIME@ -+HAVE_EXTERNAL_ANTLR = @HAVE_EXTERNAL_ANTLR@ - - unix { - ANTLR_INCLUDEPATH = @ANTLR_INCLUDEPATH@ -diff -Naur fwbuilder-2.1.13/src/src.pro fwbuilder-2.1.13_external_antlr/src/src.pro ---- fwbuilder-2.1.13/src/src.pro 2007-06-07 03:33:54.000000000 +0100 -+++ fwbuilder-2.1.13_external_antlr/src/src.pro 2007-07-29 13:38:52.000000000 +0100 -@@ -12,7 +12,10 @@ - # NOTE: 2.1 does not install scripts from src/tools ( fwb_install , fwb_compile_all) - - contains( HAVE_ANTLR_RUNTIME, 1 ) { -- SUBDIRS += antlr parsers -+ SUBDIRS += parsers -+ contains ( HAVE_EXTERNAL_ANTLR, 0 ) { -+ SUBDIRS += antlr -+ } - } - - SUBDIRS += gui ipt pflib pf ipf ipfw |