modify patches to work on FreeBSD, too

4 files changed, 19 insertions, 13 deletions

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 718ab13b45a..371b06113c9 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2009/09/20 10:58:00 tnn Exp $
+$NetBSD: distinfo,v 1.11 2009/09/20 15:30:54 sno Exp $
 
 SHA1 (xulrunner-1.9.1.3-source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb
 RMD160 (xulrunner-1.9.1.3-source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422
@@ -18,8 +18,8 @@ SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57
 SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
 SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
 SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c
-SHA1 (patch-ap) = 2044c8f0b293984755864b2ca5d45e4bb0407646
-SHA1 (patch-aq) = ee2f7917fbf102ce6d20f1467702815b062f82e7
+SHA1 (patch-ap) = dbcf27b23fec35ea838d281a97c7aed94739c8b5
+SHA1 (patch-aq) = f4e9198885b0327e10bebff64bd6801919123b5f
 SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
 SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41
 SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
@@ -39,7 +39,7 @@ SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
 SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
 SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0
 SHA1 (patch-mn) = 17641f46ecf1019f3cc02583a22baa9f9a327d1f
-SHA1 (patch-mp) = 33128f10b6146419bcebd85f7e6e7fa72e770be1
+SHA1 (patch-mp) = 948786b0b9f781e820dff768f0892897ec42372b
 SHA1 (patch-na) = 10a09ddb5de67c3cc2f605c75de7ac2e30a92ae7
 SHA1 (patch-nb) = 6b1719219df7cdd7bf5335fcf7f48567a37ffa87
 SHA1 (patch-nc) = f2a3cc803a114702e856947c25fd79baa85b0e26
diff --git a/devel/xulrunner/patches/patch-ap b/devel/xulrunner/patches/patch-ap
index 2b03806a7c6..c12a0c03d19 100644
--- a/devel/xulrunner/patches/patch-ap
+++ b/devel/xulrunner/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2009/09/13 08:01:04 tnn Exp $
+$NetBSD: patch-ap,v 1.3 2009/09/20 15:30:54 sno Exp $
 
 --- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-08-24 17:52:50.000000000 +0200
 +++ media/liboggz/include/oggz/oggz_off_t_generated.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ap,v 1.2 2009/09/13 08:01:04 tnn Exp $
  #include <sys/types.h>
  
 -#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
  typedef off_t oggz_off_t;
  #else
  typedef loff_t oggz_off_t;
diff --git a/devel/xulrunner/patches/patch-aq b/devel/xulrunner/patches/patch-aq
index 41a0f0979ee..4627732d3c9 100644
--- a/devel/xulrunner/patches/patch-aq
+++ b/devel/xulrunner/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-aq,v 1.2 2009/09/20 15:30:54 sno Exp $
 
 --- media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-06-29 18:15:03.000000000 +0200
 +++ media/liboggplay/src/liboggplay/std_semaphore.h
@@ -7,7 +7,7 @@ $NetBSD: patch-aq,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
   */
  
 -#if defined(linux) || defined(SOLARIS)
-+#if defined(linux) || defined(SOLARIS) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(linux) || defined(SOLARIS) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
  #include <semaphore.h>
  #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
  #define SEM_SIGNAL(p)   sem_post(&(p))
diff --git a/devel/xulrunner/patches/patch-mp b/devel/xulrunner/patches/patch-mp
index 4f37486d58f..403afbee112 100644
--- a/devel/xulrunner/patches/patch-mp
+++ b/devel/xulrunner/patches/patch-mp
@@ -1,10 +1,10 @@
-$NetBSD: patch-mp,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-mp,v 1.2 2009/09/20 15:30:54 sno Exp $
 
-Use Sun audio on NetBSD and OSS on DragonFlyBSD.
+Use Sun audio on NetBSD and OSS on DragonFlyBSD and FreeBSD.
 
---- media/libsydneyaudio/src/Makefile.in.orig	2009-06-29 18:15:03.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in
-@@ -65,12 +65,18 @@ CSRCS		= \
+--- media/libsydneyaudio/src/Makefile.in.orig	2009-08-24 17:52:50.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in	2009-09-20 16:12:16.000000000 +0200
+@@ -71,12 +71,24 @@
  OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
  endif
  
@@ -21,6 +21,12 @@ Use Sun audio on NetBSD and OSS on DragonFlyBSD.
 +		$(NULL)
 +endif
 +
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS		= \
++		sydney_audio_oss.c \
++		$(NULL)
++endif
++
  ifeq ($(OS_ARCH),WINNT)
  OS_LIBS += winmm.lib
  endif