[Midnightbsd-cvs] mports: www/browser: This will need a magus run, but in theory this

[laffer1 at midnightbsd.org]

Log Message:
-----------
This will need a magus run, but in theory this should make browser work regardless of OS version (uname -r output used)

Modified Files:
--------------
    mports/www/browser:
        Makefile (r1.8 -> r1.9)

Removed Files:
-------------
    mports/www/browser/files:
        patch-MidnightBSD0.2-CURRENT.mk
        patch-MidnightBSD0.2.mk

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/browser/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L www/browser/Makefile -L www/browser/Makefile -u -r1.8 -r1.9
--- www/browser/Makefile
+++ www/browser/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	browser
 DISTVERSION=	2.0.0.17
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -191,6 +192,7 @@
 		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
 		${FALSE}; \
 	fi
+	${LN} -s ${WRKSRC}/security/coreconf/MidnightBSD.mk ${WRKSRC}/security/coreconf/MidnightBSD`${UNAME} -r`.mk
 
 post-configure:
 	@${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/mozilla-config.h
--- www/browser/files/patch-MidnightBSD0.2.mk
+++ /dev/null
@@ -1,85 +0,0 @@
---- security/coreconf/MidnightBSD0.2.mk.orig	Fri Oct 19 22:38:06 2007
-+++ security/coreconf/MidnightBSD0.2.mk	Fri Oct 19 22:37:47 2007
-@@ -0,0 +1,82 @@
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Netscape security libraries.
-+#
-+# The Initial Developer of the Original Code is
-+# Netscape Communications Corporation.
-+# Portions created by the Initial Developer are Copyright (C) 1994-2000
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+include $(CORE_DEPTH)/coreconf/UNIX.mk
-+
-+DEFAULT_COMPILER	= gcc
-+CC			= gcc
-+CCC			= g++
-+RANLIB			= ranlib
-+
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
-+CPU_ARCH		= x86
-+endif
-+
-+OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
-+
-+ifndef CLASSIC_NSPR
-+USE_PTHREADS		= 1
-+DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-+OS_LIBS			+= -pthread
-+DSO_LDOPTS		+= -pthread
-+endif
-+
-+ARCH			= midnightbsd
-+
-+MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+
-+ifeq ($(MOZ_OBJFORMAT),elf)
-+DLL_SUFFIX		= so
-+else
-+DLL_SUFFIX		= so.1.0
-+endif
-+
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+ifdef MAPFILE
-+	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+
-+G++INCLUDES		= -I/usr/include/g++
-+
-+INCLUDES		+= -I/usr/local/include
--- www/browser/files/patch-MidnightBSD0.2-CURRENT.mk
+++ /dev/null
@@ -1,85 +0,0 @@
---- security/coreconf/MidnightBSD0.2-CURRENT.mk.orig	Fri Oct 19 20:26:43 2007
-+++ security/coreconf/MidnightBSD0.2-CURRENT.mk	Fri Oct 19 13:00:39 2007
-@@ -0,0 +1,82 @@
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Netscape security libraries.
-+#
-+# The Initial Developer of the Original Code is
-+# Netscape Communications Corporation.
-+# Portions created by the Initial Developer are Copyright (C) 1994-2000
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+include $(CORE_DEPTH)/coreconf/UNIX.mk
-+
-+DEFAULT_COMPILER	= gcc
-+CC			= gcc
-+CCC			= g++
-+RANLIB			= ranlib
-+
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
-+CPU_ARCH		= x86
-+endif
-+
-+OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
-+
-+ifndef CLASSIC_NSPR
-+USE_PTHREADS		= 1
-+DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-+OS_LIBS			+= -pthread
-+DSO_LDOPTS		+= -pthread
-+endif
-+
-+ARCH			= midnightbsd
-+
-+MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+
-+ifeq ($(MOZ_OBJFORMAT),elf)
-+DLL_SUFFIX		= so
-+else
-+DLL_SUFFIX		= so.1.0
-+endif
-+
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+ifdef MAPFILE
-+	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+
-+G++INCLUDES		= -I/usr/include/g++
-+
-+INCLUDES		+= -I/usr/local/include