- Pet portlint

- Use system nss and nspr
- Add support for jdk1.5.0 and remove diablo-jdk1.3.1


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5103 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 171 insertions, 21 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index d3541ed35..99f5aae91 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/www/seamonkey/Makefile,v 1.25 2005/11/11 04:11:02 ahze Exp $
 #
 
 PORTNAME?=	seamonkey
@@ -22,6 +22,8 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft \
+		nspr4:${PORTSDIR}/devel/nspr \
+		nss3:${PORTSDIR}/security/nss \
 		svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
 
 WRKSRC=		${WRKDIR}/mozilla
@@ -33,6 +35,7 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
 			--exclude */package/* \
 			--exclude .cvsignore \
+			--exclude */nsprpub/*	\
 			--exclude makefile.win \
 			--exclude MANIFEST
 USE_GNOME=	gtk20 libidl desktopfileutils
@@ -51,7 +54,7 @@ MOZ_PIS_DIR=	${SCRIPTS_DIR}/init.d
 MOZ_PIS_SCRIPTS=	S50cleanhome
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/cairo"
-CONFIGURE_ARGS=					\
+CONFIGURE_ARGS=	--with-system-nspr		\
 		--disable-auto-deps		\
 		--enable-chrome-format=jar	\
 		--disable-cpp-exceptions	\
@@ -92,13 +95,13 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 ESD_LIB=	libesd.so.2
 FREETYPE_LIB=	libfreetype.so.9
 PKGCONFIG_FILES=seamonkey-gtkmozembed seamonkey-js seamonkey-xpcom \
-		seamonkey-nspr seamonkey-nss seamonkey-plugin
+		seamonkey-plugin
 
 # JPI stuff.  List paths to Java Plug-ins here in the order to try.
 JPI_LIST?=\
+	${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
 	${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
 	${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
-	${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
 	${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
 
 OPTIONS=MAILNEWS "Enable Mail and News modules" on \
@@ -127,8 +130,8 @@ IGNORE=		core dumps on ${ARCH} during post-build
 .endif
 
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
-BROKEN=		Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
-		illegibly. Please remove the mozilla-fonts package
+BROKEN="Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
+	illegibly. Please remove the mozilla-fonts package"
 .endif
 
 #.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
@@ -198,6 +201,10 @@ CONFIGURE_ENV+=		WITH_OPTIMIZE=-O
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g ; \
+		s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
+		s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
+			${WRKSRC}/build/unix/mozilla-config.in
 	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g' \
 		${WRKSRC}/build/unix/mozilla-config.in
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -207,10 +214,8 @@ post-patch:
 			${WRKSRC}/config/autoconf.mk.in
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/nsprpub/configure
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/nsprpub/configure \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
 		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
@@ -247,7 +252,7 @@ pre-install:
 	${RM} -rf ${PLIST} ${FAKEDIR}
 	${TOUCH} -f ${PLIST}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} install
+		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
 	${MKDIR} ${SCRIPTS_DIR} ${MOZ_PIS_DIR}
 	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
 		${FAKEDIR}/bin/seamonkey \
diff --git a/www/seamonkey/files/patch-nsprpub_pr_include_md__freebsd.cfg b/www/seamonkey/files/patch-nsprpub_pr_include_md__freebsd.cfg
deleted file mode 100644
index cb309ac98..000000000
--- a/www/seamonkey/files/patch-nsprpub_pr_include_md__freebsd.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/include/md/_freebsd.cfg.orig	Sun Jan 16 16:13:08 2005
-+++ nsprpub/pr/include/md/_freebsd.cfg	Sun Jan 16 16:16:34 2005
-@@ -141,7 +141,7 @@
- #define PR_ALIGN_OF_DOUBLE  8
- #define PR_ALIGN_OF_POINTER 8
- 
--#elif defined(__sparc__)
-+#elif defined(__sparc64__)
- 
- #undef  IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN 1
diff --git a/www/seamonkey/files/patch-sysnss b/www/seamonkey/files/patch-sysnss
new file mode 100644
index 000000000..a9154ce9a
--- /dev/null
+++ b/www/seamonkey/files/patch-sysnss
@@ -0,0 +1,156 @@
+--- Makefile.in	Tue Sep 14 16:59:40 2004
++++ Makefile.in	Tue Aug  2 08:26:55 2005
+@@ -102,6 +102,4 @@
+ # tier 1 -  3rd party individual libraries
+ #
+-tier_1_dirs	+= dbm
+-
+ ifndef MOZ_NATIVE_JPEG
+ tier_1_dirs	+= jpeg
+--- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
++++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
+@@ -117,5 +117,5 @@
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += -I$(DIST)/public/nss \
++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
+                   $(NULL)
+ 
+--- config/config.mk	Tue Oct 12 00:11:11 2004
++++ config/config.mk	Tue Aug  2 09:19:18 2005
+@@ -170,5 +170,4 @@
+ NSS_LIBS	= \
+ 	$(LIBS_DIR) \
+-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+ 	-lsmime3 \
+ 	-lssl3 \
+@@ -189,11 +188,5 @@
+ endif
+ 
+-NSS_DEP_LIBS	= \
+-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+-	$(NULL)
++NSS_DEP_LIBS	=
+ 
+ MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
+--- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
++++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
+@@ -88,4 +88,8 @@
+ }
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <errno.h>
++
+ #ifdef PR_LOGGING
+ PRLogModuleInfo* gPIPNSSLog = nsnull;
+@@ -406,4 +410,5 @@
+     const char *possible_ckbi_locations[] = {
+       NS_GRE_DIR,
++      NS_UNIX_LIB_DIR,
+       NS_XPCOM_CURRENT_PROCESS_DIR
+     };
+@@ -419,5 +424,5 @@
+       }
+ 
+-      char *fullModuleName = nsnull;
++      char *fullModuleName;
+ #ifdef XP_MAC
+       nsCAutoString nativePath;
+@@ -431,4 +436,12 @@
+       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
+ #endif
++      if (fullModuleName == nsnull)
++        continue;
++      struct stat sb;
++      if (stat(fullModuleName, &sb)) {
++        if (errno != ENOENT)
++          perror(fullModuleName);
++        continue;
++      }
+       /* If a module exists with the same name, delete it. */
+       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
+--- security/manager/Makefile.in.orig	Wed Nov  2 16:50:36 2005
++++ security/manager/Makefile.in	Fri Nov 11 02:14:27 2005
+@@ -52,18 +52,9 @@
+ 	SSL3_LIB \
+ 	SOFTOKEN3_LIB \
+ 	SOFTOKEN3_CHK \
+-	LOADABLE_ROOT_MODULE \
+ 	HAVE_FREEBL_MODULES \
+ 	$(NULL)
+ 
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-
+-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
+-SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
+-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
+-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
+-
+ ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
+ ifeq (,$(filter i86pc ia64,$(OS_TEST)))
+ ifndef HAVE_64BIT_OS
+@@ -151,11 +142,6 @@
+ 
+ .nss.cleaned: .nss.checkout
+ 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+-endif
+ 	touch $@
+ 
+ .nss.checkout:
+@@ -176,10 +162,10 @@
+ else
+ 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+ endif
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
++#	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+ ifndef SKIP_CHK
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
++#	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
++#	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
+ endif
+ 	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+ ifndef SKIP_CHK
+@@ -203,20 +189,6 @@
+ endif
+ 
+ install::
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
+-endif
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_MODULES
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
+-endif
+ 	$(MAKE) -C boot $@
+ 	$(MAKE) -C ssl $@
+ 	$(MAKE) -C locales $@
+@@ -232,11 +204,6 @@
+ 	$(MAKE) -C pki $@
+ endif
+ 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+-endif
+ 
+ echo-requires-recursive::
+ 	$(MAKE) -C boot $@