diff options
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 18 | ||||
| -rw-r--r-- | multimedia/RealPlayerGold/Makefile | 12 |
2 files changed, 19 insertions, 11 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index d7597497e18..5ad2adb17be 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2009/12/06 10:11:14 bad Exp $ +# $NetBSD: Makefile,v 1.43 2011/03/08 12:10:01 obache Exp $ DISTNAME= openoffice2-bin # overridden below PKGNAME= openoffice2-bin-${OO_RELEASE} @@ -17,6 +17,8 @@ CONFLICTS+= openoffice2-[0-9]* CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir + OO_VER= 2.4 OO_RELEASE= 2.4.3 PLIST_SUBST+= VER=${OO_VER:Q} @@ -37,7 +39,7 @@ EMUL_REQD= suse>=10.0 EMUL_PKG_FMT= rpm RPMFILES= ${WRKSRC}/RPMS/*.rpm -RPM2PKG_PREFIX= ${PREFIX} +RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} RPM2PKG_SUBPREFIX= # empty RPM2PKG_STAGE= do-install RUN_LDCONFIG= no @@ -55,21 +57,23 @@ DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages .endif +INSTALLATION_DIRS= bin + .include "options.mk" do-install: uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST .if defined(PKG_JVM) && !empty(PKG_JVM) - ${RM} -f ${PREFIX}/bin/soffice + ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \ - < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice - ${CHMOD} +x ${PREFIX}/bin/soffice + < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice + ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice .else - ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice + ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${DESTDIR}${PREFIX}/bin/soffice .endif .for i in scalc sdraw simpress smath spadmin swriter - ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i} + ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} .endfor .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile index b9d12934c7b..e0366c723d9 100644 --- a/multimedia/RealPlayerGold/Makefile +++ b/multimedia/RealPlayerGold/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2008/02/15 12:25:59 obache Exp $ +# $NetBSD: Makefile,v 1.21 2011/03/08 12:00:15 obache Exp $ # DISTNAME= RealPlayer10GOLD @@ -19,6 +19,8 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} +PKG_DESTDIR_SUPPORT= user-destdir + PKGVER= ${PKGNAME_NOREV:S/^RealPlayerGold-//} DIST_SUBDIR= ${PKGNAME_NOREV} @@ -30,7 +32,7 @@ EMUL_MODULES.linux= base fontconfig freetype2 gtk2 x11 EMUL_PKG_FMT= rpm RPM2PKG_STRIP= 3 -RPM2PKG_PREFIX= ${PREFIX} +RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} RPM2PKG_SUBPREFIX= lib RPM2PKG_STAGE= do-install RUN_LDCONFIG= no @@ -39,10 +41,12 @@ REALPLAYER_HOME= ${PREFIX}/lib/RealPlayer SUBST_CLASSES+= paths SUBST_STAGE.paths= post-install -SUBST_FILES.paths= ${REALPLAYER_HOME}/realplay +SUBST_FILES.paths= ${DESTDIR}${REALPLAYER_HOME}/realplay SUBST_SED.paths= -e 's,/bin/true,${TRUE},g' SUBST_MESSAGE.paths= Fixing hardcoded paths. +INSTALLATION_DIRS+= bin + # Verify that the version of the distfile (which changes often without # the name changing) is still correct. This helps sort out download # errors vs. out-of-date-pkgsrc errors. @@ -60,7 +64,7 @@ do-build: ${FILESDIR}/realplay.sh > ${WRKSRC}/realplay post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/realplay ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/realplay ${DESTDIR}${PREFIX}/bin ${ECHO} bin/realplay >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" |