[52521] trunk/dports/devel/xulrunner-devel

[jeremyhu at macports.org]

Revision: 52521
          http://trac.macports.org/changeset/52521
Author:   jeremyhu at macports.org
Date:     2009-06-17 23:41:35 -0700 (Wed, 17 Jun 2009)
Log Message:
-----------
xulrunner-devel: Version bump 1.9.1rc1

Modified Paths:
--------------
    trunk/dports/devel/xulrunner-devel/Portfile
    trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff

Removed Paths:
-------------
    trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff

Modified: trunk/dports/devel/xulrunner-devel/Portfile
===================================================================
--- trunk/dports/devel/xulrunner-devel/Portfile	2009-06-18 05:32:34 UTC (rev 52520)
+++ trunk/dports/devel/xulrunner-devel/Portfile	2009-06-18 06:41:35 UTC (rev 52521)
@@ -6,8 +6,8 @@
 name            xulrunner-devel
 set pkg_name	xulrunner
 categories      devel
-version		1.9.1b4
-set ff_version         3.5b4
+version		1.9.1rc1
+set ff_version         3.5rc1
 revision        0
 platforms       darwin
 maintainers     jeremyhu openmaintainer
@@ -31,9 +31,9 @@
 distname        firefox-${ff_version}-source
 use_bzip2       yes
 
-checksums           md5     ff6bf463300cb56bcf750973b2af3d80 \
-                    sha1    33bb5b254c3a772d9195c5128a2c569a9cbb8ccd \
-                    rmd160  d28d545f533f0f3b6b7e6e09813768b2996b3d76
+checksums           md5     6e9b5fa844f5ddf80b1ae819b43b52ad \
+                    sha1    12ec8dacace216b3d95e9143cfae3ab92f70166e \
+                    rmd160  1ef85ad5cb25d49c1f741ead7912a0e4d118ff63
 
 worksrcdir      mozilla-1.9.1
 
@@ -155,10 +155,9 @@
 # #487367 (browser-xulrunner-stub, in mozilla-1.9.2)
 # #484457 (gdk-Status, in mozilla-1.9.2)
 # #487371 (xulrunner-app-Makefile, in mozilla-1.9.2)
-# #492117 (patch-pthread)
 # #492138 #490995 (netwerk-wifi-src-Makefile, in mozilla-1.9.2)
 # Previous firefox-x11 port, not sure if still needed, but safe to keep: patch-dylib_file.diff
-patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff  patch-pthread.diff icon-Makefile.patch nsFilePicker.patch plugins.patch sydneyaudio.patch browser-xulrunner-stub.patch gdk-Status.patch xulrunner-app-Makefile.patch netwerk-wifi-src-Makefile.patch
+patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff icon-Makefile.patch nsFilePicker.patch plugins.patch sydneyaudio.patch browser-xulrunner-stub.patch gdk-Status.patch xulrunner-app-Makefile.patch netwerk-wifi-src-Makefile.patch
 
 post-patch {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857

Modified: trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff	2009-06-18 05:32:34 UTC (rev 52520)
+++ trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff	2009-06-18 06:41:35 UTC (rev 52521)
@@ -1,6 +1,6 @@
---- config/config.mk.orig	2009-05-16 21:01:59.000000000 -0700
-+++ config/config.mk	2009-05-16 21:11:09.000000000 -0700
-@@ -704,6 +704,13 @@ XCODE_PRODUCT_DIR = build/$(BUILDSTYLE)
+--- config/config.mk.orig	2008-08-14 03:00:34.000000000 -0700
++++ config/config.mk	2009-05-25 20:11:09.000000000 -0700
+@@ -704,6 +704,12 @@
  else
  XCODE_PRODUCT_DIR = build
  endif # HAS_XCODE_2_1=1
@@ -8,9 +8,8 @@
 +ifneq (,$(findstring -lplds4,$(EXTRA_DSO_LDOPTS)))
 +EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSPR_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
 +endif
-+ifneq (,$(findstring -lmozjs,$(EXTRA_DSO_LDOPTS)))
++EXTRA_DSO_LDOPTS += -dylib_file @executable_path/libxul.dylib:$(DIST)/bin/libxul.dylib
 +EXTRA_DSO_LDOPTS += -dylib_file @executable_path/libmozjs.dylib:$(DIST)/bin/libmozjs.dylib
-+endif
  endif # OS_ARCH=Darwin
  
  

Deleted: trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff	2009-06-18 05:32:34 UTC (rev 52520)
+++ trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff	2009-06-18 06:41:35 UTC (rev 52521)
@@ -1,11 +0,0 @@
---- nsprpub/pr/include/md/_pth.h.orig	2005-07-21 20:22:53.000000000 +0200
-+++ nsprpub/pr/include/md/_pth.h	2007-11-05 09:01:53.000000000 +0100
-@@ -98,7 +98,7 @@
- #else
- #define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
- #endif
--#if defined(DARWIN)
-+#if defined(DARWIN) && !defined(__DARWIN_UNIX03)
- #define _PT_PTHREAD_CONDATTR_INIT(x)      0
- #else
- #define _PT_PTHREAD_CONDATTR_INIT         pthread_condattr_init
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090617/94ea8a8b/attachment.html>