diff options
author | dmcmahill <dmcmahill@pkgsrc.org> | 2007-03-07 21:32:53 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill@pkgsrc.org> | 2007-03-07 21:32:53 +0000 |
commit | e31abb208c10129c6428ac3df7972daa594bc896 (patch) | |
tree | b82b7969582e56a727ad050ec4b6673c280d6202 /www/seamonkey | |
parent | 53cf03e2a63302e2e3c941f84290ed88d7ca895f (diff) | |
download | pkgsrc-e31abb208c10129c6428ac3df7972daa594bc896.tar.gz |
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 (limited to 'www/seamonkey')
-rw-r--r-- | www/seamonkey/Makefile | 3 | ||||
-rw-r--r-- | www/seamonkey/Makefile.common | 40 | ||||
-rw-r--r-- | www/seamonkey/PLIST | 12 | ||||
-rwxr-xr-x | www/seamonkey/files/moz-install | 4 |
4 files changed, 34 insertions, 25 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 09bca5d31ef..c225ef998c6 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2007/03/05 11:46:21 ghen Exp $ +# $NetBSD: Makefile,v 1.20 2007/03/07 21:32:55 dmcmahill Exp $ MOZILLA= seamonkey +PKGREVISION= 1 COMMENT= Full featured gecko-based browser diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common index 84de3c263c6..63ee6818d13 100644 --- a/www/seamonkey/Makefile.common +++ b/www/seamonkey/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2007/02/20 16:02:11 dmcmahill Exp $ +# $NetBSD: Makefile.common,v 1.20 2007/03/07 21:32:56 dmcmahill Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= seamonkey-${MOZ_DIST_VER}.source @@ -120,18 +120,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 @@ -187,6 +175,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} ${SH} ${FILESDIR:Q}/moz-install diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST index ab8428b1b31..19daa3c8938 100644 --- a/www/seamonkey/PLIST +++ b/www/seamonkey/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/03/05 11:46:21 ghen Exp $ +@comment $NetBSD: PLIST,v 1.11 2007/03/07 21:32:56 dmcmahill Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -96,10 +96,7 @@ lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX} lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX} lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX} lib/${MOZILLA}/components/libxremoteservice.${SO_SUFFIX} -${NOT_SUNOSLIB}lib/${MOZILLA}/libfreebl3.${SO_SUFFIX} -${SUNOSLIB}lib/${MOZILLA}/libfreebl_32fpu_3.${SO_SUFFIX} -${SUNOSLIB}lib/${MOZILLA}/libfreebl_32int_3.${SO_SUFFIX} -${SUNOSLIB}lib/${MOZILLA}/libfreebl_32int64_3.${SO_SUFFIX} +@comment libfreebl lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX} lib/${MOZILLA}/libgkgfx.${SO_SUFFIX} lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX} @@ -412,10 +409,7 @@ lib/${MOZILLA}/greprefs/security-prefs.js lib/${MOZILLA}/greprefs/xpinstall.js lib/${MOZILLA}/init.d/README lib/${MOZILLA}/install.rdf -${NOT_SUNOSLIB}lib/${MOZILLA}/libfreebl3.chk -${SUNOSLIB}lib/${MOZILLA}/libfreebl_32fpu_3.chk -${SUNOSLIB}lib/${MOZILLA}/libfreebl_32int_3.chk -${SUNOSLIB}lib/${MOZILLA}/libfreebl_32int64_3.chk +@comment libfreebl.chk lib/${MOZILLA}/libsoftokn3.chk lib/${MOZILLA}/res/EditorOverride.css lib/${MOZILLA}/res/arrow.gif diff --git a/www/seamonkey/files/moz-install b/www/seamonkey/files/moz-install index 160c6687a67..40fec3f29e6 100755 --- a/www/seamonkey/files/moz-install +++ b/www/seamonkey/files/moz-install @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: moz-install,v 1.4 2007/02/05 13:48:30 dmcmahill Exp $ +# $NetBSD: moz-install,v 1.5 2007/03/07 21:32:56 dmcmahill Exp $ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA} @@ -14,7 +14,7 @@ ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${MOZILLA} TMP_PLIST=${WRKDIR}/TMP_PLIST.$$ trap "${RM} -f ${TMP_PLIST}" 1 2 15 -${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/\${MOZILLA_BIN}/${MOZILLA_BIN}/g" -e "s/\${SUNOSLIB}/${SUNOSLIB}/" -e "s/\${NOT_SUNOSLIB}/${NOT_SUNOSLIB}/" < ${PLIST_SRC} > ${TMP_PLIST} +${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/\${MOZILLA_BIN}/${MOZILLA_BIN}/g" < ${PLIST_SRC} > ${TMP_PLIST} # make directories for i in `${SED} -n -e '/^@comment begin DIRS$/,/^@comment end DIRS$/p' ${TMP_PLIST} | ${EGREP} ^@dirrm | ${SED} -e 's/^@dirrm//'` ; do |