Sat Apr 13 09:03:47 2013 UTC ()
Update to 3.6.6

* Add x86_64 binary support on NetBSD/amd64.

Changelog:
* Many important bugfixes


(ryoon)
diff -r1.16 -r1.17 pkgsrc/misc/libreoffice3-bin/Makefile
diff -r1.15 -r1.16 pkgsrc/misc/libreoffice3-bin/distinfo
cvs diff -r1.16 -r1.17 pkgsrc/misc/libreoffice3-bin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice3-bin/Attic/Makefile 2012/10/08 09:57:29 1.16
+++ pkgsrc/misc/libreoffice3-bin/Attic/Makefile 2013/04/13 09:03:47 1.17
@@ -1,68 +1,73 @@ @@ -1,68 +1,73 @@
1# $NetBSD: Makefile,v 1.16 2012/10/08 09:57:29 asau Exp $ 1# $NetBSD: Makefile,v 1.17 2013/04/13 09:03:47 ryoon Exp $
2 2
3DISTNAME= libreoffice3-bin # overridden below 3DISTNAME= libreoffice3-bin # overridden below
4PKGNAME= libreoffice3-bin-${OO_RELEASE} 4PKGNAME= libreoffice3-bin-${OO_RELEASE}
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/ 6MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= http://www.libreoffice.org/ 9HOMEPAGE= http://www.libreoffice.org/
10COMMENT= Integrated office productivity suite (binary pkg) 10COMMENT= Integrated office productivity suite (binary pkg)
11LICENSE= gnu-lgpl-v3 11LICENSE= gnu-lgpl-v3
12 12
13CONFLICTS+= staroffice-[0-9]* 13CONFLICTS+= staroffice-[0-9]*
14CONFLICTS+= openoffice-[0-9]* 14CONFLICTS+= openoffice-[0-9]*
15CONFLICTS+= openoffice-bin-[0-9]* 15CONFLICTS+= openoffice-bin-[0-9]*
16CONFLICTS+= openoffice2-bin-[0-9]* 16CONFLICTS+= openoffice2-bin-[0-9]*
17CONFLICTS+= openoffice2-[0-9]* 17CONFLICTS+= openoffice2-[0-9]*
18CONFLICTS+= openoffice3-[0-9]* 18CONFLICTS+= openoffice3-[0-9]*
19CONFLICTS+= openoffice3-bin-[0-9]* 19CONFLICTS+= openoffice3-bin-[0-9]*
20CONFLICTS+= openoffice-linux-[0-9]* 20CONFLICTS+= openoffice-linux-[0-9]*
21 21
22OO_VER= 3 22OO_VER= 3
23OO_BASEVER= 3.6 23OO_BASEVER= 3.6
24OO_RELEASE= 3.6.2 24OO_RELEASE= 3.6.6
25PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q} 25PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
26MESSAGE_SUBST+= VER=${OO_VER:Q} 26MESSAGE_SUBST+= VER=${OO_VER:Q}
27FILES_SUBST+= VER=${OO_VER:Q} 27FILES_SUBST+= VER=${OO_VER:Q}
28 28
29TEMP?= ${WRKSRC} 29TEMP?= ${WRKSRC}
30EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 30EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
31BUILD_DIRS= # empty 31BUILD_DIRS= # empty
32 32
33PLIST_SRC= ${PKGDIR}/PLIST.proglinks 33PLIST_SRC= ${PKGDIR}/PLIST.proglinks
34PLIST_SRC+= ${WRKDIR}/PLIST 34PLIST_SRC+= ${WRKDIR}/PLIST
35PLIST_SRC+= ${PKGDIR}/PLIST.dirs 35PLIST_SRC+= ${PKGDIR}/PLIST.dirs
36 36
37EMUL_PLATFORMS= linux-i386 37EMUL_PLATFORMS= linux-i386 linux-x86_64
38#EMUL_PLATFORMS+= solaris-i386 solaris-sparc 38#EMUL_PLATFORMS+= solaris-i386 solaris-sparc
39EMUL_MODULES.linux= freetype2 x11 locale png fontconfig 39EMUL_MODULES.linux= freetype2 x11 locale png fontconfig
40EMUL_REQD= suse>=11.3 40EMUL_REQD= suse>=11.3
41 41
42EMUL_PKG_FMT= rpm 42EMUL_PKG_FMT= rpm
43RPMFILES= ${WRKSRC}/RPMS/*.rpm 43RPMFILES= ${WRKSRC}/RPMS/*.rpm
44RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} 44RPM2PKG_PREFIX= ${DESTDIR}${PREFIX}
45RPM2PKG_SUBPREFIX= # empty 45RPM2PKG_SUBPREFIX= # empty
46RPM2PKG_STAGE= do-install 46RPM2PKG_STAGE= do-install
47RUN_LDCONFIG= no 47RUN_LDCONFIG= no
48 48
49USE_TOOLS+= patch 49USE_TOOLS+= patch
50 50
51.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
52 52
53.if ${EMUL_PLATFORM} == "linux-i386" 53.if ${EMUL_PLATFORM} == "linux-i386"
54DISTNAME= LibO_${OO_RELEASE}_Linux_x86_install-rpm_en-US 54DISTNAME= LibO_${OO_RELEASE}_Linux_x86_install-rpm_en-US
55WRKSRC= ${WRKDIR}/LibO_${OO_RELEASE}.2_Linux_x86_install-rpm_en-US 55WRKSRC= ${WRKDIR}/LibO_${OO_RELEASE}.2_Linux_x86_install-rpm_en-US
 56MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/
 57.elif ${EMUL_PLATFORM} == "linux-x86_64"
 58DISTNAME= LibO_${OO_RELEASE}_Linux_x86-64_install-rpm_en-US
 59WRKSRC= ${WRKDIR}/LibO_${OO_RELEASE}.2_Linux_x86-64_install-rpm_en-US
 60MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86_64/
56.elif ${EMUL_PLATFORM} == "solaris-i386" 61.elif ${EMUL_PLATFORM} == "solaris-i386"
57DISTNAME= OOo_${OO_RELEASE}_Solaris_x86_install_en-US 62DISTNAME= OOo_${OO_RELEASE}_Solaris_x86_install_en-US
58WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages 63WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
59.elif ${EMUL_PLATFORM} == "solaris-sparc" 64.elif ${EMUL_PLATFORM} == "solaris-sparc"
60DISTNAME= OOo_${OO_RELEASE}_Solaris_Sparc_install_en-US 65DISTNAME= OOo_${OO_RELEASE}_Solaris_Sparc_install_en-US
61WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages 66WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
62.endif 67.endif
63 68
64.include "options.mk" 69.include "options.mk"
65 70
66INSTALLATION_DIRS= bin 71INSTALLATION_DIRS= bin
67 72
68do-install: 73do-install:
cvs diff -r1.15 -r1.16 pkgsrc/misc/libreoffice3-bin/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice3-bin/Attic/distinfo 2012/10/06 05:30:40 1.15
+++ pkgsrc/misc/libreoffice3-bin/Attic/distinfo 2013/04/13 09:03:47 1.16
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.15 2012/10/06 05:30:40 ryoon Exp $ 1$NetBSD: distinfo,v 1.16 2013/04/13 09:03:47 ryoon Exp $
2 2
3SHA1 (LibO_3.6.2_Linux_x86_install-rpm_en-US.tar.gz) = 7a6d1bd6bf915c85491242d769d41adc2f357d30 3SHA1 (LibO_3.6.6_Linux_x86-64_install-rpm_en-US.tar.gz) = 771e2ffc7b57442548791c36207c279961feb80e
4RMD160 (LibO_3.6.2_Linux_x86_install-rpm_en-US.tar.gz) = 8433ecd9674607bcdb6b85ea5a8392036e4063ae 4RMD160 (LibO_3.6.6_Linux_x86-64_install-rpm_en-US.tar.gz) = 975fefb6707a05a3ccfa5d1a9ba13862741c15c2
5Size (LibO_3.6.2_Linux_x86_install-rpm_en-US.tar.gz) = 172027411 bytes 5Size (LibO_3.6.6_Linux_x86-64_install-rpm_en-US.tar.gz) = 189197277 bytes
 6SHA1 (LibO_3.6.6_Linux_x86_install-rpm_en-US.tar.gz) = 27c38ce78e96f43a2b202a0d136aa59a9ac49a9d
 7RMD160 (LibO_3.6.6_Linux_x86_install-rpm_en-US.tar.gz) = 63138872e0a0a2cdb8ce18b1c1ff1db90176a049
 8Size (LibO_3.6.6_Linux_x86_install-rpm_en-US.tar.gz) = 172420031 bytes