From 59d0ca9486a7df330eb6403007bb39c00dec987d Mon Sep 17 00:00:00 2001
From: mrauch <mrauch>
Date: Sat, 14 Feb 2004 17:35:00 +0000
Subject: Disable a check in the package, that doesn't install libfreetype.so
 if it already exists in (/emul/linux)/usr/lib. Add the library back to the
 PLIST.

---
 misc/openoffice-linux/Makefile | 3 ++-
 misc/openoffice-linux/PLIST    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'misc/openoffice-linux')

diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index 4462f1afa21..e0fbdaf3dc6 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/25 16:57:57 mrauch Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/14 17:35:00 mrauch Exp $
 
 DISTNAME=		OOo_1.1.0_LinuxIntel_install
 PKGNAME=		openoffice-linux-1.1.0
@@ -38,6 +38,7 @@ SUPPORT_FILES=          /dev/null /emul/linux/etc/mtab
 pre-install:
 	${CP} ${WRKSRC}/setup.ins ${WRKSRC}/setup.ins.orig
 	${SED}  -e "s|/usr/bin/soffice|${PREFIX}/bin/soffice.orig|g"	\
+		-e "s|/usr/lib||g"					\
 		<${WRKSRC}/setup.ins.orig >${WRKSRC}/setup.ins
 .     if ${OPSYS}=="NetBSD" && !exists(/emul/linux/etc/mtab)
 	${CP} /dev/null /emul/linux/etc/mtab
diff --git a/misc/openoffice-linux/PLIST b/misc/openoffice-linux/PLIST
index dfd3f434c9c..2e04e89b521 100644
--- a/misc/openoffice-linux/PLIST
+++ b/misc/openoffice-linux/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/01/26 10:17:35 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/02/14 17:35:00 mrauch Exp $
 OpenOffice.org1.1.0/LICENSE
 OpenOffice.org1.1.0/LICENSE.html
 OpenOffice.org1.1.0/README
@@ -255,6 +255,7 @@ OpenOffice.org1.1.0/program/libfile645li.so
 OpenOffice.org1.1.0/program/libfileacc.so
 OpenOffice.org1.1.0/program/libflash645li.so
 OpenOffice.org1.1.0/program/libflat645li.so
+OpenOffice.org1.1.0/program/libfreetype.so.6
 OpenOffice.org1.1.0/program/libfrm645li.so
 OpenOffice.org1.1.0/program/libfwe645li.so
 OpenOffice.org1.1.0/program/libfwi645li.so
-- 
cgit v1.2.3