diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 358d08809bf9..0937777b4c15 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2008/11/19 01:54:25 hira Exp $ +# $NetBSD: Makefile,v 1.17 2008/11/22 07:57:03 hira Exp $ # OO_VER= 3.0.0 -PKGREVISION= 6 +PKGREVISION= 7 OO_TAG= OOO300_m9 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} @@ -60,9 +60,17 @@ REPLACE_PERL+= sd/res/webview/editpic.pl \ sd/res/webview/poll.pl \ sd/res/webview/savepic.pl \ sd/res/webview/show.pl \ - sd/res/webview/webview.pl + sd/res/webview/webview.pl \ + sysui/desktop/share/create_mime_xml.pl REPLACE_PYTHON+= scripting/source/pyprov/mailmerge.py +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= post-patch +SUBST_MESSAGE.prefix= Fixing prefix +SUBST_FILES.prefix= sysui/desktop/share/openoffice.sh +SUBST_FILES.prefix+= sysui/desktop/share/printeradmin.sh +SUBST_SED.prefix= -e 's|@OO_PREFIX@|${OO_PREFIX}|g' + SUBST_CLASSES+= lib SUBST_STAGE.lib= post-patch SUBST_MESSAGE.lib= Adding library paths @@ -130,6 +138,7 @@ OO_RELEASE= OpenOffice.org${OO_VER} PLIST_SRC+= ${PKGDIR}/PLIST PLIST_SRC+= ${WRKDIR}/PLIST 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 @@ -150,14 +159,6 @@ do-build: @${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c \ "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake openoffice_${OO_BASELANG} && dmake ooolanguagepack" -post-build: - ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME} - ${ECHO} "exec ${OO_PREFIX}/${OO_UNXNAME}/program/soffice \"\$$@\"" \ - >> ${WRKDIR}/${OO_UNXNAME} - ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin - ${ECHO} "exec ${OO_PREFIX}/${OO_UNXNAME}/program/spadmin" \ - >> ${WRKDIR}/${OO_UNXNAME}-printeradmin - do-install: cd ${DESTDIR}${OO_PREFIX} && \ for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do \ @@ -168,20 +169,19 @@ do-install: tar xpf $$f; \ done; \ done - for d in ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/share/xdg/*; do \ - ln -s $$d ${DESTDIR}${PREFIX}/share/applications; \ - done cd ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/basis-link/program && \ chmod ${SHAREMODE} hid.lst testtoolrc for f in ${OO_PROGRAMS}; do \ ln -sf ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/program/$$f \ ${DESTDIR}${PREFIX}/bin/$$f; \ done - cd ${WRKDIR}/${OO_TAG}/solver/300/${OPENOFFICE_OUTPATH}.pro/bin && \ + cd ${WRKSRC}/solver/300/${OPENOFFICE_OUTPATH}.pro/bin && \ ${INSTALL_DATA} ${OO_EXTENSIONS} ${DESTDIR}${OO_PREFIX}/extensions - ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin \ - ${DESTDIR}${PREFIX}/bin + cd ${WRKSRC}/sysui/${OPENOFFICE_OUTPATH}.pro/misc/openoffice.org && \ + find ../../../desktop/icons -name '*.png' | xargs chmod -x && \ + ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} _PREFIX=${PREFIX} \ + GNOME=${PKG_OPTIONS:Mgnome} KDE=${PKG_OPTIONS:Mkde} \ + OO_PREFIX=${OO_PREFIX} ${SH} create_tree.sh post-install: cd ${DESTDIR}${PREFIX} && \ @@ -197,16 +197,17 @@ post-install: .include "../../mk/compiler.mk" -.include "../../lang/python/application.mk" - .include "../../databases/db4/buildlink3.mk" +.include "../../databases/shared-mime-info/mimedb.mk" .include "../../devel/gperf/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/hunspell/buildlink3.mk" diff --git a/misc/openoffice3/Makefile.FreeBSD b/misc/openoffice3/Makefile.FreeBSD index a33c87960ba6..340f6e273eaa 100644 --- a/misc/openoffice3/Makefile.FreeBSD +++ b/misc/openoffice3/Makefile.FreeBSD @@ -1,9 +1,6 @@ -# $NetBSD: Makefile.FreeBSD,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +# $NetBSD: Makefile.FreeBSD,v 1.2 2008/11/22 07:57:03 hira Exp $ # -# This package needs native Java. -PKG_JVMS_ACCEPTED= jdk14 jdk15 - BUILD_DEPENDS+= coreutils>=*:../../sysutils/coreutils BUILD_DEPENDS+= patch>=*:../../devel/patch CONFIGURE_ARGS+= --with-gnu-cp=${PREFIX}/bin/gcp diff --git a/misc/openoffice3/Makefile.NetBSD b/misc/openoffice3/Makefile.NetBSD index a5ea3f845395..eefcc56becac 100644 --- a/misc/openoffice3/Makefile.NetBSD +++ b/misc/openoffice3/Makefile.NetBSD @@ -1,9 +1,6 @@ -# $NetBSD: Makefile.NetBSD,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +# $NetBSD: Makefile.NetBSD,v 1.2 2008/11/22 07:57:03 hira Exp $ # -# This package needs native Java. -PKG_JVMS_ACCEPTED= jdk14 jdk15 - # *.pc files are required, but these don't exist on NetBSD. .if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) . for _pkg_ in freetype2 Xfixes Xrandr Xrender diff --git a/misc/openoffice3/PLIST b/misc/openoffice3/PLIST index 6269c5110bd7..d5049b2dbcf9 100644 --- a/misc/openoffice3/PLIST +++ b/misc/openoffice3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2008/10/25 15:18:17 hira Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/11/22 07:57:03 hira Exp $ bin/scalc bin/sdraw bin/simpress @@ -7,11 +7,345 @@ bin/swriter bin/unopkg bin/${OO_UNXNAME} bin/${OO_UNXNAME}-printeradmin -share/applications/base.desktop -share/applications/calc.desktop -share/applications/draw.desktop -share/applications/impress.desktop -share/applications/math.desktop -share/applications/printeradmin.desktop -${PLIST.gtk2}share/applications/qstart.desktop -share/applications/writer.desktop +share/applications/${OO_UNXNAME}-base.desktop +share/applications/${OO_UNXNAME}-calc.desktop +share/applications/${OO_UNXNAME}-draw.desktop +share/applications/${OO_UNXNAME}-impress.desktop +share/applications/${OO_UNXNAME}-math.desktop +share/applications/${OO_UNXNAME}-printeradmin.desktop +share/applications/${OO_UNXNAME}-writer.desktop +share/application-registry/${OO_UNXNAME}.applications +share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-base.png +share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-calc.png +share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-draw.png +share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-impress.png +share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-math.png +share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png +share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-writer.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png +share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png +share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-base.png +share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-calc.png +share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-draw.png +share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-impress.png +share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-math.png +share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png +share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-writer.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png +share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png +share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-base.png +share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-calc.png +share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-draw.png +share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-impress.png +share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-math.png +share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png +share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-writer.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-database.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png +share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text.png +share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-base.png +share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-calc.png +share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-draw.png +share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-impress.png +share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-math.png +share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png +share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-writer.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png +share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png +share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-base.png +share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-calc.png +share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-draw.png +share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-impress.png +share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-math.png +share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png +share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-writer.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png +share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png +${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-base.png +${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-calc.png +${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-draw.png +${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-impress.png +${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-math.png +${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png +${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-writer.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-database.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png +${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text.png +${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-base.png +${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-calc.png +${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-draw.png +${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-impress.png +${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-math.png +${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png +${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-writer.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-database.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png +${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text.png +${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-base.png +${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-calc.png +${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-draw.png +${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-impress.png +${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-math.png +${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png +${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-writer.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-database.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png +${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text.png +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-extension.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-formula.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-master-document.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-sheet-12.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-sheet-binary-12.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-sheet.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-template-12.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-powerpoint-presentation-12.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-powerpoint-presentation.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-powerpoint-template-12.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-document-12.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-document.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-document2.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-template-12.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-database.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-formula.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-master-document.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-web-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-presentationml-presentation.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-presentationml-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-spreadsheetml-sheet.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-spreadsheetml-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-wordprocessingml-document.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-wordprocessingml-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation-template.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation.desktop +${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet-template.desktop +${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 +@dirrm share/icons/locolor/32x32/mimetypes +@dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 +@dirrm share/icons/locolor/16x16/mimetypes +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 5f5b2f001305..3c1d91914680 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2008/10/31 09:40:58 hira Exp $ +$NetBSD: distinfo,v 1.15 2008/11/22 07:57:03 hira Exp $ SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d @@ -83,3 +83,6 @@ SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834 SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247 SHA1 (patch-ed) = 235cd96522e8fec1cd3cc2f49f410cf832a07604 SHA1 (patch-ee) = 6a77e56645484367a96660e7f9a3ac402bad9f2a +SHA1 (patch-ef) = 1d31bf6ae77484f6982061203d7426e996c70aa8 +SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70 +SHA1 (patch-eh) = 4f4b2cebe22e83ca6acd2b226281bf756fbc9083 diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk index 3acf81f76cc0..bc1683ac4819 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.12 2008/11/19 01:54:25 hira Exp $ +# $NetBSD: options.mk,v 1.13 2008/11/22 07:57:03 hira Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 -PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd +PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde ooo-external-libwpd PKG_OPTIONS_OPTIONAL_GROUPS= browser PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey # The list from completelangiso in solenv/inc/postset.mk. @@ -20,6 +20,10 @@ PKG_SUPPORTED_OPTIONS+= lang-${l} PKG_SUGGESTED_OPTIONS= firefox3 gtk2 lang-en-US PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome +.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) +PKG_SUPPORTED_OPTIONS+= java +.endif + .include "../../mk/bsd.options.mk" .include "../../mk/bsd.prefs.mk" @@ -79,18 +83,19 @@ CONFIGURE_ARGS+= --enable-cups CONFIGURE_ARGS+= --disable-cups .endif +PLIST_VARS+= gnome .if !empty(PKG_OPTIONS:Mgnome) +PLIST.gnome= yes CONFIGURE_ARGS+= --enable-gnome-vfs --enable-evolution2 .include "../../devel/GConf/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" +.include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2 .endif -PLIST_VARS+= gtk2 .if !empty(PKG_OPTIONS:Mgtk2) -PLIST.gtk2= yes CONFIGURE_ARGS+= --enable-gtk .include "../../x11/gtk2/buildlink3.mk" .else @@ -135,7 +140,9 @@ SUBST_SED.java+= -e 's,@JAVA_MAWT_DIR@,${JAVA_LIB_ROOT}/xawt,g' SUBST_SED.lib+= -e 's|@LIB_jawt@|${LIB.jawt}|g' SUBST_SED.lib+= -e 's|@LIB_awtlib@|${LIB.awtlib}|g' +PLIST_VARS+= kde .if !empty(PKG_OPTIONS:Mkde) +PLIST.kde= yes CONFIGURE_ENV+= KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q} CONFIGURE_ARGS+= --enable-kde --enable-kdeab .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/misc/openoffice3/patches/patch-ef b/misc/openoffice3/patches/patch-ef new file mode 100644 index 000000000000..fb8b37e32ae1 --- /dev/null +++ b/misc/openoffice3/patches/patch-ef @@ -0,0 +1,97 @@ +$NetBSD: patch-ef,v 1.1 2008/11/22 07:57:03 hira Exp $ + +--- sysui/desktop/share/create_tree.sh.orig 2008-05-15 18:11:15.000000000 +0900 ++++ sysui/desktop/share/create_tree.sh 2008-11-22 11:47:56.000000000 +0900 +@@ -1,46 +1,38 @@ + umask 022 + +-if [ "${KDEMAINDIR}" ] +-then + echo Copying icons .. + for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"` + do +- targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i` +- mkdir -p $targetdir ++ targetdir=${DESTDIR}${_PREFIX}/share/icons/`dirname $i` ++ ${BSD_INSTALL_DATA_DIR} $targetdir + destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i` +- cp ${ICON_SOURCE_DIR}/$i $destfile +- chmod 0644 $destfile ++ ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/$i $destfile + done + +- mkdir -p ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application ++if [ "${KDE}" ] ++then + for i in `cat mimelnklist`; do +- cp $i ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-$i ++ cp ${BSD_INSTALL_DATA} ${DESTDIR}${_PREFIX}/share/kde/mimelnk/application/${PREFIX}-$i + done +- chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/* + fi + +-if [ "${GNOMEDIR}" ] ++if [ "${GNOME}" ] + then + echo Copying GNOME icons .. + for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"` + do +- targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i` +- mkdir -p $targetdir ++ targetdir=${DESTDIR}${_PREFIX}/share/icons/gnome/`dirname $i` + destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i` +- cp ${ICON_SOURCE_DIR}/hicolor/$i $destfile +- chmod 0644 $destfile ++ ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/hicolor/$i $destfile + done ++fi + +- mkdir -p ${DESTDIR}/${GNOMEDIR}/share/mime-info +- cp openoffice.mime ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime +- cp openoffice.keys ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys +- chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.* +- +- mkdir -p ${DESTDIR}/${GNOMEDIR}/share/application-registry +- cp openoffice.applications ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.applications +- chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.* ++ ${BSD_INSTALL_DATA} openoffice.mime ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.mime ++ ${BSD_INSTALL_DATA} openoffice.keys ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.keys + +- if [ "${GNOME_MIME_THEME}" ] ++ ${BSD_INSTALL_DATA} openoffice.applications ${DESTDIR}${_PREFIX}/share/application-registry/${PREFIX}.applications ++ ++ if [ ] + then + echo "Creating legacy mimetype symlinks for GNOME .." + # add symlinks so that nautilus can identify the mime-icons +@@ -88,24 +80,17 @@ + ln -sf $link_target_dir${ICON_PREFIX:-}${ICON_PREFIX:+-}extension.png ${link_dir}/gnome-mime-application-vnd.openofficeorg.extension.png + done + fi +-fi +- +-mkdir -p ${DESTDIR}/usr/bin + +-office_root=/opt/${PREFIX} ++office_root=${DESTDIR}${OO_PREFIX} + +-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice ++# ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice + +-cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX} +-cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin +-chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin ++${BSD_INSTALL_SCRIPT} openoffice.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX} ++${BSD_INSTALL_SCRIPT} printeradmin.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX}-printeradmin + +-mkdir -p ${DESTDIR}/usr/share/mime/packages +-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/ +-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml ++${BSD_INSTALL_DATA} openoffice.org.xml ${DESTDIR}${_PREFIX}/share/mime/packages/ + +-mkdir -p ${DESTDIR}/usr/share/applications + for i in `cat launcherlist`; do +- ln -sf ${office_root}/share/xdg/$i ${DESTDIR}/usr/share/applications/${PREFIX}-$i ++ ln -sf ${office_root}/${PREFIX}/share/xdg/$i ${DESTDIR}${_PREFIX}/share/applications/${PREFIX}-$i + done + diff --git a/misc/openoffice3/patches/patch-eg b/misc/openoffice3/patches/patch-eg new file mode 100644 index 000000000000..9e81be41b5ec --- /dev/null +++ b/misc/openoffice3/patches/patch-eg @@ -0,0 +1,8 @@ +$NetBSD: patch-eg,v 1.1 2008/11/22 07:57:03 hira Exp $ + +--- sysui/desktop/share/openoffice.sh.orig 2008-11-22 11:15:35.000000000 +0900 ++++ sysui/desktop/share/openoffice.sh 2008-11-22 11:19:10.000000000 +0900 +@@ -1,2 +1,2 @@ + #!/bin/sh +-exec /opt/%PREFIX/program/soffice "$@" ++exec @OO_PREFIX@/%PREFIX/program/soffice "$@" diff --git a/misc/openoffice3/patches/patch-eh b/misc/openoffice3/patches/patch-eh new file mode 100644 index 000000000000..2d7d2060c17e --- /dev/null +++ b/misc/openoffice3/patches/patch-eh @@ -0,0 +1,9 @@ +$NetBSD: patch-eh,v 1.1 2008/11/22 07:57:03 hira Exp $ + +--- sysui/desktop/share/printeradmin.sh.orig 2008-11-22 11:15:39.000000000 +0900 ++++ sysui/desktop/share/printeradmin.sh 2008-11-22 11:18:57.000000000 +0900 +@@ -1,3 +1,3 @@ + #!/bin/sh + +-exec /opt/%PREFIX/program/spadmin ++exec @OO_PREFIX@/%PREFIX/program/spadmin