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

Adapt to the libwpd library named change

Browse Source
This commit is contained in:
robert 2010-11-07 19:04:41 +00:00
parent 868fe4647e
commit ed9bedcd46
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editors/openoffice3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2010/11/06 20:48:11 espie Exp $
# $OpenBSD: Makefile,v 1.56 2010/11/07 19:04:41 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -13,7 +13,7 @@ PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}
PKGNAME-kde= openoffice-kde-${VERSION}
PKGNAME-java= openoffice-java-${VERSION}
REVISION-main= 4
REVISION-main= 5
REVISION-kde= 1
REVISION-java= 2
CATEGORIES= editors productivity
@ -107,16 +107,17 @@ LIB_DEPENDS-main=::x11/gtk+2 \
::textproc/redland \
${MODGCONF2_LIB_DEPENDS}
WANTLIB-main = gdk-x11-2.0.>=400.14 gtk-x11-2.0.>=400.14 \
db.>=4 xslt.>=3 curl.>=7 neon.>=24 wpd.>=8 \
db.>=4 xslt.>=3 curl.>=7 neon.>=24 wpd-0.8.>=8 \
icuuc.>=0 icudata.>=0 icui18n icule \
raptor.>=2 rasqal rdf.>=0
WANTLIB-main += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
crypto dbus-1 expat fontconfig freetype gio-2.0 glib-2.0 \
crypto expat fontconfig freetype gio-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl \
jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
png pthread pthread-stubs ssl util xcb xml2 z gdk_pixbuf-2.0 \
${MODGCONF2_WANTLIB}
WANTLIB-main += GL Xxf86vm drm stdc++ xcb-render xcb-shm
WANTLIB-main += ${MODPY_WANTLIB}
RUN_DEPENDS-main= :desktop-file-utils-*:devel/desktop-file-utils

15
editors/openoffice3/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.3 2010/06/26 15:48:11 robert Exp $
--- configure.in.orig.port Wed May 26 20:21:11 2010
+++ configure.in Fri Jun 25 23:57:08 2010
$OpenBSD: patch-configure_in,v 1.4 2010/11/07 19:04:41 robert Exp $
--- configure.in.orig.port Wed May 26 12:21:11 2010
+++ configure.in Sat Nov 6 12:39:17 2010
@@ -1053,6 +1053,18 @@ case "$build_os" in
echo "AIX is an alpha port --- Use at own risk" >> warn
_os=AIX
@ -39,15 +39,6 @@ $OpenBSD: patch-configure_in,v 1.3 2010/06/26 15:48:11 robert Exp $
*BSD)
PKGFORMAT=bsd
;;
@@ -3691,7 +3708,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_l
test "$with_system_libwpd" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPD=YES
- PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
+ PKG_CHECK_MODULES( LIBWPD, libwpd )
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPD=NO
@@ -3811,12 +3828,13 @@ if test -n "$with_system_python" -o -n "$with_system_l
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`