[pkgsrc/trunk]: pkgsrc/misc/openoffice-linux Disable a check in the package, ...

[mrauch <mrauch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e149c9d4293c
branches:  trunk
changeset: 468506:e149c9d4293c
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Sat Feb 14 17:35:00 2004 +0000

description:
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.

diffstat:

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

diffs (34 lines):

diff -r d357fdf54fe0 -r e149c9d4293c misc/openoffice-linux/Makefile
--- a/misc/openoffice-linux/Makefile    Sat Feb 14 17:34:25 2004 +0000
+++ b/misc/openoffice-linux/Makefile    Sat Feb 14 17:35:00 2004 +0000
@@ -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 @@
 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 -r d357fdf54fe0 -r e149c9d4293c misc/openoffice-linux/PLIST
--- a/misc/openoffice-linux/PLIST       Sat Feb 14 17:34:25 2004 +0000
+++ b/misc/openoffice-linux/PLIST       Sat Feb 14 17:35:00 2004 +0000
@@ -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/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