openbsd-ports/editors/openoffice3/patches/patch-solenv_inc_libs_mk
2010-06-26 15:48:11 +00:00

22 lines
803 B
Plaintext

$OpenBSD: patch-solenv_inc_libs_mk,v 1.5 2010/06/26 15:48:12 robert Exp $
--- solenv/inc/libs.mk.orig.port Wed May 26 20:30:10 2010
+++ solenv/inc/libs.mk Fri Jun 25 23:56:14 2010
@@ -201,7 +201,7 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
+.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" && "$(OS)" != "OPENBSD"
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
@@ -323,7 +323,7 @@ USED_RCLIENT_LIBS = $(VCLLIB) $(SOTLIB) $(TOOLSLIB) \
SABLOT3RDLIB=-lsablot
APP3RDLIB=-lapp
SAMPLE3RDLIB=-lsample
-HNJLIB*=-lhyphen
+#HNJLIB*=-lhyphen
MYSPELLLIB=-lmyspell
COSVLIB=-lcosv
UDMLIB=-ludm