head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.1.0.2
	pkgsrc-2009Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2010.01.16.14.41.25;	author tnn;	state dead;
branches;
next	1.1;

1.1
date	2009.10.11.07.51.48;	author sno;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- update to 3.12.4.5
- reach over to xulrunner, track the stable gecko release
- use external sqlite3
- cleanup
- take maintainership

This is the second part of PR pkg/42277.
@
text
@$NetBSD: patch-as,v 1.1 2009/10/11 07:51:48 sno Exp $

Apply patches from FreeBSD ports

--- mozilla/security/coreconf/FreeBSD.mk.orig	2009-09-27 13:47:48.000000000 +0200
+++ mozilla/security/coreconf/FreeBSD.mk	2009-09-27 14:01:51.000000000 +0200
@@@@ -37,13 +37,25 @@@@
 
 include $(CORE_DEPTH)/coreconf/UNIX.mk
 
-DEFAULT_COMPILER	= gcc
-CC			= gcc
-CCC			= g++
+DEFAULT_COMPILER	= $(CC)
+CC			?= gcc
+CCC			= $(CXX)
 RANLIB			= ranlib
 
 ifeq ($(OS_TEST),alpha)
 CPU_ARCH		= alpha
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH		= powerpc
+else
+ifeq ($(OS_TEST),sparc64)
+CPU_ARCH		= sparc64
+USE_64			= 1
+else
+ifeq ($(OS_TEST),amd64)
+USE_64			= 1
+endif
+endif
+endif
 else
 CPU_ARCH		= x86
 endif
@@@@ -65,15 +77,15 @@@@
 
 ARCH			= freebsd
 
-MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
+#MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
+DLL_SUFFIX		= so.1
 
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX		= so
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
 else
-DLL_SUFFIX		= so.1.0
+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
 endif
 
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
 endif
@@@@ -83,3 +95,5 @@@@
 G++INCLUDES		= -I/usr/include/g++
 
 INCLUDES		+= -I/usr/X11R6/include
+USE_SYSTEM_ZLIB		= 1
+ZLIB_LIBS		= -lz
@


1.1
log
@Fix nss build on FreeBSD
@
text
@d1 1
a1 1
$NetBSD$
@