diff options
author | hira <hira@pkgsrc.org> | 2008-11-19 01:54:25 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2008-11-19 01:54:25 +0000 |
commit | 169d3ee21f308808ea5b428e7ef86a0fab8f5e4b (patch) | |
tree | 54f131fdc78aa0b3fefb976bd66add44f3c5b960 /misc/openoffice3 | |
parent | 86ddd73c1c134fd5df5aa334df7153bc0132b232 (diff) | |
download | pkgsrc-169d3ee21f308808ea5b428e7ef86a0fab8f5e4b.tar.gz |
- Remove DESTDIR from RPATH.
- Use firefox3 as default instead of firefox.
Pointed out by joerg@. Bump PKGREVISION.
Diffstat (limited to 'misc/openoffice3')
-rw-r--r-- | misc/openoffice3/MESSAGE | 8 | ||||
-rw-r--r-- | misc/openoffice3/Makefile | 21 | ||||
-rw-r--r-- | misc/openoffice3/options.mk | 4 |
3 files changed, 16 insertions, 17 deletions
diff --git a/misc/openoffice3/MESSAGE b/misc/openoffice3/MESSAGE index eb94b338952..0f9bfe226ab 100644 --- a/misc/openoffice3/MESSAGE +++ b/misc/openoffice3/MESSAGE @@ -1,12 +1,12 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2008/10/24 11:35:28 hira Exp $ +$NetBSD: MESSAGE,v 1.4 2008/11/19 01:54:25 hira Exp $ OpenOffice.org has now been installed in ${OO_PREFIX}. Before using this package for the first time, each user has to run a setup program, which is automatically invoked at the first start. Thereafter, OpenOffice can be started using the - ${DESTDIR}${PREFIX}/bin/soffice command. + ${PREFIX}/bin/soffice command. And the files of platform dependent extensions have been installed in ${OO_PREFIX}/extensions. @@ -14,8 +14,8 @@ $NetBSD: MESSAGE,v 1.3 2008/10/24 11:35:28 hira Exp $ How to install/uninstall the extensions: For all users (run by root): - ${DESTDIR}${PREFIX}/bin/unopkg add --shared /path/to/extension.oxt - ${DESTDIR}${PREFIX}/bin/unopkg remove --shared extension.oxt + ${PREFIX}/bin/unopkg add --shared /path/to/extension.oxt + ${PREFIX}/bin/unopkg remove --shared extension.oxt Per user: Run the above commands without `--shared' or use Extension Manager. diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 6abf33f651e..358d08809bf 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2008/11/10 17:21:37 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2008/11/19 01:54:25 hira Exp $ # OO_VER= 3.0.0 -PKGREVISION= 5 +PKGREVISION= 6 OO_TAG= OOO300_m9 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} @@ -130,7 +130,6 @@ OO_RELEASE= OpenOffice.org${OO_VER} PLIST_SRC+= ${PKGDIR}/PLIST PLIST_SRC+= ${WRKDIR}/PLIST PLIST_SUBST+= OO_UNXNAME=${OO_UNXNAME} -MESSAGE_SUBST+= DESTDIR=${DESTDIR} MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX} INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications \ lib/${OO_RELEASE}/extensions @@ -139,7 +138,7 @@ OO_UNXNAME= openoffice.org3 OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install OO_LANGPACKPATH=${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice_languagepack/portable/install OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg -OO_PREFIX= ${DESTDIR}${PREFIX}/lib/${OO_RELEASE} +OO_PREFIX= ${PREFIX}/lib/${OO_RELEASE} post-extract: cd ${WRKSRC}/bridges/source/cpp_uno && \ @@ -160,7 +159,7 @@ post-build: >> ${WRKDIR}/${OO_UNXNAME}-printeradmin do-install: - cd ${OO_PREFIX} && \ + cd ${DESTDIR}${OO_PREFIX} && \ for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do \ tar xpf $$f; \ done; \ @@ -169,17 +168,17 @@ do-install: tar xpf $$f; \ done; \ done - for d in ${OO_PREFIX}/${OO_UNXNAME}/share/xdg/*; do \ + for d in ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/share/xdg/*; do \ ln -s $$d ${DESTDIR}${PREFIX}/share/applications; \ done - cd ${OO_PREFIX}/${OO_UNXNAME}/basis-link/program && \ + cd ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/basis-link/program && \ chmod ${SHAREMODE} hid.lst testtoolrc - for f in ${OO_PROGRAMS}; do \ - ln -sf ${OO_PREFIX}/${OO_UNXNAME}/program/$$f \ - ${DESTDIR}${PREFIX}/bin/$$f; \ + 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 && \ - ${INSTALL_DATA} ${OO_EXTENSIONS} ${OO_PREFIX}/extensions + ${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 diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk index fe4a4274a67..3acf81f76cc 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2008/10/30 11:30:34 hira Exp $ +# $NetBSD: options.mk,v 1.12 2008/11/19 01:54:25 hira Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 @@ -17,7 +17,7 @@ OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs by \ .for l in ${OO_SUPPORTED_LANGUAGES} PKG_SUPPORTED_OPTIONS+= lang-${l} .endfor -PKG_SUGGESTED_OPTIONS= firefox gtk2 lang-en-US +PKG_SUGGESTED_OPTIONS= firefox3 gtk2 lang-en-US PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome .include "../../mk/bsd.options.mk" |