diff options
| author | ahze <ahze@FreeBSD.org> | 2005-01-12 20:11:52 +0000 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2005-01-12 20:11:52 +0000 |
| commit | b48bbc91be0636ade987ad68464863477b92242e (patch) | |
| tree | f61dd138827c4392bd97b58a21e9d81164437b2b | |
| parent | 5a6042efcacf3d43417b14cc27afaff625be9fb5 (diff) | |
| download | FreeBSD-ports-b48bbc91be0636ade987ad68464863477b92242e.zip FreeBSD-ports-b48bbc91be0636ade987ad68464863477b92242e.tar.gz | |
Fix patch so it works.
| -rw-r--r-- | www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in | 44 | ||||
| -rw-r--r-- | www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in | 44 |
2 files changed, 16 insertions, 72 deletions
diff --git a/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 812e8b5..c3eeaa2 100644 --- a/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,44 +1,16 @@ -$FreeBSD: /tmp/pcvs/ports/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.1 2005-01-12 08:52:44 ahze Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Wed Jan 12 15:11:40 2005 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Wed Jan 12 15:11:40 2005 +@@ -52,6 +52,9 @@ + ifeq (amd64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp endif +ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp ++CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp +endif endif # # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ +@@ -313,6 +316,15 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s @@ -53,4 +25,4 @@ $FreeBSD: /tmp/pcvs/ports/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md- +endif endif # - # Solaris/SPARC + # FreeBSD/SPARC64 diff --git a/www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 97941f5..c3eeaa2 100644 --- a/www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,44 +1,16 @@ -$FreeBSD: /tmp/pcvs/ports/www/nvu/files/Attic/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.1 2005-01-12 08:52:44 ahze Exp $ - ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Wed Jan 12 15:11:40 2005 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Wed Jan 12 15:11:40 2005 +@@ -52,6 +52,9 @@ + ifeq (amd64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp endif +ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp ++CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp +endif endif # # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ +@@ -313,6 +316,15 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s @@ -53,4 +25,4 @@ $FreeBSD: /tmp/pcvs/ports/www/nvu/files/Attic/patch-xpcom-reflect-xptcall-src-md +endif endif # - # Solaris/SPARC + # FreeBSD/SPARC64 |
