diff options
| author | hira <hira> | 2009-01-20 10:19:30 +0000 |
|---|---|---|
| committer | hira <hira> | 2009-01-20 10:19:30 +0000 |
| commit | 1ac93c45e235062e5cd4fe1aa5df3832759c2a59 (patch) | |
| tree | 9ba574914ccdc6dc3ef000f13c7ba4321fadeea5 /misc | |
| parent | 900430c268ec78c34ea3aa1346f2d8924882f70c (diff) | |
| download | pkgsrc-1ac93c45e235062e5cd4fe1aa5df3832759c2a59.tar.gz | |
- Add missing entries to INSTALLATION_DIRS.
- Remove entries which are generated from openoffice.org.xml from PLIST.
This should fix installation with USE_DESTDIR=Full.
Reported by abs@ in private e-mail.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice3/Makefile | 6 | ||||
| -rw-r--r-- | misc/openoffice3/PLIST | 38 |
2 files changed, 5 insertions, 39 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index f6524232f4f..ec8f7f55e39 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2009/01/20 09:52:12 hira Exp $ +# $NetBSD: Makefile,v 1.21 2009/01/20 10:19:30 hira Exp $ # OO_VER= 3.0.0 @@ -140,7 +140,9 @@ PLIST_SUBST+= OO_UNXNAME=${OO_UNXNAME} PLIST_SUBST+= OO_ICON_PREFIX=openofficeorg3 MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX} INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications \ - lib/${OO_RELEASE}/extensions + lib/${OO_RELEASE}/extensions \ + share/application-registry share/mime-info \ + share/mime/packages OO_UNXNAME= openoffice.org3 OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install diff --git a/misc/openoffice3/PLIST b/misc/openoffice3/PLIST index bf3bbf59c97..b730a4c1c51 100644 --- a/misc/openoffice3/PLIST +++ b/misc/openoffice3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/11/26 15:33:23 hira Exp $ +@comment $NetBSD: PLIST,v 1.7 2009/01/20 10:19:30 hira Exp $ bin/scalc bin/sdraw bin/simpress @@ -303,42 +303,6 @@ ${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet-template.des ${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet.desktop ${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text-template.desktop ${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text.desktop -share/mime/application/vnd.ms-excel.sheet.binary.macroenabled.12.xml -share/mime/application/vnd.ms-excel.sheet.macroenabled.12.xml -share/mime/application/vnd.ms-excel.template.macroenabled.12.xml -share/mime/application/vnd.ms-powerpoint.presentation.macroenabled.12.xml -share/mime/application/vnd.ms-powerpoint.template.macroenabled.12.xml -share/mime/application/vnd.ms-word.document.macroenabled.12.xml -share/mime/application/vnd.ms-word.template.macroenabled.12.xml -share/mime/application/vnd.oasis.opendocument.formula.xml -share/mime/application/vnd.oasis.opendocument.graphics-template.xml -share/mime/application/vnd.oasis.opendocument.graphics.xml -share/mime/application/vnd.oasis.opendocument.presentation-template.xml -share/mime/application/vnd.oasis.opendocument.presentation.xml -share/mime/application/vnd.oasis.opendocument.spreadsheet-template.xml -share/mime/application/vnd.oasis.opendocument.spreadsheet.xml -share/mime/application/vnd.oasis.opendocument.text-master.xml -share/mime/application/vnd.oasis.opendocument.text-template.xml -share/mime/application/vnd.oasis.opendocument.text-web.xml -share/mime/application/vnd.oasis.opendocument.text.xml -share/mime/application/vnd.openofficeorg.extension.xml -share/mime/application/vnd.openxmlformats-officedocument.presentationml.presentation.xml -share/mime/application/vnd.openxmlformats-officedocument.presentationml.template.xml -share/mime/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.xml -share/mime/application/vnd.openxmlformats-officedocument.spreadsheetml.template.xml -share/mime/application/vnd.openxmlformats-officedocument.wordprocessingml.document.xml -share/mime/application/vnd.openxmlformats-officedocument.wordprocessingml.template.xml -share/mime/application/vnd.sun.xml.base.xml -share/mime/application/vnd.sun.xml.calc.template.xml -share/mime/application/vnd.sun.xml.calc.xml -share/mime/application/vnd.sun.xml.draw.template.xml -share/mime/application/vnd.sun.xml.draw.xml -share/mime/application/vnd.sun.xml.impress.template.xml -share/mime/application/vnd.sun.xml.impress.xml -share/mime/application/vnd.sun.xml.math.xml -share/mime/application/vnd.sun.xml.writer.global.xml -share/mime/application/vnd.sun.xml.writer.template.xml -share/mime/application/vnd.sun.xml.writer.xml share/mime/packages/openoffice.org.xml share/mime-info/${OO_UNXNAME}.mime share/mime-info/${OO_UNXNAME}.keys |