diff options
| author | marcus <marcus@FreeBSD.org> | 2002-06-17 03:03:10 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2002-06-17 03:03:10 +0800 |
| commit | 275673ba5e814377b8f5315752d7d2af44cbbf7c (patch) | |
| tree | 224f441443f57ef5bbdadec8ee2644255da5ef18 | |
| parent | ceb8893cf306504ff17661c979c2fd36227bb93a (diff) | |
| download | freebsd-ports-gnome-275673ba5e814377b8f5315752d7d2af44cbbf7c.tar.gz freebsd-ports-gnome-275673ba5e814377b8f5315752d7d2af44cbbf7c.tar.zst freebsd-ports-gnome-275673ba5e814377b8f5315752d7d2af44cbbf7c.zip | |
Fix build on -CURRENT.
| -rw-r--r-- | www/galeon/Makefile | 10 | ||||
| -rw-r--r-- | www/galeon/files/patch-src_mozilla_TOCProtocolHandler.cpp | 11 | ||||
| -rw-r--r-- | www/galeon2/Makefile | 10 | ||||
| -rw-r--r-- | www/galeon2/files/patch-src_mozilla_TOCProtocolHandler.cpp | 11 |
4 files changed, 40 insertions, 2 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 6eb3a1f4cda5..b59b68ed1067 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -41,6 +41,14 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= galeon.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} > 500000 +# Galeon does not build correctly in -CURRENT if -Werror is passed +# to the compiler. +CONFIGURE_ARGS+= --disable-werror +.endif + post-extract: .if !defined(WITH_FULL_MOZILLA) @${ECHO_MSG} @@ -69,4 +77,4 @@ post-configure: pre-install: @-${X11BASE}/bin/gconftool --shutdown -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/galeon/files/patch-src_mozilla_TOCProtocolHandler.cpp b/www/galeon/files/patch-src_mozilla_TOCProtocolHandler.cpp new file mode 100644 index 000000000000..8a63aaa3b565 --- /dev/null +++ b/www/galeon/files/patch-src_mozilla_TOCProtocolHandler.cpp @@ -0,0 +1,11 @@ +--- src/mozilla/TOCProtocolHandler.cpp.orig Sun Jun 16 14:02:36 2002 ++++ src/mozilla/TOCProtocolHandler.cpp Sun Jun 16 14:11:48 2002 +@@ -400,7 +400,7 @@ + nsresult rv; + + struct dirent **namelist; +- int n = scandir (SHARE_DIR"/../gnome/help", &namelist, select, ++ int n = scandir (SHARE_DIR"/../gnome/help", &namelist, ((int(*)(struct dirent *))select), + alphasort); + if (n<0) return NS_ERROR_FAILURE; + diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 6eb3a1f4cda5..b59b68ed1067 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -41,6 +41,14 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= galeon.1 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} > 500000 +# Galeon does not build correctly in -CURRENT if -Werror is passed +# to the compiler. +CONFIGURE_ARGS+= --disable-werror +.endif + post-extract: .if !defined(WITH_FULL_MOZILLA) @${ECHO_MSG} @@ -69,4 +77,4 @@ post-configure: pre-install: @-${X11BASE}/bin/gconftool --shutdown -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/galeon2/files/patch-src_mozilla_TOCProtocolHandler.cpp b/www/galeon2/files/patch-src_mozilla_TOCProtocolHandler.cpp new file mode 100644 index 000000000000..8a63aaa3b565 --- /dev/null +++ b/www/galeon2/files/patch-src_mozilla_TOCProtocolHandler.cpp @@ -0,0 +1,11 @@ +--- src/mozilla/TOCProtocolHandler.cpp.orig Sun Jun 16 14:02:36 2002 ++++ src/mozilla/TOCProtocolHandler.cpp Sun Jun 16 14:11:48 2002 +@@ -400,7 +400,7 @@ + nsresult rv; + + struct dirent **namelist; +- int n = scandir (SHARE_DIR"/../gnome/help", &namelist, select, ++ int n = scandir (SHARE_DIR"/../gnome/help", &namelist, ((int(*)(struct dirent *))select), + alphasort); + if (n<0) return NS_ERROR_FAILURE; + |