(PowerPC asm) comment character (Re: xulrunner affected..

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Other than previously posted change, I needed another
tweak for Assembler syntax (comment char).

Attached is the whole diff to xulrunner 20.0.1
NetBSD/macppc 6.1_RC2, X11_TYPE is not specified, implies native.
---
Makoto Fujiwara
mef%NetBSD.org@localhost
Chiba, Japan, Narita Airport and Disneyland prefecture.

Index: devel/xulrunner/Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/devel/xulrunner/Makefile,v
retrieving revision 1.103
diff -u -r1.103 Makefile
--- devel/xulrunner/Makefile    5 Apr 2013 13:30:17 -0000       1.103
+++ devel/xulrunner/Makefile    16 Apr 2013 06:54:47 -0000
@@ -20,6 +20,8 @@
 PKGCONFIG_OVERRIDE+=   xulrunner/installer/mozilla-nss.pc.in
 PKGCONFIG_OVERRIDE+=   xulrunner/installer/mozilla-plugin.pc.in
 
+DEPENDS+=              libXrandr-[0-9]*:../../x11/libXrandr
+
 CONFIGURE_ARGS+=       --enable-application=xulrunner
 CONFIGURE_ARGS+=       --enable-libxul
 
@@ -27,6 +29,13 @@
 
 MAKE_ENV+=             FREEBL_NO_DEPEND=0
 
+SUBST_CLASSES+=                netbsd-asm
+SUBST_STAGE.netbsd-asm=                post-patch
+SUBST_MESSAGE.netbsd-asm=      Convert comment char from // to ##
+SUBST_FILES.netbsd-asm+=       
mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
+SUBST_FILES.netbsd-asm+=       
mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
+SUBST_SED.netbsd-asm=          -e 's|//|\#\#|'
+
 # workround for link of xulrunner-bin etc.
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/xulrunner 
${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS.SunOS+=                -lm
Index: devel/xulrunner/distinfo
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/devel/xulrunner/distinfo,v
retrieving revision 1.102
diff -u -r1.102 distinfo
--- devel/xulrunner/distinfo    13 Apr 2013 12:44:36 -0000      1.102
+++ devel/xulrunner/distinfo    16 Apr 2013 06:54:47 -0000
@@ -54,7 +54,7 @@
 SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
 SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf
 SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488
-SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe
+SHA1 (patch-xj) = b01d1dc4ca225f273c3f5409737d1e13eaa6667e
 SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3
 SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744
 SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657
@@ -62,3 +62,4 @@
 SHA1 (patch-xo) = aae6107dcfaf731bd3e9962d953fb8701fc5f163
 SHA1 (patch-xpcom_Makefile.in) = e5f77ed56ed4ad26a08a67085e3dfec0e7af3fa6
 SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30
+SHA1 (patch-xpcom_io_nsMultiplexInputStream.cpp) = 
bd494ab0c432f0118ca8780e6db3f8d7051bd140
Index: devel/xulrunner/patches/patch-xj
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/devel/xulrunner/patches/patch-xj,v
retrieving revision 1.4
diff -u -r1.4 patch-xj
--- devel/xulrunner/patches/patch-xj    10 Jan 2013 15:01:31 -0000      1.4
+++ devel/xulrunner/patches/patch-xj    16 Apr 2013 06:54:47 -0000
@@ -12,14 +12,6 @@
  
  // The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral
  // parameters and the first 8 floating point parameters in registers
-@@ -36,7 +37,6 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- {
-     nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-     nsXPTCMiniVariant* dispatchParams = NULL;
--    nsIInterfaceInfo* iface_info = NULL;
-     const nsXPTMethodInfo* info;
-     uint32_t paramCount;
-     uint32_t i;
 @@ -44,11 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
  
      NS_ASSERTION(self,"no self");
Index: devel/xulrunner/patches/patch-xpcom_io_nsMultiplexInputStream.cpp
===================================================================
RCS file: devel/xulrunner/patches/patch-xpcom_io_nsMultiplexInputStream.cpp
diff -N devel/xulrunner/patches/patch-xpcom_io_nsMultiplexInputStream.cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ devel/xulrunner/patches/patch-xpcom_io_nsMultiplexInputStream.cpp   16 Apr 
2013 06:54:47 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+PR/47722
+
+--- xpcom/io/nsMultiplexInputStream.cpp.orig   2013-04-10 12:03:01.000000000 
+0900
++++ xpcom/io/nsMultiplexInputStream.cpp        2013-04-16 08:01:29.000000000 
+0900
+@@ -529,7 +529,7 @@ nsMultiplexInputStream::Seek(int32_t aWh
+                     rv = stream->Tell(&avail);
+                     NS_ENSURE_SUCCESS(rv, rv);
+ 
+-                    int64_t newPos = streamPos + NS_MIN(avail, 
std::abs(remaining));
++                    int64_t newPos = streamPos + NS_MIN(avail, 
(int64_t)std::abs(remaining));
+ 
+                     rv = stream->Seek(NS_SEEK_END, -newPos);
+                     NS_ENSURE_SUCCESS(rv, rv);