From 22f11b4fc39fa5271af4be8edb18468c888f2d76 Mon Sep 17 00:00:00 2001
From: hira <hira>
Date: Thu, 1 Mar 2007 16:13:20 +0000
Subject:  - Add missing entries to PLIST.  - Force use some packages which
 don't have pkg-config file with NetBSD    using native XFree86.

Both of them were pointed out by oster@ in private e-mail.
Bump PKGREVISION.
---
 misc/openoffice2/Makefile   | 14 +++++++++-----
 misc/openoffice2/options.mk |  9 ++++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index d8eb264e39f..696b03235ec 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2007/02/28 22:41:45 hira Exp $
+# $NetBSD: Makefile,v 1.5 2007/03/01 16:13:20 hira Exp $
 #
 
 OO_VER=			2.1.0
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
@@ -82,8 +82,9 @@ SUBST_STAGE.X11_LDFLAGS=	post-patch
 SUBST_FILES.X11_LDFLAGS=	../solenv/inc/${OPENOFFICE_OUTPATH:Q}.mk
 SUBST_SED.X11_LDFLAGS=		-e 's|@X11_LDFLAGS@|${X11_LDFLAGS}|g'
 
-OO_PKGPATH=${WRKSRC}/../instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE}
-OO_PKGROOT=/opt/openoffice.org2.1
+OO_PKGPATH=	${WRKSRC}/../instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE}
+OO_PKGROOT=	/opt/openoffice.org2.1
+OO_PROGRAMS=	scalc sdraw simpress soffice swriter
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/bridge.h		\
@@ -103,7 +104,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${OPENOFFICE_VERSION}
 	cd ${WRKDIR}${OO_PKGROOT} &&					\
 	${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OPENOFFICE_VERSION} -
-	for f in scalc sdraw simpress soffice swriter; do		\
+	for f in ${OO_PROGRAMS}; do					\
 		${LN} -sf ${PREFIX}/${OPENOFFICE_VERSION}/program/$$f	\
 			${PREFIX}/bin/$$f;				\
 	done
@@ -114,6 +115,9 @@ post-install:
 	${SORT} > ${PLIST_SRC} &&					\
 	${FIND} ${OPENOFFICE_VERSION} -type d -print | ${SORT} -r |	\
 	${AWK} '{print("@dirrm "$$1)}' >> ${PLIST_SRC}
+	for f in ${OO_PROGRAMS}; do					\
+		${ECHO} bin/$$f >> ${PLIST_SRC};			\
+	done
 
 # everything specific to your OS/Arch goes into its own Makefile
 # group together i386, i486, i586 and i686 (for Linux)
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 8d4ba798594..8921ba819b0 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/02/28 22:41:45 hira Exp $
+# $NetBSD: options.mk,v 1.5 2007/03/01 16:13:21 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=		cups gnome-vfs2 gtk2 # kde
@@ -17,6 +17,7 @@ PKG_OPTIONS_GROUP.lang+=	lang-${l}
 PKG_SUGGESTED_OPTIONS=		gtk2 lang-en-US firefox
 
 .include "../../mk/bsd.options.mk"
+.include "../../mk/bsd.prefs.mk"
 
 OPENOFFICE_LANGUAGE=		${PKG_OPTIONS:Mlang-*:S/^lang-//1}
 
@@ -60,6 +61,12 @@ CONFIGURE_ARGS+=	--disable-gnome-vfs
 .if !empty(PKG_OPTIONS:Mgtk2)
 .include "../../x11/gtk2/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-gtk
+# *.pc files are needed with NetBSD using native XFree86.
+.if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
+USE_BUILTIN.Xfixes=	no
+USE_BUILTIN.Xrandr=	no
+USE_BUILTIN.Xrender=	no
+.endif
 .else
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
-- 
cgit v1.2.3