pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/openoffice3-bin This package does strange things ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbf2488b50b7
branches:  trunk
changeset: 568318:bbf2488b50b7
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Dec 10 21:33:39 2009 +0000

description:
This package does strange things during install, but at least is
now does them while handling PKG_DESTDIR_SUPPORT. bump pkgrevision

diffstat:

 misc/openoffice3-bin/Makefile |  27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diffs (66 lines):

diff -r 44b7022e5b85 -r bbf2488b50b7 misc/openoffice3-bin/Makefile
--- a/misc/openoffice3-bin/Makefile     Thu Dec 10 21:19:16 2009 +0000
+++ b/misc/openoffice3-bin/Makefile     Thu Dec 10 21:33:39 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/12/07 22:07:23 bad Exp $
+# $NetBSD: Makefile,v 1.4 2009/12/10 21:33:39 abs Exp $
 
 DISTNAME=              openoffice3-bin # overridden below
 PKGNAME=               openoffice3-bin-${OO_RELEASE}
+PKGREVISION=           1
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
 
@@ -38,7 +39,7 @@
 
 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
@@ -48,6 +49,8 @@
 CHECK_FILES_SKIP+=     ${PREFIX}/openoffice.org/basis${OO_BASEVER}/ure-link
 CHECK_FILES_SKIP+=     ${PREFIX}/openoffice.org${OO_VER}/basis-link
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${EMUL_PLATFORM} == "linux-i386"
@@ -63,23 +66,25 @@
 
 .include "options.mk"
 
+INSTALLATION_DIRS= bin
+
 do-install:
-       ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch
-       ${RM} -f ${PREFIX}/openoffice.org${OO_VER}/program/soffice.orig
-       ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch
-       ${RM} -f ${PREFIX}/openoffice.org${OO_VER}/program/spadmin.orig
+       ${PATCH} -d ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch
+       ${RM} -f ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program/soffice.orig
+       ${PATCH} -d ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch
+       ${RM} -f ${DESTDIR}${PREFIX}/openoffice.org${OO_VER}/program/spadmin.orig
        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"



Home | Main Index | Thread Index | Old Index