cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ddo not even try to pick up&mix native nspr&nss; unbreaks if local

Browse Source 
nss&nspr is presentt
cleanup xpconnect a bit
bump package name to p2
This commit is contained in:
martynas 2009-06-23 17:55:57 +00:00
parent 8bc04e2bfe
commit 26431ebb0d
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/firefox35/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2009/06/21 20:46:38 martynas Exp $
# $OpenBSD: Makefile,v 1.10 2009/06/23 17:55:57 martynas Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -7,7 +7,7 @@ COMMENT= redesign of Mozilla's browser component
VER= 3.5rc2
DISTNAME= mozilla-1.9.1
PKGNAME= firefox35-${VER}p1
PKGNAME= firefox35-${VER}p2
SO_VERSION= 21.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.

13
www/firefox35/patches/patch-configure_in
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-configure_in,v 1.2 2009/06/21 13:26:19 martynas Exp $
$OpenBSD: patch-configure_in,v 1.3 2009/06/23 17:55:57 martynas Exp $
--- configure.in.orig Wed Jun 17 07:21:41 2009
+++ configure.in Sat Jun 20 22:09:10 2009
+++ configure.in Tue Jun 23 13:33:05 2009
@@ -1000,7 +1000,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -L$(LIBXUL_DIST)/bin'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -2342,7 +2342,7 @@ case "$target" in
;;

13
www/firefox35/patches/patch-js_src_configure_in
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-js_src_configure_in,v 1.1 2009/06/21 11:36:11 martynas Exp $
$OpenBSD: patch-js_src_configure_in,v 1.2 2009/06/23 17:55:57 martynas Exp $
--- js/src/configure.in.orig Wed Jun 17 07:21:47 2009
+++ js/src/configure.in Sun Jun 21 13:22:13 2009
+++ js/src/configure.in Tue Jun 23 13:33:37 2009
@@ -906,7 +906,7 @@ HOST_AR='$(AR)'
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib -L$(LIBXUL_DIST)/bin'
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
@@ -2135,7 +2135,7 @@ case "$target" in
;;

6
www/firefox35/patches/patch-js_src_xpconnect_shell_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.1.1.1 2009/06/21 01:31:26 martynas Exp $
$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.2 2009/06/23 17:55:57 martynas Exp $
--- js/src/xpconnect/shell/Makefile.in.orig Wed Jun 17 07:21:48 2009
+++ js/src/xpconnect/shell/Makefile.in Sat Jun 20 22:09:10 2009
@@ -60,6 +60,8 @@ CMMSRCS += xpcshellMacUtils.mm
endif
LIBS = \
+ -Wl,-rpath-link,_LOCALBASE_/lib/ \
+ -Wl,-rpath-link,_X11BASE_/lib/ \
+ -Wl,-rpath-link,_LOCALBASE_/lib \
+ -Wl,-rpath-link,_X11BASE_/lib \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(LIBXUL_LIBS) \
$(MOZ_JS_LIBS) \