Update to 1.1

Note: this is a stable release and it does belong in ports... Just a little
      backporting love is needed


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

4 files changed, 11 insertions, 34 deletions

diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 22f48d7ad..7af21f896 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile.common,v 1.43 2007/02/04 01:41:08 marcus Exp $
+#    $MCom: ports/www/mozilla/Makefile.common,v 1.44 2007/02/04 22:41:19 marcus Exp $
 
 # This file contains some reusable components for mozilla ports. It's of
 # use primarily to apps from the mozilla project itself (such as Firefox,
@@ -111,7 +111,7 @@ JPI_LIST?=\
 MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
 			${MOZILLA}-xpcom ${MOZILLA}-plugin
 
-CPPFLAGS+=		-I${X11BASE}/include
+CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 LIBS+=			${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 890d23311..c8193ec9f 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,12 +3,11 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports/www/seamonkey/Makefile,v 1.44 2006/12/15 22:20:32 ahze Exp $
+#    $MCom: ports/www/seamonkey/Makefile,v 1.45 2006/12/22 02:06:26 mezz Exp $
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	1.1b
-PORTREVISION=	1
+DISTVERSION=	1.1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
@@ -48,6 +47,8 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 
 .include <bsd.port.pre.mk>
 
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
 .if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
 # Glitz support can only be enabled if cairo is built with glitz support
 MOZ_OPTIONS+=	--enable-glitz
@@ -97,6 +98,8 @@ MOZ_OPTIONS+=	--disable-composer
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/security/manager/ssl/src/Makefile.in
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
 		${WRKSRC}/storage/build/Makefile.in
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 61d8b9471..c4a639116 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,3 +1,3 @@
-MD5 (seamonkey-1.1b.source.tar.bz2) = 097c41eff9d8eaf7843e7ee3c812341e
-SHA256 (seamonkey-1.1b.source.tar.bz2) = 6f36059b384e0616d8472d857a94e83ed876dbae3f1fb69a0868e27c65752b69
-SIZE (seamonkey-1.1b.source.tar.bz2) = 34935770
+MD5 (seamonkey-1.1.source.tar.bz2) = 2d78434affe9e4499e3cfceae2d8522f
+SHA256 (seamonkey-1.1.source.tar.bz2) = 8999843cf0f42e824d026a863cc58e4be5fcf7eed20f5eb14a3246197b22bfca
+SIZE (seamonkey-1.1.source.tar.bz2) = 34965668
diff --git a/www/seamonkey/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/seamonkey/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
deleted file mode 100644
index 07014d87f..000000000
--- a/www/seamonkey/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
-@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
- 
- nsFontPSXft::~nsFontPSXft()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
-@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
- 
- nsXftType1Generator::~nsXftType1Generator()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;