ports/146231: [feature request] [patch] www/firefox: use port libs

[Anonymous]

The following reply was made to PR ports/146231; it has been noted by GNATS.

From: Anonymous <swell.k at gmail.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/146231: [feature request] [patch] www/firefox: use port libs
Date: Fri, 06 Aug 2010 14:43:41 +0400

 I've removed bz2. It's not used outside updater.
 
 Also note, www/firefox-devel requires system sqlite be compiled with
 thread_safe, fts3, secure_delete, unlock_notify. Missing knobs are in
 ports/147841.
 
 BTW, adding `-event -sqlite' to USE_MOZILLA should restore current
 behaviour in other gecko ports, e.g.
 
   fgrep -l USE_MOZILLA */*/Makefile |
   fgrep -v -e firefox/ -e firefox-devel/ -e libxul/ |
   xargs sed -i '' 's/USE_MOZILLA.*/& -event -sqlite/'
 
 --- a.diff begins here ---
 The following diff is against gecko@ team svn repo
 
   https://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental/
 
 Index: Mk/bsd.gecko.mk
 ===================================================================
 --- Mk/bsd.gecko.mk	(revision 372)
 +++ Mk/bsd.gecko.mk	(working copy)
 @@ -419,7 +419,7 @@
  .endfor
  
  # Standard depends
 -_ALL_DEPENDS=	cairo dbm jpeg nspr nss png xft zip
 +_ALL_DEPENDS=	cairo dbm event jpeg nspr nss png sqlite xft zip
  
  cairo_LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
  cairo_MOZ_OPTIONS=	--enable-system-cairo
 @@ -427,6 +427,9 @@
  
  dbm_EXTRACT_AFTER_ARGS=		--exclude mozilla/dbm
  
 +event_LIB_DEPENDS=	event-1.[0-9].4:${PORTSDIR}/devel/libevent
 +event_MOZ_OPTIONS=	--with-system-libevent=${LOCALBASE}
 +
  jpeg_LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
  jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
  jpeg_EXTRACT_AFTER_ARGS=	--exclude mozilla/jpeg
 @@ -440,11 +443,14 @@
  nss_CPPFLAGS+=		-I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss
  nss_LDFLAGS+=		-L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
  
 -
  png_LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
  png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
  
 +sqlite_LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 +sqlite_MOZ_OPTIONS=	--enable-system-sqlite
 +
  xft_LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 +
  zip_DEPENDS=		zip:${PORTSDIR}/archivers/zip
  
  .for use in ${USE_MOZILLA}
 Index: www/firefox/Makefile
 ===================================================================
 --- www/firefox/Makefile	(revision 372)
 +++ www/firefox/Makefile	(working copy)
 @@ -21,7 +21,11 @@
  USE_AUTOTOOLS=	autoconf:213
  USE_GECKO=	gecko
  MOZ_PKGCONFIG_FILES=	# empty
 -USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 +.if !defined(WITH_PORT_LIBS)
 +USE_MOZILLA=	-dbm -event -jpeg -nss -png -sqlite -xft
 +.else
 +USE_MOZILLA=	-dbm -event -xft
 +.endif
  MOZILLA_NAME=	Firefox${MOZILLA_SUFX}
  MOZILLA_SUFX=	3
  MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
 @@ -99,6 +103,10 @@
  		s|echo aout|echo elf|g ; \
  		s|/usr/X11R6|${LOCALBASE}|g' \
  		${WRKSRC}/js/src/configure
 +	@${REINPLACE_CMD} -e 's|@NSS_CFLAGS@|& &/nss|g' \
 +		${MOZSRC}/config/autoconf.mk.in
 +	@${REINPLACE_CMD} -e 's/png_voidp_NULL/NULL/g' \
 +		${MOZSRC}/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
  
  pre-configure:
  	(cd ${WRKSRC} && ${AUTOCONF})
 Index: www/firefox-devel/Makefile
 ===================================================================
 --- www/firefox-devel/Makefile	(revision 372)
 +++ www/firefox-devel/Makefile	(working copy)
 @@ -22,7 +22,11 @@
  LATEST_LINK=	firefox-devel
  USE_GECKO=	gecko
  MOZ_PKGCONFIG_FILES=	# empty
 -USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 +.if !defined(WITH_PORT_LIBS)
 +USE_MOZILLA=	-dbm -event -jpeg -nss -png -sqlite -xft
 +.else
 +USE_MOZILLA=	-dbm -xft
 +.endif
  MOZ_TOOLKIT=	cairo-gtk2
  GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
  			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 @@ -107,6 +111,10 @@
  		s|echo aout|echo elf|g ; \
  		s|/usr/X11R6|${LOCALBASE}|g' \
  		${WRKSRC}/js/src/configure
 +	@${REINPLACE_CMD} -e 's|@NSS_CFLAGS@|& &/nss|g' \
 +		${MOZSRC}/config/autoconf.mk.in
 +	@${REINPLACE_CMD} -e 's/png_voidp_NULL/NULL/g' \
 +		${MOZSRC}/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
  
  pre-configure:
  	(cd ${WRKSRC} && ${AUTOCONF})
 Index: www/libxul/Makefile
 ===================================================================
 --- www/libxul/Makefile	(revision 372)
 +++ www/libxul/Makefile	(working copy)
 @@ -43,7 +43,12 @@
  USE_GECKO=	gecko
  MOZILLA_EXEC_NAME=xulrunner
  MOZ_TOOLKIT=	cairo-gtk2
 -USE_MOZILLA=	-png -nss -dbm -jpeg
 +.if !defined(WITH_PORT_LIBS)
 +USE_MOZILLA=	-dbm -event -jpeg -nss -png -sqlite
 +.else
 +USE_MOZILLA=	-dbm -event
 +.endif
 +
  MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-gtkmozembed-embedding \
  		mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
  
 @@ -77,6 +82,10 @@
  		s|echo aout|echo elf|g ; \
  		s|/usr/X11R6|${LOCALBASE}|g' \
  		${WRKSRC}/js/src/configure
 +	@${REINPLACE_CMD} -e 's|@NSS_CFLAGS@|& &/nss|g' \
 +		${MOZSRC}/config/autoconf.mk.in
 +	@${REINPLACE_CMD} -e 's/png_voidp_NULL/NULL/g' \
 +		${MOZSRC}/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
  
  pre-configure:
  	(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
 --- a.diff ends here ---