diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2008-07-06 05:29:53 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2008-07-06 05:29:53 +0000 |
| commit | caae905ef97581882aa78cef9a2b2f65621c1e8d (patch) | |
| tree | 58348248440c3ec52950a81bebdffe224a81643d /www | |
| parent | [PATCH] Tools/scripts: Some cleanups, additions to bump_version.pl (diff) | |
Fix the build if ${LOCALBASE}/include/base64.h exists from other ports or
unoffical stuff installed.
Reported by: Oliver Lehmann <lehmann@ans-netz.de>
Notes
Notes:
svn path=/head/; revision=216391
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox3/files/patch-security-coreconf-FreeBSD.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/www/firefox3/files/patch-security-coreconf-FreeBSD.mk b/www/firefox3/files/patch-security-coreconf-FreeBSD.mk index 0f7a04a0279f..c4ed8e5ba533 100644 --- a/www/firefox3/files/patch-security-coreconf-FreeBSD.mk +++ b/www/firefox3/files/patch-security-coreconf-FreeBSD.mk @@ -1,5 +1,5 @@ ---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 -+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 +--- security/coreconf/FreeBSD.mk.orig 2008-07-06 00:10:00.000000000 -0500 ++++ security/coreconf/FreeBSD.mk 2008-07-06 00:12:34.000000000 -0500 @@ -45,8 +45,12 @@ ifeq ($(OS_TEST),alpha) CPU_ARCH = alpha @@ -11,7 +11,7 @@ endif +endif - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK @@ -73,7 +77,7 @@ DLL_SUFFIX = so.1.0 @@ -22,3 +22,9 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif +@@ -82,4 +86,4 @@ + + G++INCLUDES = -I/usr/include/g++ + +-INCLUDES += -I/usr/X11R6/include ++#INCLUDES += -I/usr/X11R6/include |