re-introduce old nss im too tired for this

security/nss/coreconf/NetBSD.mk

@@ -5,10 +5,9 @@
 
 include $(CORE_DEPTH)/coreconf/UNIX.mk
 
-CC			?= gcc
-CXX			?= g++
-DEFAULT_COMPILER	= ${CC}
-CCC			= ${CXX}
+DEFAULT_COMPILER	= gcc
+CC			= gcc
+CCC			= g++
 RANLIB			= ranlib
 
 CPU_ARCH		:= $(shell uname -p)
@@ -16,14 +15,16 @@ ifeq ($(CPU_ARCH),i386)
 OS_REL_CFLAGS		= -Di386
 CPU_ARCH		= x86
 endif
-ifeq (,$(filter-out earm%,$(CPU_ARCH)))
-CPU_ARCH		= arm
-endif
-ifeq ($(CPU_ARCH),aarch64eb)
-CPU_ARCH		= aarch64
+
+ifndef OBJECT_FMT
+OBJECT_FMT		:= $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
 endif
 
+ifeq ($(OBJECT_FMT),ELF)
 DLL_SUFFIX		= so
+else
+DLL_SUFFIX		= so.1.0
+endif
 
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 
@@ -32,16 +33,9 @@ OS_LIBS			= -lcompat
 ARCH			= netbsd
 
 DSO_CFLAGS		= -fPIC -DPIC
-DSO_LDOPTS		= -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-
-#
-# The default implementation strategy for NetBSD is pthreads.
-#
-ifndef CLASSIC_NSPR
-USE_PTHREADS		= 1
-DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-OS_LIBS			+= -pthread
-DSO_LDOPTS		+= -pthread
+DSO_LDOPTS		= -shared
+ifeq ($(OBJECT_FMT),ELF)
+DSO_LDOPTS		+= -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 endif
 
 ifdef LIBRUNPATH
@@ -50,8 +44,12 @@ endif
 
 MKSHLIB			= $(CC) $(DSO_LDOPTS)
 ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+# Add LD options to restrict exported symbols to those in the map file
 endif
-PROCESS_MAP_FILE = grep -v ';-' $< | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
+# Change PROCESS to put the mapfile in the correct format for this platform
+PROCESS_MAP_FILE = cp $< $@
 
+
+G++INCLUDES		= -I/usr/include/g++
+
+INCLUDES		+= -I/usr/X11R6/include