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/openoffice2 | |
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/openoffice2')
-rw-r--r-- | misc/openoffice2/MESSAGE | 4 | ||||
-rw-r--r-- | misc/openoffice2/Makefile | 15 | ||||
-rw-r--r-- | misc/openoffice2/options.mk | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/misc/openoffice2/MESSAGE b/misc/openoffice2/MESSAGE index 41b7e8df982..b6bfa685cca 100644 --- a/misc/openoffice2/MESSAGE +++ b/misc/openoffice2/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2008/10/31 11:02:55 hira Exp $ +$NetBSD: MESSAGE,v 1.3 2008/11/19 01:54:25 hira Exp $ OpenOffice 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. =========================================================================== diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index ce34fe8867f..dd7735c4531 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.58 2008/11/10 17:21:37 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2008/11/19 01:54:25 hira Exp $ # OO_VER= 2.4.2 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice2-${OO_VER} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} DIST_SUBDIR= ${DISTNAME} @@ -124,7 +124,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 @@ -132,7 +131,7 @@ OO_UNXNAME= openoffice.org2.4 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 && \ @@ -152,7 +151,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; \ @@ -161,13 +160,13 @@ do-install: tar xpf $$f; \ done; \ done - for d in ${OO_PREFIX}/share/xdg/*; do \ + for d in ${DESTDIR}${OO_PREFIX}/share/xdg/*; do \ ln -s $$d ${DESTDIR}${PREFIX}/share/applications; \ done - cd ${OO_PREFIX}/program && \ + cd ${DESTDIR}${OO_PREFIX}/program && \ chmod ${SHAREMODE} hid.lst testtoolrc for f in ${OO_PROGRAMS}; do \ - ln -sf ${OO_PREFIX}/program/$$f \ + ln -sf ${DESTDIR}${OO_PREFIX}/program/$$f \ ${DESTDIR}${PREFIX}/bin/$$f; \ done ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk index 54428e128d1..f494a062428 100644 --- a/misc/openoffice2/options.mk +++ b/misc/openoffice2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.21 2008/10/31 11:02:55 hira Exp $ +# $NetBSD: options.mk,v 1.22 2008/11/19 01:54:25 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2 PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd @@ -16,7 +16,7 @@ OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \ .for l in ${OO_SUPPORTED_LANGUAGES} PKG_SUPPORTED_OPTIONS+= lang-${l} .endfor -PKG_SUGGESTED_OPTIONS= gtk2 lang-en-US firefox +PKG_SUGGESTED_OPTIONS= firefox3 gtk2 lang-en-US PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome .include "../../mk/bsd.options.mk" |