darwin fixes (tested against firefox-gtk2)

5 files changed, 32 insertions, 12 deletions

diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index cb8814185c7..8bf157e7a15 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2004/08/27 06:29:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.44 2004/08/31 02:37:57 danw Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-source-${MOZ_DIST_VER}
@@ -94,8 +94,13 @@ PLIST_SUBST+=	MOZILLA=${MOZILLA}
 PLIST_SUBST+=	MOZILLA_BIN=${MOZILLA_BIN}
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=	so
+SCRIPTS_ENV+=	MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
+.elif ${OBJECT_FMT} == "Mach-O"
+SO_SUFFIX=	dylib
+SCRIPTS_ENV+=	MOZ_INSTALL_LIB="${INSTALL_LIB}"
 .else
 SO_SUFFIX=	so.1.0
+SCRIPTS_ENV+=	MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
 .endif
 PLIST_SUBST+=	SO_SUFFIX=${SO_SUFFIX}
 
@@ -134,6 +139,10 @@ CONFIGURE_ARGS+=	--enable-optimize=${COPTS:Q}
 XPTCFILES+=	xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
 XPTCFILES+=	xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
 
+.if ${OPSYS} == "Darwin"
+BUILDLINK_PASSTHRU_DIRS+=/Developer
+.endif
+
 post-extract:
 .for F in ${XPTCFILES}
 	${CP} ${FILESDIR}/${F} ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/${F}
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index d96be06f7fc..39cb50a5c36 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.64 2004/08/22 12:29:38 he Exp $
+$NetBSD: distinfo,v 1.65 2004/08/31 02:37:57 danw Exp $
 
 SHA1 (mozilla-source-1.7.2.tar.bz2) = 75c6f68d198e2fe0b7be525af6d458cc07c7d48d
 Size (mozilla-source-1.7.2.tar.bz2) = 34438800 bytes
 SHA1 (patch-aa) = be62070f062e8ae13f06bd7b3f4f0d4a9ee67bef
-SHA1 (patch-ab) = 334a1e79d63d045dafb50b82ea192b311b55e7d5
+SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f
 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
 SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install
index 6f331d617d0..8138e8eaaaf 100755
--- a/www/mozilla/files/moz-install
+++ b/www/mozilla/files/moz-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: moz-install,v 1.10 2004/06/02 14:32:22 taya Exp $
+# $NetBSD: moz-install,v 1.11 2004/08/31 02:37:57 danw Exp $
 
 ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA}
 ${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA}
@@ -35,7 +35,7 @@ done
 # install DSO
 for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
-	${BSD_INSTALL_PROGRAM} ${WRKSRC}/${src} ${PREFIX}/$i
+	${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${PREFIX}/$i
 done
 
 # install PKGCONFIG
diff --git a/www/mozilla/files/mozilla-Mach-O.in b/www/mozilla/files/mozilla-Mach-O.in
new file mode 100644
index 00000000000..99470536423
--- /dev/null
+++ b/www/mozilla/files/mozilla-Mach-O.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+MOZILLA_FIVE_HOME=@PREFIX@/lib/@MOZILLA@
+export MOZILLA_FIVE_HOME
+exec @PREFIX@/lib/@MOZILLA@/@MOZILLA_BIN@ "$@"
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index 8de1d4e3065..626961a7ad2 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,9 +1,16 @@
-$NetBSD: patch-ab,v 1.32 2004/06/21 14:14:00 taya Exp $
+$NetBSD: patch-ab,v 1.33 2004/08/31 02:37:57 danw Exp $
 
-diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2004-05-26 11:25:16.000000000 +0900
-+++ ./configure.in	2004-06-10 22:55:16.000000000 +0900
-@@ -1017,6 +1017,9 @@
+--- configure.in.orig	Thu May 13 17:57:46 2004
++++ configure.in
+@@ -996,7 +996,6 @@ case "$target" in
+     powerpc*)
+         _PLATFORM_DEFAULT_TOOLKIT='mac'
+         DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
+-        MOZ_ENABLE_POSTSCRIPT=
+         # set MACOSX to generate lib/mac/MoreFiles/Makefile
+         MACOSX=1
+         ;;
+@@ -1017,6 +1016,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -13,7 +20,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;; 
  
  *-hpux*)
-@@ -1308,6 +1311,13 @@
+@@ -1308,6 +1310,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -27,7 +34,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
-@@ -1531,7 +1541,7 @@
+@@ -1531,7 +1540,7 @@ dnl the qsort routine under solaris is f
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''