diff options
author | marcus <marcus@FreeBSD.org> | 2003-01-22 04:47:55 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2003-01-22 04:47:55 +0800 |
commit | 1b664f04a30b71b18e87fe043755e776611b4167 (patch) | |
tree | 6f76ca03f99b2a16eb6687f5ae2b533f8d69b7d9 /www/galeon2 | |
parent | 88bdfc43d2f40db923262f5df439f8613a33e888 (diff) | |
download | freebsd-ports-gnome-1b664f04a30b71b18e87fe043755e776611b4167.tar.gz freebsd-ports-gnome-1b664f04a30b71b18e87fe043755e776611b4167.tar.zst freebsd-ports-gnome-1b664f04a30b71b18e87fe043755e776611b4167.zip |
Fix build on -CURRENT by making sure -Werror is really disabled.
Reported by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Adapted from: Galeon CVS
Diffstat (limited to 'www/galeon2')
-rw-r--r-- | www/galeon2/Makefile | 4 | ||||
-rw-r--r-- | www/galeon2/files/patch-configure | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 3a85dd8256e3..d66023824c47 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -52,10 +52,10 @@ MAN1= galeon.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 +.if ${OSVERSION} > 500000 # Galeon does not build correctly in -CURRENT if -Werror is passed # to the compiler. -CONFIGURE_ARGS+= --enable-werror +CONFIGURE_ARGS+= --disable-werror .endif post-extract: diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure index 7c0b2ed87ef2..1624ed425cb4 100644 --- a/www/galeon2/files/patch-configure +++ b/www/galeon2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure Thu Nov 7 02:51:25 2002 -+++ configure2 Thu Nov 7 02:51:32 2002 -@@ -7140,6 +7140,7 @@ +--- configure.orig Tue Jan 21 15:44:16 2003 ++++ configure Tue Jan 21 15:45:28 2003 +@@ -14219,6 +14219,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,3 +8,16 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -18588,7 +18589,11 @@ + # Check whether --enable-werror or --disable-werror was given. + if test "${enable_werror+set}" = set; then + enableval="$enable_werror" +- disable_werror=no ++ if test "x$enable_werror" != "xno"; then ++ disable_werror=no ++ else ++ disable_werror=yes ++ fi + else + disable_werror=yes + fi; |