From e31abb208c10129c6428ac3df7972daa594bc896 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Wed, 7 Mar 2007 21:32:53 +0000 Subject: Dynamically generate the part of the PLIST for libfreebl. This is because the exact names of the freebl libraries depends on the platform and they have a habit of changing even on minor releases. This causes these mozilla packages to be broken quite a lot on platforms other than NetBSD/i386. Hopefully this fix will last longer than previous ones. pkgrevision bumps all around. --- www/firefox/Makefile | 3 ++- www/firefox/Makefile.common | 40 +++++++++++++++++++++++++++------------- www/firefox/PLIST | 10 +++------- 3 files changed, 32 insertions(+), 21 deletions(-) (limited to 'www/firefox') diff --git a/www/firefox/Makefile b/www/firefox/Makefile index e918d0874ca..8de6a87daa9 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2007/02/25 00:43:23 ghen Exp $ +# $NetBSD: Makefile,v 1.42 2007/03/07 21:32:54 dmcmahill Exp $ MOZILLA= firefox +PKGREVISION= 1 COMMENT= Lightweight gecko-based web browser MOZILLA_USE_GTK2= # yes diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index 90b615f23c1..08ec7dda113 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2007/02/04 18:16:55 dmcmahill Exp $ +# $NetBSD: Makefile.common,v 1.17 2007/03/07 21:32:54 dmcmahill Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -117,18 +117,6 @@ SCRIPTS_ENV+= MOZ_INSTALL_LIB=${INSTALL_PROGRAM:Q} .endif PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} -.if (${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc") -PLIST_SUBST+= SUNOSLIB="" -SCRIPTS_ENV+= SUNOSLIB="" -PLIST_SUBST+= NOT_SUNOSLIB="@comment " -SCRIPTS_ENV+= NOT_SUNOSLIB="@comment " -.else -PLIST_SUBST+= SUNOSLIB="@comment " -SCRIPTS_ENV+= SUNOSLIB="@comment " -PLIST_SUBST+= NOT_SUNOSLIB="" -SCRIPTS_ENV+= NOT_SUNOSLIB="" -.endif - .if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc" MAKEFLAGS+= NS_USE_GCC=YES .endif @@ -183,6 +171,32 @@ post-build: ${ECHO} locale,install,select,en-US >> \ ${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt +# The exact set of libfreebl* libs built and installed depends on the +# operating system and platform. For example, on solaris/sparc you might +# get +# libfreebl_32fpu_3.so +# libfreebl_32int_3.so +# libfreebl_32int64_3.so +# and on others +# libfreebl3.so +# Since this has been a continual problem in many mozilla packages, just +# do that part dynamically rather than trying to always keep our conditionals +# up to date. Note that the exact set of libfreebl libs has had a history +# of changing even on minor releases. +PLIST_SRC= ${WRKDIR}/PLIST +pre-install: + cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \ + ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl + cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.chk | ${SORT} | \ + ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl.chk + ${AWK} '/@comment libfreebl$$/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC} + ${CAT} ${WRKSRC}/PLIST.libfreebl >> ${PLIST_SRC} + ${AWK} '/@comment libfreebl.chk/ {exit} ok == 1 {print} /@comment libfreebl$$/ {ok=1}' \ + ${.CURDIR}/PLIST >> ${PLIST_SRC} + ${CAT} ${WRKSRC}/PLIST.libfreebl.chk >> ${PLIST_SRC} + ${AWK} 'ok == 1 {print} /@comment libfreebl.chk/ {ok=1}' \ + ${.CURDIR}/PLIST >> ${PLIST_SRC} + do-install: ${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install diff --git a/www/firefox/PLIST b/www/firefox/PLIST index f5f0b9d78ee..dd861ddec67 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2007/02/25 00:43:23 ghen Exp $ +@comment $NetBSD: PLIST,v 1.25 2007/03/07 21:32:54 dmcmahill Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -70,7 +70,7 @@ lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX} lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX} lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX} lib/${MOZILLA}/extensions/inspector@mozilla.org/components/libinspector.${SO_SUFFIX} -lib/${MOZILLA}/libfreebl3.${SO_SUFFIX} +@comment libfreebl lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX} lib/${MOZILLA}/libgkgfx.${SO_SUFFIX} lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX} @@ -91,8 +91,6 @@ lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX} lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX} lib/${MOZILLA}/libxpistub.${SO_SUFFIX} lib/${MOZILLA}/plugins/libunixprintplugin.${SO_SUFFIX} -${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX} -${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX} @comment end DSO @comment begin PKGCONFIG lib/pkgconfig/firefox-gtkmozembed.pc @@ -299,9 +297,7 @@ lib/${MOZILLA}/icons/mozicon128.png lib/${MOZILLA}/icons/mozicon16.xpm lib/${MOZILLA}/icons/mozicon50.xpm lib/${MOZILLA}/init.d/README -lib/${MOZILLA}/libfreebl3.chk -${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.chk -${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.chk +@comment libfreebl.chk lib/${MOZILLA}/libsoftokn3.chk lib/${MOZILLA}/res/EditorOverride.css lib/${MOZILLA}/res/arrow.gif -- cgit v1.2.3