aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice.org-1.0
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-06-02 22:53:54 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-06-02 22:53:54 +0000
commit6db8acda597c9edb4bf120aa84bf1ba7f53858bf (patch)
tree2b722a33f9050d8c089eb0b383b0eddecb9ecc11 /editors/openoffice.org-1.0
parentef19824b84f104fe9029f1297ff253946b95504c (diff)
downloadports-6db8acda597c9edb4bf120aa84bf1ba7f53858bf.tar.gz
ports-6db8acda597c9edb4bf120aa84bf1ba7f53858bf.zip
Notes
Diffstat (limited to 'editors/openoffice.org-1.0')
-rw-r--r--editors/openoffice.org-1.0/files/patch-product+util+makefile.mk22
-rw-r--r--editors/openoffice.org-1.0/files/patch-product::util::makefile.mk22
2 files changed, 34 insertions, 10 deletions
diff --git a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
index 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
-+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
+--- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002
++++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
#---------------------------------------------------------
# special targets for linux gcc3
@@ -56,12 +56,24 @@
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ -rm -f $@
+- +ln -s libstdc++.so.3.0.1 $@
++ +ln -fs libstdc++.so.3.0.1 $@
+
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ -rm -f $@
+@@ -452,7 +467,11 @@
+
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -fs libgcc_s.so.1 $@
+- +ln -s libgcc_s.so.1 $@
++ +ln -fs libgcc_s.so.1 $@
++
+.ENDIF
+.ENDIF
++
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk b/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk
index 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig Sun Jun 2 22:47:14 2002
-+++ ../product/util/makefile.mk Sun Jun 2 23:32:44 2002
+--- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002
++++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002
@@ -108,12 +108,20 @@
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
.ELIF "$(OS)"=="NETBSD"
###########
# NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
#---------------------------------------------------------
# special targets for linux gcc3
@@ -56,12 +56,24 @@
$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-rm -f $@
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ -rm -f $@
+- +ln -s libstdc++.so.3.0.1 $@
++ +ln -fs libstdc++.so.3.0.1 $@
+
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ -rm -f $@
+@@ -452,7 +467,11 @@
+
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
- +ln -fs libgcc_s.so.1 $@
+- +ln -s libgcc_s.so.1 $@
++ +ln -fs libgcc_s.so.1 $@
++
+.ENDIF
+.ENDIF
++
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)