add native NetBSD build, used by default (instead of Linux builds)

where possible.

to force using the Linux builds, define MOZILLA_USE_LINUX.

2 files changed, 33 insertions, 12 deletions

diff --git a/www/MozillaFirebird-bin-nightly/Makefile b/www/MozillaFirebird-bin-nightly/Makefile
index b543ec53ce0..0ed4fc5a026 100644
--- a/www/MozillaFirebird-bin-nightly/Makefile
+++ b/www/MozillaFirebird-bin-nightly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/10/19 08:35:09 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/17 02:57:10 grant Exp $
 #
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
@@ -31,6 +31,14 @@ PKGVER!=		${DATE} +%Y%m%d
 FILES_SUBST+=		PLATFORM=${PLATFORM}
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
+# everything specific to your OS/Arch goes into it's own Makefile
+# group together i386, i486, i586 and i686 (for Linux)
+ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
+
+.if exists(Makefile.${OPSYS}.${ARCH})
+.  include "Makefile.${OPSYS}.${ARCH}"
+.endif
+
 do-build:
 
 post-build:
@@ -63,6 +71,10 @@ post-install:
 	${LN} -s libglib.so libglib-1.2.so.0;				\
 	${LN} -s libgmodule.so libgmodule-1.2.so.0
 .endif
+.if ${_COMPAT16_LIBSTDCXX} == "YES"
+	@cd ${MOZILLA_LIB} && \
+	${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* .
+.endif
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/MozillaFirebird-${PLATFORM} >> ${PLIST_SRC}
 	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
@@ -72,12 +84,4 @@ post-install:
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
 
-# everything specific to your OS/Arch goes into it's own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
-
-.if exists(Makefile.${OPSYS}.${ARCH})
-.  include "Makefile.${OPSYS}.${ARCH}"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386 b/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386
index 918d0e52bca..0afe2115184 100644
--- a/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386
+++ b/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386
@@ -1,14 +1,31 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/10/19 08:35:09 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.3 2003/12/17 02:57:10 grant Exp $
 #
 
+.if defined(MOZILLA_USE_LINUX)
 DISTNAME=	MozillaFirebird-i686-pc-linux-gnu
 MASTER_SITES=	http://ftp.mozilla.org/pub/firebird/nightly/latest-trunk/
 
 PLATFORM=	linux
-MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
 
 DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=	suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DEPENDS+=	suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk
+.  include "../../emulators/suse_linux/Makefile.application"
+.else
+DISTNAME=	MozillaFirebird-i386-unknown-netbsdelf1.6
+MASTER_SITES=	http://ftp.mozilla.org/pub/firebird/nightly/contrib/latest-trunk/
+
+ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
+
+PLATFORM=	netbsd
 
-.include "../../emulators/suse_linux/Makefile.application"
+DEPENDS+=	ORBit>=0.5.15nb5:../../net/ORBit
+DEPENDS+=	gtk+>=1.2.10nb5:../../x11/gtk
+
+.  if !exists(/usr/lib/libstdc++.so.4)
+DEPENDS+=	compat16>=1.6.0:../../emulators/compat16
+_COMPAT16_LIBSTDCXX=	YES
+.  endif
+.endif
+
+MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}