fix some crazy crashes in Calc by using the same __DLLEXTENSION every…

…where; bump PKGNAME
avsm · Jan 17, 2007 · cdb4464 · cdb4464
1 parent 2a2717a
commit cdb4464
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2007/01/16 02:48:02 kurt Exp $
+# $OpenBSD: Makefile,v 1.46 2007/01/17 07:29:01 robert Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -9,8 +9,8 @@ COMMENT-java=	"optional integration of OpenOffice java features"
 VERSION=	2.1.0
 DISTNAME=	OOo_${VERSION}
 WRKDIST=	${WRKDIR}/OOE680_m6
-PKGNAME=	openoffice-${VERSION}p2
-PKGNAME-main=	openoffice-${VERSION}p2
+PKGNAME=	openoffice-${VERSION}p3
+PKGNAME-main=	openoffice-${VERSION}p3
 PKGNAME-kde=	openoffice-kde-${VERSION}
 PKGNAME-java=	openoffice-java-${VERSION}p0
 CATEGORIES=	editors productivity

diff --git a/editors/openoffice/patches/patch-solenv_inc_unxobsd_mk b/editors/openoffice/patches/patch-solenv_inc_unxobsd_mk
@@ -1,16 +1,16 @@
-$OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.2 2006/12/13 10:25:14 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 @@
+$OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.3 2007/01/17 07:29:01 robert Exp $
+--- solenv/inc/unxobsd.mk.orig.port	Tue Jan 16 21:47:25 2007
++++ solenv/inc/unxobsd.mk	Tue Jan 16 21:58:28 2007
+@@ -0,0 +1,236 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
 +#
 +#   $RCSfile: patch-solenv_inc_unxobsd_mk,v $
 +#
-+#   $Revision: 1.1 $
++#   $Revision: 1.2 $
 +#
-+#   last change: $Author: robert $ $Date: 2006/11/08 09:34:03 $
++#   last change: $Author: robert $ $Date: 2006/12/13 10:25:14 $
 +#
 +#   The Contents of this file are made available subject to
 +#   the terms of GNU Lesser General Public License Version 2.1.
@@ -237,3 +237,4 @@ $OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.2 2006/12/13 10:25:14 robert Exp $
 +# platform specific identifier for shared libs
 +DLLPRE=lib
 +DLLPOST=.so
++DLLPOSTFIX=
diff --git a/editors/openoffice/patches/patch-tools_inc_solar_h b/editors/openoffice/patches/patch-tools_inc_solar_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tools_inc_solar_h,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- tools/inc/solar.h.orig.port	Wed Jul 19 05:28:08 2006
-+++ tools/inc/solar.h	Fri Aug 18 15:47:45 2006
+$OpenBSD: patch-tools_inc_solar_h,v 1.3 2007/01/17 07:29:01 robert Exp $
+--- tools/inc/solar.h.orig.port	Fri Dec  1 18:57:51 2006
++++ tools/inc/solar.h	Tue Jan 16 21:57:37 2007
 @@ -341,6 +341,7 @@ template<typename T> inline T Abs(T a) {
  #define SYSTEM_UNXSOGS		31
  #define SYSTEM_UNXSOGI		32
@@ -9,12 +9,13 @@ $OpenBSD: patch-tools_inc_solar_h,v 1.2 2006/08/20 03:36:53 kurt Exp $
 
  #if defined WNT
    #define __DLLEXTENSION "mi"
-@@ -412,6 +413,8 @@ template<typename T> inline T Abs(T a) {
+@@ -412,6 +413,9 @@ template<typename T> inline T Abs(T a) {
  #elif defined MACOSX && defined X86
    #define __DLLEXTENSION "mxi.dylib"
    #define SYSTEM_ID		SYSTEM_UNXMACXI
 +#elif defined OPENBSD
-+  #define __DLLEXTENSION "oi.so"
++  #define __DLLEXTENSION ".so"
++  #define SYSTEM_ID		SYSTEM_UNXOBSD
  #else
    #define __DLLEXTENSION ".so"
  #endif