Mon Dec 7 22:07:24 2009 UTC ()
Remove .orig files left by patch in installation dir.
Noticed by joerg@.


(bad)
diff -r1.2 -r1.3 pkgsrc/misc/openoffice3-bin/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/misc/openoffice3-bin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3-bin/Attic/Makefile 2009/12/02 22:21:16 1.2
+++ pkgsrc/misc/openoffice3-bin/Attic/Makefile 2009/12/07 22:07:23 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2009/12/02 22:21:16 bad Exp $ 1# $NetBSD: Makefile,v 1.3 2009/12/07 22:07:23 bad Exp $
2 2
3DISTNAME= openoffice3-bin # overridden below 3DISTNAME= openoffice3-bin # overridden below
4PKGNAME= openoffice3-bin-${OO_RELEASE} 4PKGNAME= openoffice3-bin-${OO_RELEASE}
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/} 6MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
7 7
8MAINTAINER= bad@NetBSD.org 8MAINTAINER= bad@NetBSD.org
9HOMEPAGE= http://www.openoffice.org/ 9HOMEPAGE= http://www.openoffice.org/
10COMMENT= Integrated office productivity suite (binary pkg) 10COMMENT= Integrated office productivity suite (binary pkg)
11 11
12CONFLICTS+= staroffice-[0-9]* 12CONFLICTS+= staroffice-[0-9]*
13CONFLICTS+= openoffice-[0-9]* 13CONFLICTS+= openoffice-[0-9]*
14CONFLICTS+= openoffice-bin-[0-9]* 14CONFLICTS+= openoffice-bin-[0-9]*
@@ -55,27 +55,29 @@ DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_ @@ -55,27 +55,29 @@ DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_
55WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420 55WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420
56.elif ${EMUL_PLATFORM} == "solaris-i386" 56.elif ${EMUL_PLATFORM} == "solaris-i386"
57DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US 57DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US
58WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages 58WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages
59.elif ${EMUL_PLATFORM} == "solaris-sparc" 59.elif ${EMUL_PLATFORM} == "solaris-sparc"
60DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US 60DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US
61WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages 61WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages
62.endif 62.endif
63 63
64.include "options.mk" 64.include "options.mk"
65 65
66do-install: 66do-install:
67 ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch 67 ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch
 68 ${RM} -f ${PREFIX}/openoffice.org${OO_VER}/program/soffice.orig
68 ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch 69 ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch
 70 ${RM} -f ${PREFIX}/openoffice.org${OO_VER}/program/spadmin.orig
69 uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST 71 uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST
70.if defined(PKG_JVM) && !empty(PKG_JVM) 72.if defined(PKG_JVM) && !empty(PKG_JVM)
71 ${RM} -f ${PREFIX}/bin/soffice 73 ${RM} -f ${PREFIX}/bin/soffice
72 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ 74 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
73 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \ 75 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
74 < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice 76 < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
75 ${CHMOD} +x ${PREFIX}/bin/soffice 77 ${CHMOD} +x ${PREFIX}/bin/soffice
76.else 78.else
77 ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice 79 ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice
78.endif 80.endif
79.for i in scalc sdraw simpress smath spadmin swriter 81.for i in scalc sdraw simpress smath spadmin swriter
80 ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i} 82 ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i}
81.endfor 83.endfor