pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Dynamically generate the part of the PLIST for libfree...
details: https://anonhg.NetBSD.org/pkgsrc/rev/344f625e2f8d
branches: trunk
changeset: 526328:344f625e2f8d
user: dmcmahill <dmcmahill%pkgsrc.org@localhost>
date: Wed Mar 07 21:32:53 2007 +0000
description:
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.
diffstat:
mail/thunderbird-gtk1/Makefile | 3 ++-
mail/thunderbird-gtk1/PLIST | 6 +++---
mail/thunderbird/Makefile | 3 ++-
mail/thunderbird/PLIST | 10 +++-------
www/firefox-gtk1/Makefile | 3 ++-
www/firefox-gtk1/PLIST | 6 +++---
www/firefox/Makefile | 3 ++-
www/firefox/Makefile.common | 40 +++++++++++++++++++++++++++-------------
www/firefox/PLIST | 10 +++-------
www/firefox2-gtk1/Makefile | 3 ++-
www/firefox2-gtk1/PLIST | 6 +++---
www/firefox2/Makefile | 4 ++--
www/firefox2/PLIST | 12 +++---------
www/seamonkey-gtk1/Makefile | 3 ++-
www/seamonkey-gtk1/PLIST | 8 +++-----
www/seamonkey/Makefile | 3 ++-
www/seamonkey/Makefile.common | 40 +++++++++++++++++++++++++++-------------
www/seamonkey/PLIST | 12 +++---------
www/seamonkey/files/moz-install | 4 ++--
19 files changed, 96 insertions(+), 83 deletions(-)
diffs (truncated from 499 to 300 lines):
diff -r 78d5dabdda14 -r 344f625e2f8d mail/thunderbird-gtk1/Makefile
--- a/mail/thunderbird-gtk1/Makefile Wed Mar 07 21:27:59 2007 +0000
+++ b/mail/thunderbird-gtk1/Makefile Wed Mar 07 21:32:53 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/11/08 13:15:40 ghen Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/07 21:32:53 dmcmahill Exp $
MOZILLA= thunderbird-gtk1
+PKGREVISION= 1
COMMENT= Mozilla mail client using the older GTK1 toolkit
diff -r 78d5dabdda14 -r 344f625e2f8d mail/thunderbird-gtk1/PLIST
--- a/mail/thunderbird-gtk1/PLIST Wed Mar 07 21:27:59 2007 +0000
+++ b/mail/thunderbird-gtk1/PLIST Wed Mar 07 21:32:53 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/03/02 14:12:25 ghen Exp $
+@comment $NetBSD: PLIST,v 1.10 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}/libfreebl3.${SO_SUFFIX}
+@comment libfreebl
lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
@@ -316,7 +316,7 @@
lib/${MOZILLA}/icons/mozicon16.xpm
lib/${MOZILLA}/icons/mozicon50.xpm
lib/${MOZILLA}/init.d/README
-lib/${MOZILLA}/libfreebl3.chk
+@comment libfreebl.chk
lib/${MOZILLA}/libsoftokn3.chk
lib/${MOZILLA}/res/EditorOverride.css
lib/${MOZILLA}/res/arrow.gif
diff -r 78d5dabdda14 -r 344f625e2f8d mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Wed Mar 07 21:27:59 2007 +0000
+++ b/mail/thunderbird/Makefile Wed Mar 07 21:32:53 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2007/03/02 14:12:24 ghen Exp $
+# $NetBSD: Makefile,v 1.25 2007/03/07 21:32:53 dmcmahill Exp $
MOZILLA= thunderbird
COMMENT= Mozilla mail client
+PKGREVISION= 1
MOZILLA_USE_GTK2= # yes
MOZILLA_USE_XFT= YES
diff -r 78d5dabdda14 -r 344f625e2f8d mail/thunderbird/PLIST
--- a/mail/thunderbird/PLIST Wed Mar 07 21:27:59 2007 +0000
+++ b/mail/thunderbird/PLIST Wed Mar 07 21:32:53 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/03/02 14:12:24 ghen Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/03/07 21:32:53 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}/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}
-${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
-${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX}
@comment end DSO
@comment begin DATA
lib/${MOZILLA}/LICENSE.txt
@@ -319,9 +317,7 @@
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
diff -r 78d5dabdda14 -r 344f625e2f8d www/firefox-gtk1/Makefile
--- a/www/firefox-gtk1/Makefile Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox-gtk1/Makefile Wed Mar 07 21:32:53 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/11/08 09:50:15 ghen Exp $
+# $NetBSD: Makefile,v 1.16 2007/03/07 21:32:54 dmcmahill Exp $
MOZILLA= firefox-gtk1
+PKGREVISION= 1
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
diff -r 78d5dabdda14 -r 344f625e2f8d www/firefox-gtk1/PLIST
--- a/www/firefox-gtk1/PLIST Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox-gtk1/PLIST Wed Mar 07 21:32:53 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/02/25 00:43:24 ghen Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/03/07 21:32:54 dmcmahill Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -70,7 +70,7 @@
lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
lib/${MOZILLA}/extensions/inspector%mozilla.org@localhost/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}
@@ -288,7 +288,7 @@
lib/${MOZILLA}/icons/mozicon16.xpm
lib/${MOZILLA}/icons/mozicon50.xpm
lib/${MOZILLA}/init.d/README
-lib/${MOZILLA}/libfreebl3.chk
+@comment libfreebl.chk
lib/${MOZILLA}/libsoftokn3.chk
lib/${MOZILLA}/res/EditorOverride.css
lib/${MOZILLA}/res/arrow.gif
diff -r 78d5dabdda14 -r 344f625e2f8d www/firefox/Makefile
--- a/www/firefox/Makefile Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox/Makefile Wed Mar 07 21:32:53 2007 +0000
@@ -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 -r 78d5dabdda14 -r 344f625e2f8d www/firefox/Makefile.common
--- a/www/firefox/Makefile.common Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox/Makefile.common Wed Mar 07 21:32:53 2007 +0000
@@ -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 @@
.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 @@
${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 -r 78d5dabdda14 -r 344f625e2f8d www/firefox/PLIST
--- a/www/firefox/PLIST Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox/PLIST Wed Mar 07 21:32:53 2007 +0000
@@ -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/libxpconnect.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
lib/${MOZILLA}/extensions/inspector%mozilla.org@localhost/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_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/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
diff -r 78d5dabdda14 -r 344f625e2f8d www/firefox2-gtk1/Makefile
--- a/www/firefox2-gtk1/Makefile Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox2-gtk1/Makefile Wed Mar 07 21:32:53 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/12/21 08:13:17 ghen Exp $
+# $NetBSD: Makefile,v 1.5 2007/03/07 21:32:55 dmcmahill Exp $
MOZILLA= firefox-gtk1
+PKGREVISION= 1
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
.include "../../www/firefox2/Makefile-firefox.common"
diff -r 78d5dabdda14 -r 344f625e2f8d www/firefox2-gtk1/PLIST
--- a/www/firefox2-gtk1/PLIST Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox2-gtk1/PLIST Wed Mar 07 21:32:53 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/02/24 17:26:43 ghen Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/03/07 21:32:55 dmcmahill Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -72,7 +72,7 @@
lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
-lib/${MOZILLA}/libfreebl3.${SO_SUFFIX}
+@comment libfreebl
lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
@@ -320,7 +320,7 @@
lib/${MOZILLA}/icons/mozicon16.xpm
lib/${MOZILLA}/icons/mozicon50.xpm
lib/${MOZILLA}/init.d/README
-lib/${MOZILLA}/libfreebl3.chk
+@comment libfreebl.chk
lib/${MOZILLA}/libsoftokn3.chk
lib/${MOZILLA}/old-homepage-default.properties
lib/${MOZILLA}/res/EditorOverride.css
diff -r 78d5dabdda14 -r 344f625e2f8d www/firefox2/Makefile
--- a/www/firefox2/Makefile Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox2/Makefile Wed Mar 07 21:32:53 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/02/04 18:18:04 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2007/03/07 21:32:55 dmcmahill Exp $
MOZILLA= firefox
-PKG_REVISION= 1
+PKG_REVISION= 2
EXTRACT_SUFX= .tar.bz2
COMMENT= Lightweight gecko-based web browser
diff -r 78d5dabdda14 -r 344f625e2f8d www/firefox2/PLIST
--- a/www/firefox2/PLIST Wed Mar 07 21:27:59 2007 +0000
+++ b/www/firefox2/PLIST Wed Mar 07 21:32:53 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/24 17:26:43 ghen Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/03/07 21:32:55 dmcmahill Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
Home |
Main Index |
Thread Index |
Old Index