From c34e722bd03d65364a23d3dc55330afa9e5f37d0 Mon Sep 17 00:00:00 2001 From: wilfried Date: Wed, 16 Mar 2005 08:59:04 +0000 Subject: [PATCH] Tentative step for extensions, at least firefox stops whining. From jamesw at bsdhosting.co.za, cleanup by me. ok pval@, naddy@ --- www/mozilla-firefox/Makefile | 11 +++++++++-- www/mozilla-firefox/files/Extensions.rdf | 24 ++++++++++++++++++++++++ www/mozilla-firefox/pkg/DEINSTALL | 7 +------ www/mozilla-firefox/pkg/INSTALL | 9 +-------- www/mozilla-firefox/pkg/PLIST | 7 ++++++- 5 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 www/mozilla-firefox/files/Extensions.rdf diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile index c9c74ac4689..e0bf68bc2d9 100644 --- a/www/mozilla-firefox/Makefile +++ b/www/mozilla-firefox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2005/03/02 19:30:18 naddy Exp $ +# $OpenBSD: Makefile,v 1.21 2005/03/16 08:59:04 wilfried Exp $ ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64 @@ -6,7 +6,7 @@ COMMENT= "redesign of Mozilla's browser component" VER= 1.0.1 DISTNAME= mozilla -PKGNAME= mozilla-firefox-${VER} +PKGNAME= mozilla-firefox-${VER}p1 CATEGORIES= www @@ -78,6 +78,7 @@ MAKE_ENV= MOZ_PHOENIX=1 \ MOB= ${WRKSRC}/dist/bin MOZ= ${PREFIX}/mozilla-firefox +MAGIC= {972ce4c6-7e08-4474-a285-3208198ce6fd} post-extract: @cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/ @@ -105,4 +106,10 @@ do-install: ${INSTALL_PROGRAM} ${MOB}/regchrome ${MOB}/regxpcom ${MOB}/firefox-bin ${MOZ} ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin + ${INSTALL_DATA_DIR} ${MOZ}/extensions + ${INSTALL_DATA} ${FILESDIR}/Extensions.rdf ${MOZ}/extensions/ + ${INSTALL_DATA_DIR} ${MOZ}/extensions/${MAGIC} + ${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/installed-extensions.txt ${MOZ}/extensions/installed-extensions-processed.txt + ${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/${MAGIC}/install.rdf ${MOZ}/extensions/${MAGIC}/ + .include diff --git a/www/mozilla-firefox/files/Extensions.rdf b/www/mozilla-firefox/files/Extensions.rdf new file mode 100644 index 00000000000..d45eae695e9 --- /dev/null +++ b/www/mozilla-firefox/files/Extensions.rdf @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/www/mozilla-firefox/pkg/DEINSTALL b/www/mozilla-firefox/pkg/DEINSTALL index 2f4983136f2..6bca1b60427 100644 --- a/www/mozilla-firefox/pkg/DEINSTALL +++ b/www/mozilla-firefox/pkg/DEINSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: DEINSTALL,v 1.4 2005/03/02 19:30:18 naddy Exp $ +# $OpenBSD: DEINSTALL,v 1.5 2005/03/16 08:59:04 wilfried Exp $ # # De-installation setup of mozilla-firefox @@ -25,11 +25,6 @@ case $2 in rm -f compreg.dat xpti.dat cd ${MOZ}/chrome rm -rf chrome.rdf overlayinfo - cd ${MOZ} -# rm -f .autoreg components.ini install.log registry -# rm -f extensions/Extensions.rdf extensions/installed-extensions-processed.txt -# rm -rf extensions/{* -# rmdir extensions ;; *) echo "usage: $0 distname DEINSTALL" >&2 diff --git a/www/mozilla-firefox/pkg/INSTALL b/www/mozilla-firefox/pkg/INSTALL index 02f11a0e598..58fb083aeaa 100644 --- a/www/mozilla-firefox/pkg/INSTALL +++ b/www/mozilla-firefox/pkg/INSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: INSTALL,v 1.3 2005/03/02 19:30:18 naddy Exp $ +# $OpenBSD: INSTALL,v 1.4 2005/03/16 08:59:04 wilfried Exp $ # # Pre/post-installation setup of mozilla @@ -29,13 +29,6 @@ case $2 in env HOME=/tmp LD_LIBRARY_PATH=${MOZ} ./regxpcom env HOME=/tmp LD_LIBRARY_PATH=${MOZ} ./regchrome rm -rf /tmp/.mozilla - -# mkdir -m 777 -p extensions -# touch .autoreg components.ini install.log registry -# chmod 666 .autoreg components.ini install.log registry -# -# cd ${MOZ}/chrome -# chmod 666 installed-chrome.txt ;; *) echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 diff --git a/www/mozilla-firefox/pkg/PLIST b/www/mozilla-firefox/pkg/PLIST index d821e79fc9e..8ead3b23c7f 100644 --- a/www/mozilla-firefox/pkg/PLIST +++ b/www/mozilla-firefox/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/11/26 18:29:15 pvalchev Exp $ +@comment $OpenBSD: PLIST,v 1.5 2005/03/16 08:59:04 wilfried Exp $ @conflict mozilla-firebird-* %%SHARED%% bin/firefox @@ -348,6 +348,11 @@ mozilla-firefox/defaults/profile/localstore.rdf mozilla-firefox/defaults/profile/mimeTypes.rdf mozilla-firefox/defaults/profile/prefs.js mozilla-firefox/defaults/profile/search.rdf +mozilla-firefox/extensions/ +mozilla-firefox/extensions/Extensions.rdf +mozilla-firefox/extensions/installed-extensions-processed.txt +mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/ +mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf mozilla-firefox/firefox-bin mozilla-firefox/firefox-config mozilla-firefox/greprefs/