cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use the jdk server vm on amd64 because it does not have a client

Browse Source 
- re-enable the library check for bean now that the server vm is used
- fix an if statement (OPEBBSD->OPENBSD)

jdk problem noticed by kurt@
This commit is contained in:
robert 2006-11-09 08:31:29 +00:00
parent a2beb10ca4
commit 4c8b6690b5
4 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/openoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2006/11/08 09:34:03 robert Exp $
# $OpenBSD: Makefile,v 1.23 2006/11/09 08:31:29 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -9,9 +9,9 @@ COMMENT-java= "optional integration of OpenOffice java features"
VERSION= 2.0.4
DISTNAME= OOo_${VERSION}_src
WRKDIST= ${WRKDIR}/OOD680_m5
PKGNAME= openoffice-${VERSION}p12
PKGNAME-kde= openoffice-kde-${VERSION}p12
PKGNAME-java= openoffice-java-${VERSION}p12
PKGNAME= openoffice-${VERSION}p13
PKGNAME-kde= openoffice-kde-${VERSION}p13
PKGNAME-java= openoffice-java-${VERSION}p13
CATEGORIES= editors productivity
SHARED_LIBS= icudata 26.0 \

14
editors/openoffice/patches/patch-bean_native_unix_makefile_mk
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-bean_native_unix_makefile_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
--- bean/native/unix/makefile.mk.orig.port Sun Nov 5 01:21:40 2006
+++ bean/native/unix/makefile.mk Sun Nov 5 01:24:26 2006
@@ -38,6 +38,10 @@
NO_SHL1DESCRIPTION=TRUE
+.IF "$(OS)"=="OPENBSD"
+SHL1NOCHECK=TRUE
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk

4
editors/openoffice/patches/patch-config_office_set_soenv_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-config_office_set_soenv_in,v 1.6 2006/11/08 09:34:03 robert Exp $
$OpenBSD: patch-config_office_set_soenv_in,v 1.7 2006/11/09 08:31:29 robert Exp $
--- config_office/set_soenv.in.orig.port Mon Aug 28 10:37:34 2006
+++ config_office/set_soenv.in Fri Nov 3 18:29:03 2006
@@ -368,6 +368,46 @@
@ -25,7 +25,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.6 2006/11/08 09:34:03 robert Exp
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }

4
editors/openoffice/patches/patch-pyuno_source_module_makefile_mk
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-pyuno_source_module_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
$OpenBSD: patch-pyuno_source_module_makefile_mk,v 1.3 2006/11/09 08:31:29 robert Exp $
--- pyuno/source/module/makefile.mk.orig.port Tue Jan 31 13:18:25 2006
+++ pyuno/source/module/makefile.mk Fri Aug 18 15:47:43 2006
@@ -130,6 +130,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwr
@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "MACOSX"
@+ echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+.ELIF "$(OS)" == "OPEBBSD"
+.ELIF "$(OS)" == "OPENBSD"
+ @+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELSE
@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd