Tue Sep 7 17:35:29 2010 UTC ()
Remove "CHECK_FILES_SKIP" entries as "rpm2pkg" no longer generates
package lists which trigger false positives.


(tron)
diff -r1.7 -r1.8 pkgsrc/misc/openoffice3-bin/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/misc/openoffice3-bin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3-bin/Attic/Makefile 2010/06/15 16:48:19 1.7
+++ pkgsrc/misc/openoffice3-bin/Attic/Makefile 2010/09/07 17:35:29 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2010/06/15 16:48:19 bad Exp $ 1# $NetBSD: Makefile,v 1.8 2010/09/07 17:35:29 tron 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]*
@@ -36,29 +36,26 @@ EMUL_PLATFORMS= linux-i386 @@ -36,29 +36,26 @@ EMUL_PLATFORMS= linux-i386
36#EMUL_PLATFORMS+= solaris-i386 solaris-sparc 36#EMUL_PLATFORMS+= solaris-i386 solaris-sparc
37EMUL_MODULES.linux= compat freetype2 x11 37EMUL_MODULES.linux= compat freetype2 x11
38EMUL_REQD= suse>=10.0 38EMUL_REQD= suse>=10.0
39 39
40EMUL_PKG_FMT= rpm 40EMUL_PKG_FMT= rpm
41RPMFILES= ${WRKSRC}/RPMS/*.rpm 41RPMFILES= ${WRKSRC}/RPMS/*.rpm
42RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} 42RPM2PKG_PREFIX= ${DESTDIR}${PREFIX}
43RPM2PKG_SUBPREFIX= # empty 43RPM2PKG_SUBPREFIX= # empty
44RPM2PKG_STAGE= do-install 44RPM2PKG_STAGE= do-install
45RUN_LDCONFIG= no 45RUN_LDCONFIG= no
46 46
47USE_TOOLS+= patch 47USE_TOOLS+= patch
48 48
49CHECK_FILES_SKIP+= ${PREFIX}/opt/openoffice.org/basis${OO_BASEVER}/ure-link 
50CHECK_FILES_SKIP+= ${PREFIX}/opt/openoffice.org${OO_VER}/basis-link 
51 
52PKG_DESTDIR_SUPPORT= user-destdir 49PKG_DESTDIR_SUPPORT= user-destdir
53 50
54.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
55 52
56.if ${EMUL_PLATFORM} == "linux-i386" 53.if ${EMUL_PLATFORM} == "linux-i386"
57DISTNAME= OOo_${OO_RELEASE}_Linux_x86_install-rpm_en-US 54DISTNAME= OOo_${OO_RELEASE}_Linux_x86_install-rpm_en-US
58WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502 55WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502
59.elif ${EMUL_PLATFORM} == "solaris-i386" 56.elif ${EMUL_PLATFORM} == "solaris-i386"
60DISTNAME= OOo_${OO_RELEASE}_Solaris_x86_install_en-US 57DISTNAME= OOo_${OO_RELEASE}_Solaris_x86_install_en-US
61WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages 58WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
62.elif ${EMUL_PLATFORM} == "solaris-sparc" 59.elif ${EMUL_PLATFORM} == "solaris-sparc"
63DISTNAME= OOo_${OO_RELEASE}_Solaris_Sparc_install_en-US 60DISTNAME= OOo_${OO_RELEASE}_Solaris_Sparc_install_en-US
64WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages 61WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages