Remove old linker workaround.

Use lowercase PKGNAME version name.
Prepare for running configure ourselves.

4 files changed, 30 insertions, 23 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index ee7b9ef02dd..cf674b1cdfb 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2000/06/17 22:14:00 tsarna Exp $
+# $NetBSD: Makefile,v 1.31 2000/06/19 04:15:32 soren Exp $
 #
 
 DISTNAME=	mozilla-source-M16
-PKGNAME=	mozilla-M16
+PKGNAME=	mozilla-m16
 WRKSRC=		${WRKDIR}/mozilla
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mozilla.org/pub/mozilla/releases/m16/src/
@@ -15,6 +15,12 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
 BUILD_DEPENDS+=	autoconf:../../devel/autoconf
 DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
 DEPENDS+=	ORBit>=0.5.1:../../net/ORBit
+#DEPENDS+=	jpeg-6b:../../graphics/jpeg
+#DEPENDS+=	png>=1.0.6:../../graphics/png
+
+#GNU_CONFIGURE=	yes
+#CONFIGURE_ARGS=--with-jpeg=${LOCALBASE} --with-png=${LOCALBASE} \
+#		--disable-pedantic --disable-debug
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
@@ -35,11 +41,8 @@ do-build:
 	(cd ${WRKSRC} && ${GMAKE} -f client.mk build)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/moz-export \
-		${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/mozilla-export \
+	${INSTALL_PROGRAM} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/mozilla \
 		${PREFIX}/bin
-	${LN} -sf ${PREFIX}/bin/moz-export ${PREFIX}/bin/mozilla
 	${INSTALL_PROGRAM_DIR} ${MOZ_LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/*.so.?.? ${MOZ_LIBDIR}
 
diff --git a/www/mozilla/files/patch-sum b/www/mozilla/files/patch-sum
index d5a36acbe0e..39f6a4f5e33 100644
--- a/www/mozilla/files/patch-sum
+++ b/www/mozilla/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.3 2000/06/18 21:38:51 soren Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/19 04:15:37 soren Exp $
 
 MD5 (patch-aa) = 509806249363fc7cf9bb7dc60d2f5a1e
 MD5 (patch-ab) = 7f5e40328dc69e381f1e9c55058c5b57
 MD5 (patch-ac) = 12340eb21792743b61b0ea3000a31b69
-MD5 (patch-ad) = abaaa20a108a30b61a9ea23fe4a28cb5
+MD5 (patch-ad) = 86389c88aa9d6e98125f1f34fe918666
 MD5 (patch-ae) = e35898974f526f81d5267522bc57ec0c
 MD5 (patch-af) = 37d0116b552c2cfaa7ccd4c55478c343
 MD5 (patch-ag) = 3266fd5854c6f0b44fce2f2702bca2c0
diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad
index 655ce68fca9..e2cdefca76a 100644
--- a/www/mozilla/patches/patch-ad
+++ b/www/mozilla/patches/patch-ad
@@ -1,6 +1,5 @@
-diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in
---- ../mozilla-current.orig/mozilla/configure.in	Sun Jun  4 13:01:34 2000
-+++ ./configure.in	Mon Jun  5 00:49:07 2000
+--- configure.in.orig	Tue Jun 13 16:56:51 2000
++++ configure.in	Mon Jun 19 06:06:55 2000
 @@ -344,6 +344,11 @@
  TARGET_MD_ARCH=unix
  DIRENT_INO=d_ino
@@ -13,7 +12,7 @@ diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in
  
  MOZ_JPEG_CFLAGS=
  MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
-@@ -682,11 +687,25 @@
+@@ -682,29 +687,28 @@
      ;;
  
  *-netbsd*)
@@ -41,10 +40,17 @@ diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in
      # At least for 1.3 and up, ld supports this, despite the test failing above.
      MKSHLIB_FORCE_ALL='--whole-archive'
      MKSHLIB_UNFORCE_ALL='--no-whole-archive'
-@@ -701,10 +720,6 @@
- 		MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- 		;;
-     esac
+-    case $OS_TEST in
+-	alpha)
+-		dnl NetBSD/alpha can't find a shared lib
+-		dnl (.so.1.0) unless there's a .so as well.
+-		NEED_BASE_DLL_NAME_ALSO=1
+-		;;
+-	*86)
+-		MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-		MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-		;;
+-    esac
 -    dnl Test for a.out platform and handle C++ libraries correctly
 -    if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
 -	DSO_LDOPTS="-shared"
@@ -52,7 +58,7 @@ diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
      fi
-@@ -947,6 +962,11 @@
+@@ -947,6 +951,11 @@
  
  dnl See above (netbsd)
  AC_SUBST(NEED_BASE_DLL_NAME_ALSO)
@@ -64,7 +70,7 @@ diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in
  
  dnl Only one oddball right now (QNX), but this gives us flexibility
  dnl if any other platforms need to override this in the future.
-@@ -1150,6 +1170,12 @@
+@@ -1150,6 +1159,12 @@
      AM_PATH_GTK($GTK_VERSION,,
        AC_MSG_ERROR(Test for GTK failed.))
  
@@ -77,7 +83,7 @@ diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in
  dnl ========================================================
  dnl =							   =
  dnl = --with-java-supplement				   =
-@@ -1621,6 +1647,13 @@
+@@ -1621,6 +1636,13 @@
      HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
  fi
  
@@ -91,7 +97,7 @@ diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in
  dnl Checks for typedefs, structures, and compiler characteristics.
  dnl ========================================================
  AC_C_CONST
-@@ -2760,6 +2793,7 @@
+@@ -2760,6 +2782,7 @@
      *-*-solaris*) MOZ_MONOLITHIC_TOOLKIT= ;;
      *-openvms*)   MOZ_MONOLITHIC_TOOLKIT= ;;
      *-freebsd*)   MOZ_MONOLITHIC_TOOLKIT= ;;
diff --git a/www/mozilla/pkg/PLIST b/www/mozilla/pkg/PLIST
index 60f487217c0..3ac3601937d 100644
--- a/www/mozilla/pkg/PLIST
+++ b/www/mozilla/pkg/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 1999/03/29 16:05:43 hubertf Exp $
-bin/moz-export
-bin/mozilla-export
+@comment $NetBSD: PLIST,v 1.11 2000/06/19 04:15:38 soren Exp $
 bin/mozilla
 lib/mozilla/libDtWidgets.so.1.0
 lib/mozilla/libXfeBm.so.1.0