- Add and remove some more common lines

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

3 files changed, 20 insertions, 12 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 244e89117..160c5fbb7 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,7 +3,7 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/www/mozilla/Makefile,v 1.25 2005/11/13 19:07:58 ahze Exp $
 #
 
 PORTNAME=	mozilla
@@ -41,13 +41,10 @@ FREETYPE_LIB=	libfreetype.so.9
 OPTIONS=CALENDAR "Enable the Calendar module" off \
 	MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
-	DEBUG "Enable debugging (i.e. gdb) support" off \
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
 	XMLTERM "Enable the XMLTerm module" on \
-	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \
-	OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \
-	SMB "Enable smb:// URI support via gnomevfs" off
+	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.common"
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 005ba0a87..464fbd360 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile.common,v 1.1 2005/11/13 19:07:58 ahze Exp $
+#    $MCom: ports/www/mozilla/Makefile.common,v 1.2 2005/11/13 19:26:50 ahze Exp $
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -8,6 +8,11 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		nss3:${PORTSDIR}/security/nss \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
+OPTIONS+=	DEBUG "Build a debugging image" off \
+		LOGGING "Enable additional log messages" off \
+		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
+		SMB "Enable smb:// URI support using gnomevfs" off
+
 MAINTAINER?=	gnome@FreeBSD.org
 
 MOZILLA?=	${PORTNAME}
@@ -16,6 +21,7 @@ USE_GNOME+=	gtk20 libidl desktopfileutils
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 
 WRKSRC?=	${WRKDIR}/mozilla
 PKGINSTALL?=	${WRKDIR}/pkg-install
@@ -24,6 +30,8 @@ FAKEDIR?=	${WRKDIR}/fake
 PLIST?=		${WRKDIR}/plist
 
 KRB5_HOME?=	/usr
+ESD_LIB?=	libesd.so.2
+FREETYPE_LIB?=	libfreetype.so.9
 
 GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
@@ -36,7 +44,6 @@ EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude */CVS/*	\
 			--exclude makefile.win			\
 			--exclude MANIFEST			\
 			--exclude */nsprpub/*			\
-			--exclude */zlib/			\
 			--exclude mozilla/modules/libimg/png	\
 			--exclude mozilla/jpeg			\
 			--exclude mozilla/dbm			\
@@ -118,6 +125,13 @@ pre-configure:
 		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|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
+			${WRKSRC}/configure
+	@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
+		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
 		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
 		${FALSE}; \
diff --git a/www/mozilla/files/mozconfig-generic.in b/www/mozilla/files/mozconfig-generic.in
index 027996be8..5ca8408d2 100644
--- a/www/mozilla/files/mozconfig-generic.in
+++ b/www/mozilla/files/mozconfig-generic.in
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/mozilla/files/mozconfig-generic.in,v 1.1 2005/11/13 19:07:58 ahze Exp $
 ######################################################################
 # standard opts from README
 ac_add_options --enable-crypto
@@ -8,9 +8,6 @@ ac_add_options --disable-mailnews
 ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-xft
-# See the following URL for approval email for using official branding
-# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
-ac_add_options --enable-official-branding
 ######################################################################
 # FreeBSD specific
 export CPPFLAGS="@CPPFLAGS@"
@@ -29,7 +26,7 @@ ac_add_options --x-libraries=@X11BASE@/lib
 ######################################################################
 # Use ports for these libraries
 ac_add_options --with-system-jpeg=@LOCALBASE@
-ac_add_options --with-system-zlib
+ac_add_options --with-system-zlib=/usr
 ac_add_options --with-system-png=@LOCALBASE@
 ac_add_options --with-gssapi=@KRB5_HOME@
 ac_add_options --with-system-nspr