From 78aeb076bf81581d0319efe446b3dea4f08cd9e0 Mon Sep 17 00:00:00 2001 From: martynas Date: Mon, 21 Jul 2008 19:19:06 +0000 Subject: [PATCH] adapt for other mozilla projects claudio's diff of firefox to honor MOZ_PLUGIN_PATH. bump pkgnames sure claudio@ --- devel/xulrunner/Makefile | 6 +++--- devel/xulrunner/patches/patch-xulrunner_app_mozilla_in | 4 ++-- mail/mozilla-thunderbird/Makefile | 4 ++-- mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in | 4 ++-- www/seamonkey/Makefile | 4 ++-- www/seamonkey/patches/patch-xpfe_bootstrap_mozilla_in | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index 8079091e1c5..e3a036dcb05 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2008/07/17 16:50:20 martynas Exp $ +# $OpenBSD: Makefile,v 1.25 2008/07/21 19:19:06 martynas Exp $ ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 @@ -8,8 +8,8 @@ COMMENT-devel= devel files for Gecko VER= 1.8.1.16 DISTNAME= mozilla PKGNAME= xulrunner-${VER} -PKGNAME-main= xulrunner-${VER} -PKGNAME-devel= xulrunner-devel-${VER} +PKGNAME-main= xulrunner-${VER}p0 +PKGNAME-devel= xulrunner-devel-${VER}p0 SO_VERSION= 2.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. diff --git a/devel/xulrunner/patches/patch-xulrunner_app_mozilla_in b/devel/xulrunner/patches/patch-xulrunner_app_mozilla_in index a64e2251585..15a358403ab 100644 --- a/devel/xulrunner/patches/patch-xulrunner_app_mozilla_in +++ b/devel/xulrunner/patches/patch-xulrunner_app_mozilla_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-xulrunner_app_mozilla_in,v 1.3 2008/02/13 20:52:28 martynas Exp $ +$OpenBSD: patch-xulrunner_app_mozilla_in,v 1.4 2008/07/21 19:19:06 martynas Exp $ --- xulrunner/app/mozilla.in.orig Fri Jan 11 05:20:02 2008 +++ xulrunner/app/mozilla.in Mon Feb 11 00:11:31 2008 @@ -93,6 +93,7 @@ moz_pis_startstop_scripts() #set -x moz_libdir=%MOZAPPDIR% -+MOZ_PLUGIN_PATH=_LOCALBASE_/lib/mozilla-plugins ++MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=_LOCALBASE_/lib/mozilla-plugins} MRE_HOME=%MREDIR% # Use run-mozilla.sh in the current dir if it exists diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile index f156ff011bf..9b772b4f9bc 100644 --- a/mail/mozilla-thunderbird/Makefile +++ b/mail/mozilla-thunderbird/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.69 2008/05/06 20:35:48 martynas Exp $ +# $OpenBSD: Makefile,v 1.70 2008/07/21 19:19:06 martynas Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 @@ -7,7 +7,7 @@ COMMENT= redesign of Mozilla's mail component VER= 2.0.0.14 DISTNAME= mozilla -PKGNAME= mozilla-thunderbird-${VER} +PKGNAME= mozilla-thunderbird-${VER}p0 SO_VERSION= 13.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. Whenever PKGNAME gets diff --git a/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in b/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in index 261a4f26e9c..1de39e4dbff 100644 --- a/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in +++ b/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-mail_app_mozilla_in,v 1.9 2008/02/29 21:49:48 bernd Exp $ +$OpenBSD: patch-mail_app_mozilla_in,v 1.10 2008/07/21 19:19:06 martynas Exp $ --- mail/app/mozilla.in.orig Fri Jan 11 04:20:02 2008 +++ mail/app/mozilla.in Wed Feb 27 12:37:51 2008 @@ -92,7 +92,13 @@ moz_pis_startstop_scripts() @@ -11,7 +11,7 @@ $OpenBSD: patch-mail_app_mozilla_in,v 1.9 2008/02/29 21:49:48 bernd Exp $ +fi + moz_libdir=%MOZAPPDIR% -+MOZ_PLUGIN_PATH=_LOCALBASE_/lib/mozilla-plugins ++MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=_LOCALBASE_/lib/mozilla-plugins} MRE_HOME=%MREDIR% # Use run-mozilla.sh in the current dir if it exists diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index dffa272f715..5e00c797c82 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2008/07/17 16:49:33 martynas Exp $ +# $OpenBSD: Makefile,v 1.24 2008/07/21 19:19:06 martynas Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64 @@ -7,7 +7,7 @@ COMMENT= integrated mozilla application suite VER= 1.1.11 DISTNAME= seamonkey-${VER}.source -PKGNAME= seamonkey-${VER} +PKGNAME= seamonkey-${VER}p0 SO_VERSION= 10.0 # NOTE: Must bump minor version if any shlib's are removed from the diff --git a/www/seamonkey/patches/patch-xpfe_bootstrap_mozilla_in b/www/seamonkey/patches/patch-xpfe_bootstrap_mozilla_in index 25e0ed351b8..7093cd83d7c 100644 --- a/www/seamonkey/patches/patch-xpfe_bootstrap_mozilla_in +++ b/www/seamonkey/patches/patch-xpfe_bootstrap_mozilla_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-xpfe_bootstrap_mozilla_in,v 1.4 2008/02/22 12:55:49 martynas Exp $ +$OpenBSD: patch-xpfe_bootstrap_mozilla_in,v 1.5 2008/07/21 19:19:06 martynas Exp $ --- xpfe/bootstrap/mozilla.in.orig Tue Jan 29 21:31:44 2008 +++ xpfe/bootstrap/mozilla.in Wed Feb 20 23:18:05 2008 @@ -92,7 +92,13 @@ moz_pis_startstop_scripts() @@ -11,7 +11,7 @@ $OpenBSD: patch-xpfe_bootstrap_mozilla_in,v 1.4 2008/02/22 12:55:49 martynas Exp +fi + moz_libdir=%MOZAPPDIR% -+MOZ_PLUGIN_PATH=_LOCALBASE_/lib/mozilla-plugins ++MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=_LOCALBASE_/lib/mozilla-plugins} MRE_HOME=%MREDIR% # Use run-mozilla.sh in the current dir if it exists