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

- add amd64 support

Browse Source 
- use unxobsd.mk instead of different makefiles for every
  architecture
- use devel/boost now that we have it instead of the bundled
  one. (this is also needed to build openoffice on amd64)
- start using some patches from http://go-ooo.org/.
  (disable the startup wizard and some online registration menu points)
  (the patch is generated by my after applying the patches that's why
   i provide the mirror for it.)
- allow the openoffice build infrastructure to override our CFLAGS in
  some cases. this is needed because some of the files have to be compiled
  with -O0 instead of -02 which we use by default.
This commit is contained in:
robert 2006-11-08 09:34:03 +00:00
parent 195f859e7f
commit cf71bd6f41
12 changed files with 156 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editors/openoffice/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.21 2006/11/04 12:34:18 kurt Exp $
# $OpenBSD: Makefile,v 1.22 2006/11/08 09:34:03 robert Exp $
ONLY_FOR_ARCHS= i386
ONLY_FOR_ARCHS= amd64 i386
COMMENT= "a multi-platform productivity suite"
COMMENT-kde= "optional integration of OpenOffice to the KDE environment"
@ -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}p11
PKGNAME-kde= openoffice-kde-${VERSION}p11
PKGNAME-java= openoffice-java-${VERSION}p11
PKGNAME= openoffice-${VERSION}p12
PKGNAME-kde= openoffice-kde-${VERSION}p12
PKGNAME-java= openoffice-java-${VERSION}p12
CATEGORIES= editors productivity
SHARED_LIBS= icudata 26.0 \
@ -27,6 +27,10 @@ MASTER_SITES= ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/stab
http://vlaai.snt.utwente.nl/pub/software/openoffice/stable/${VERSION}/ \
ftp://openoffice.mirror.cygnal.ca/openoffice/stable/${VERSION}/ \
http://mirrors.protection.cx/~jolan/
MASTER_SITES0= http://www.bsd.hu/~robert/ooo/ \
http://humppa.hu/ooo/
DIST_SUBDIR= openoffice
# See http://www.openoffice.org/about.html#licenses
# and http://www.openoffice.org/license.html
@ -48,7 +52,8 @@ BUILD_DEPENDS= :zip-*:archivers/zip \
::textproc/libxslt \
::print/cups \
::devel/apache-ant \
:db-java-4.*:databases/db/v4,-java,java
:db-java-4.*:databases/db/v4,-java,java \
::devel/boost
BASE_LIBS= gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \
python2.3:python-2.3.*:lang/python/2.3 \
@ -90,6 +95,7 @@ USE_GMAKE= Yes
NO_REGRESS= Yes
VMEM_WARNING= Yes
PATCHFILES= go_oo_src680_20061105.diff:0
PATCHORIG= .orig.port
WRKCONF= ${WRKSRC}/config_office
@ -117,6 +123,7 @@ CONFIGURE_ARGS= --disable-gnome-vfs \
--with-system-neon \
--with-system-db \
--with-system-sndfile \
--with-system-boost \
--with-epm=internal \
--with-alloc=system \
--with-java \
@ -138,9 +145,11 @@ OOARCH= OPENBSDGCCI
TCSH= ${LOCALBASE}/bin/tcsh
pre-patch:
.for arch in intel x86-64
@cd ${WRKSRC}/bridges/source/cpp_uno && \
cp -R gcc3_freebsd_intel gcc3_openbsd_intel && \
perl -pi -e "s,FREEBSD,OPENBSD,g" gcc3_openbsd_intel/makefile.mk
cp -R gcc3_freebsd_${arch} gcc3_openbsd_${arch} && \
perl -pi -e "s,FREEBSD,OPENBSD,g" gcc3_openbsd_${arch}/makefile.mk
.endfor
do-build:
@cd ${WRKBUILD} && \

12
editors/openoffice/distinfo
View File

@ -1,4 +1,8 @@
MD5 (OOo_2.0.4_src.tar.gz) = df4bb26645e974a2358bc17f8381a197
RMD160 (OOo_2.0.4_src.tar.gz) = 1d68ee8cee485459db78a8e1d8e2f19e260419b6
SHA1 (OOo_2.0.4_src.tar.gz) = e7934d4b7487939f9b2d4659d57f514ebba5c00c
SIZE (OOo_2.0.4_src.tar.gz) = 333861883
MD5 (openoffice/OOo_2.0.4_src.tar.gz) = df4bb26645e974a2358bc17f8381a197
MD5 (openoffice/go_oo_src680_20061105.diff) = 61f1bb82523de6b2f9ada575b8594fdb
RMD160 (openoffice/OOo_2.0.4_src.tar.gz) = 1d68ee8cee485459db78a8e1d8e2f19e260419b6
RMD160 (openoffice/go_oo_src680_20061105.diff) = 29b13fcf65724d6dfd00f55fc9f4dd4b9592a40c
SHA1 (openoffice/OOo_2.0.4_src.tar.gz) = e7934d4b7487939f9b2d4659d57f514ebba5c00c
SHA1 (openoffice/go_oo_src680_20061105.diff) = 9072514055e6f4e04ca82f7daf8d9352566e3d32
SIZE (openoffice/OOo_2.0.4_src.tar.gz) = 333861883
SIZE (openoffice/go_oo_src680_20061105.diff) = 9928

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

@ -0,0 +1,14 @@
$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

9
editors/openoffice/patches/patch-bridges_prj_build_lst
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-bridges_prj_build_lst,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- bridges/prj/build.lst.orig.port Wed Jul 19 05:28:51 2006
+++ bridges/prj/build.lst Fri Aug 18 15:47:42 2006
@@ -19,6 +19,7 @@ br bridges\source\cpp_uno\cc50_solaris_i
$OpenBSD: patch-bridges_prj_build_lst,v 1.3 2006/11/08 09:34:03 robert Exp $
--- bridges/prj/build.lst.orig.port Wed Jul 19 11:28:51 2006
+++ bridges/prj/build.lst Sat Nov 4 22:18:57 2006
@@ -19,6 +19,8 @@
br bridges\source\cpp_uno\gcc3_solaris_sparc nmake - u br_gcc3sogs br_cppuno_shared br_unotypes NULL
br bridges\source\cpp_uno\gcc3_solaris_intel nmake - u br_gcc3sogi br_cppuno_shared br_unotypes NULL
br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u br_gccni br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_openbsd_intel nmake - u br_gcc3oi br_cppuno_shared br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_openbsd_x86-64 nmake - u br_gcc3ox br_cppuno_shared br_unotypes NULL
br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared br_unotypes NULL
br bridges\source\cli_uno nmake - w,vc7 br_cli_uno br_unotypes NULL
br bridges\source\jni_uno nmake - all br_jni_uno br_unotypes NULL

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

@ -1,7 +1,7 @@
$OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
--- config_office/set_soenv.in.orig.port Mon Aug 28 04:37:34 2006
+++ config_office/set_soenv.in Tue Oct 31 12:56:11 2006
@@ -368,6 +368,34 @@ elsif ( $platform =~ m/freebsd/ )
$OpenBSD: patch-config_office_set_soenv_in,v 1.6 2006/11/08 09:34:03 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 @@
$INPATH = $OUTPATH.$PROEXT;
$GVERDIR = $INPATH;
}
@ -11,8 +11,24 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
+ $BIG_SVX = "TRUE";
+ $COM = "GCC";
+ $COMPATH = '@COMPATH@';
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ if ( $platform =~ m/^i386/ )
+ {
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ }
+ elsif ( $platform =~ m/^x86_64/ )
+ {
+ $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";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }
+ $CVER = "C300";
+ $GUI = "UNX";
+ $GUIBASE = "unx";
@ -25,10 +41,6 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
+ $PATH_SEPERATOR = $ps;
+ $XPVERSION = "3";
+ $OSVERSION = '@OSVERSION@';
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
@ -36,7 +48,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
elsif ( $platform =~ m/linux-gnu/ )
{
# General Linux settings:
@@ -943,7 +971,7 @@ if ($platform =~ m/solaris/)
@@ -943,7 +983,7 @@
$ps.$JRETHREADDIR.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
@ -45,7 +57,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
{ $LD_LIBRARY_PATH = $cur_dir.
$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
$ps.$JRELIBDIR.
@@ -992,7 +1020,7 @@ if ($platform =~ m/solaris/)
@@ -992,7 +1032,7 @@
$D."SUPD=$UPD".
$D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
}
@ -54,7 +66,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
{ $SOLARDEF = $D."UNX".
$D.$COM.
$D.$CVER.
@@ -1029,7 +1057,7 @@ if ($platform =~ m/solaris/)
@@ -1029,7 +1069,7 @@
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB;
}
@ -63,7 +75,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
{
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
@@ -1070,7 +1098,7 @@ if ($platform =~ m/cygwin/)
@@ -1070,7 +1110,7 @@
}
# The general environment path.
@ -72,7 +84,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1260,6 +1288,19 @@ elsif ($platform =~ m/linux-gnu|netbasd|
@@ -1260,6 +1300,19 @@
$L_STLPORT_LIB.
$L.$XLIB;
}
@ -92,7 +104,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
elsif ($platform =~ m/cygwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
$L.$par_dir.$LIB.
@@ -1291,10 +1332,10 @@ $SOLARINC = $I.$cur_dir.
@@ -1291,10 +1344,10 @@
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
@ -105,7 +117,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1315,10 +1356,15 @@ if ($platform =~ m/linux-gnu/)
@@ -1315,10 +1368,15 @@
$SOLARINC .= $STLPORT_inc_stlport;
}
@ -123,7 +135,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
#include system dependent Java include directory
if (!($JDK eq "gcj"))
{
@@ -1334,6 +1380,10 @@ if ($platform =~ m/linux-gnu/)
@@ -1334,6 +1392,10 @@
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
@ -134,7 +146,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.5 2006/11/03 05:11:09 kurt Exp $
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
}
@@ -1346,7 +1396,7 @@ if ($platform =~ m/linux-gnu/)
@@ -1346,7 +1408,7 @@
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
}
#The tail, if needed

12
editors/openoffice/patches/patch-icu_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-icu_makefile_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
--- icu/makefile.mk.orig.port Mon Sep 25 15:00:02 2006
+++ icu/makefile.mk Mon Sep 25 15:00:22 2006
@@ -77,7 +77,7 @@
CONFIGURE_DIR=source
-CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
+CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS) -fPIC" CXXFLAGS="$(icu_CXXFLAGS) -fPIC" LDFLAGS="$(icu_LDFLAGS) -fPIC" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
CONFIGURE_FLAGS=

11
editors/openoffice/patches/patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx,v 1.1 2006/11/08 09:34:03 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig.port Sat Nov 4 23:32:36 2006
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Sat Nov 4 23:29:40 2006
@@ -91,6 +91,7 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

21
editors/openoffice/patches/patch-solenv_inc_settings_mk Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-solenv_inc_settings_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
--- solenv/inc/settings.mk.orig.port Mon Nov 6 23:48:26 2006
+++ solenv/inc/settings.mk Tue Nov 7 00:05:53 2006
@@ -1106,6 +1106,8 @@
CDEFS+=-DSVX_LIGHT
.ENDIF
+CFLAGS+= $(ENVCFLAGS)
+
.IF "$(optimize)"!=""
CDEFS+=$(CDEFSOPT)
CFLAGS+=$(CFLAGSOPT)
@@ -1252,7 +1254,7 @@
CDEFS+= $(ADDCDEFS)
CDEFS+= $(ENVCDEFS)
-CFLAGS+= $(CFLAGSCALL) $(ENVCFLAGS)
+CFLAGS+= $(CFLAGSCALL)
CFLAGSCXX+= $(ENVCFLAGSCXX)
# andersrum wg. -TPxxxx
CFLAGSINCXX+:=$(ENVCFLAGSINCXX)

6
editors/openoffice/patches/patch-solenv_inc_unx_mk
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-solenv_inc_unx_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
$OpenBSD: patch-solenv_inc_unx_mk,v 1.3 2006/11/08 09:34:03 robert Exp $
--- solenv/inc/unx.mk.orig.port Wed Jul 19 05:26:37 2006
+++ solenv/inc/unx.mk Fri Aug 18 15:47:45 2006
@@ -36,6 +36,9 @@
# --- Unix-Environment ---------------------------------------
# Used if "$(GUI)" == "UNX"
+.IF "$(COM)$(OS)$(CPU)" == "GCCOPENBSDI"
+.INCLUDE : unxobsdi.mk
+.IF "$(COM)$(OS)" == "GCCOPENBSD"
+.INCLUDE : unxobsd.mk
+.ENDIF
# Dieses Define gilt fuer alle WNT- Plattformen

31
editors/openoffice/patches/patch-solenv_inc_unxobsdi_mk → editors/openoffice/patches/patch-solenv_inc_unxobsd_mk
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.6 2006/10/27 16:02:02 kurt Exp $
--- solenv/inc/unxobsdi.mk.orig.port Wed Oct 25 07:34:21 2006
+++ solenv/inc/unxobsdi.mk Thu Oct 26 08:52:12 2006
@@ -0,0 +1,228 @@
$OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
--- solenv/inc/unxobsd.mk.orig.port Thu Nov 2 21:12:56 2006
+++ solenv/inc/unxobsd.mk Thu Nov 2 21:12:49 2006
@@ -0,0 +1,235 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: patch-solenv_inc_unxobsdi_mk,v $
+# $RCSfile: patch-solenv_inc_unxobsd_mk,v $
+#
+# $Revision: 1.6 $
+# $Revision: 1.1 $
+#
+# last change: $Author: kurt $ $Date: 2006/10/27 16:02:02 $
+# last change: $Author: robert $ $Date: 2006/11/08 09:34:03 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
@ -86,16 +86,26 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.6 2006/10/27 16:02:02 kurt Exp $
+
+.ENDIF
+
+INCPOST=$(LOCALBASE)/include
+
+# flags for the C++ Compiler
+CFLAGSCC=$(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -DBOOST_NO_EXCEPTIONS
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX=$(ARCH_FLAGS)
+.IF "$(CPUNAME)" == "X86_64"
+PICSWITCH:=-fpic -fPIC
+LINKFLAGSOPTIMIZE*=-Wl,-O1 -fPIC
+.ENDIF
+.IF "$(CPUNAME)" == "INTEL"
+PICSWITCH:=-fpic
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+.ENDIF
+
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@ -154,6 +164,7 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.6 2006/10/27 16:02:02 kurt Exp $
+#LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+#LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+LINKFLAGS=-Wl,-z,combreloc
+SOLARLIB+=-L$(LOCALBASE)/lib
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
@ -170,7 +181,6 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.6 2006/10/27 16:02:02 kurt Exp $
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
@ -207,8 +217,6 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.6 2006/10/27 16:02:02 kurt Exp $
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
@ -229,4 +237,3 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.6 2006/10/27 16:02:02 kurt Exp $
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
+

4
editors/openoffice/patches/patch-stlport_STLport-4_5_patch
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-stlport_STLport-4_5_patch,v 1.4 2006/10/27 16:02:02 kurt Exp $
$OpenBSD: patch-stlport_STLport-4_5_patch,v 1.5 2006/11/08 09:34:03 robert Exp $
--- stlport/STLport-4.5.patch.orig.port Thu Apr 27 03:47:20 2006
+++ stlport/STLport-4.5.patch Thu Oct 26 15:40:08 2006
@@ -115,6 +115,81 @@
@ -31,7 +31,7 @@ $OpenBSD: patch-stlport_STLport-4_5_patch,v 1.4 2006/10/27 16:02:02 kurt Exp $
+! #
+! #
+! LINK=ar cr
+! DYN_LINK=${CXX} ${PTHREAD_LIBS} -lstdc++ --fexceptions -shared -o
+! DYN_LINK=${CXX} ${PTHREAD_LIBS} -fPIC -lstdc++ --fexceptions -shared -o
+!
+! OBJEXT=o
+! DYNEXT=so

13
editors/openoffice/patches/patch-svx_source_customshapes_makefile_mk Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-svx_source_customshapes_makefile_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
--- svx/source/customshapes/makefile.mk.orig.port Fri Nov 3 16:43:35 2006
+++ svx/source/customshapes/makefile.mk Fri Nov 3 16:44:37 2006
@@ -48,7 +48,8 @@
# Disable optimization for SunCC SPARC and MACOSX (funny loops
# when parsing e.g. "x+width/2"),
# also http://gcc.gnu.org/PR22392
-.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P")
+.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") \
+ || ("$(OS)"=="OPENBSD"
NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
.ENDIF