Mon Feb 16 09:56:15 2015 UTC ()
Bump PKGREVISION.

* buildlink cups instead of cups15.
  Fix normal build with openjdk{7,8}.


(ryoon)
diff -r1.59 -r1.60 pkgsrc/misc/libreoffice4/Makefile
cvs diff -r1.59 -r1.60 pkgsrc/misc/libreoffice4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/Makefile 2015/02/12 11:24:07 1.59
+++ pkgsrc/misc/libreoffice4/Attic/Makefile 2015/02/16 09:56:15 1.60
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.59 2015/02/12 11:24:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.60 2015/02/16 09:56:15 ryoon Exp $
2 2
3VERREL= 4.4.0 3VERREL= 4.4.0
4VERRC= 3 4VERRC= 3
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7PKGNAME= libreoffice4-${VER} 7PKGNAME= libreoffice4-${VER}
8PKGREVISION= 1 8PKGREVISION= 2
9CATEGORIES= misc 9CATEGORIES= misc
10MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 10MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= ryoon@NetBSD.org 13MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= http://www.libreoffice.org/ 14HOMEPAGE= http://www.libreoffice.org/
15COMMENT= Office productivity suite, 4.x branch 15COMMENT= Office productivity suite, 4.x branch
16LICENSE= gnu-lgpl-v3 16LICENSE= gnu-lgpl-v3
17 17
18# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE. 18# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE.
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 20.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
21BUILDLINK_TRANSFORM+= opt:-O2:-O 21BUILDLINK_TRANSFORM+= opt:-O2:-O
@@ -283,27 +283,27 @@ post-install: @@ -283,27 +283,27 @@ post-install:
283.include "../../graphics/lcms2/buildlink3.mk" 283.include "../../graphics/lcms2/buildlink3.mk"
284.include "../../graphics/libgltf/buildlink3.mk" 284.include "../../graphics/libgltf/buildlink3.mk"
285.include "../../graphics/librsvg/buildlink3.mk" 285.include "../../graphics/librsvg/buildlink3.mk"
286.include "../../graphics/png/buildlink3.mk" 286.include "../../graphics/png/buildlink3.mk"
287#.include "../../graphics/sane-backends/buildlink3.mk" 287#.include "../../graphics/sane-backends/buildlink3.mk"
288#.include "../../graphics/vigra/buildlink3.mk" 288#.include "../../graphics/vigra/buildlink3.mk"
289.include "../../lang/python/application.mk" 289.include "../../lang/python/application.mk"
290.include "../../lang/python/tool.mk" 290.include "../../lang/python/tool.mk"
291.include "../../math/coinmp/buildlink3.mk" 291.include "../../math/coinmp/buildlink3.mk"
292.include "../../math/lp_solve/buildlink3.mk" 292.include "../../math/lp_solve/buildlink3.mk"
293.include "../../multimedia/gstreamer1/buildlink3.mk" 293.include "../../multimedia/gstreamer1/buildlink3.mk"
294.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 294.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
295.include "../../net/libcmis/buildlink3.mk" 295.include "../../net/libcmis/buildlink3.mk"
296.include "../../print/cups15/buildlink3.mk" 296.include "../../print/cups/buildlink3.mk"
297.include "../../print/poppler-cpp/buildlink3.mk" 297.include "../../print/poppler-cpp/buildlink3.mk"
298.include "../../print/poppler-includes/buildlink3.mk" 298.include "../../print/poppler-includes/buildlink3.mk"
299.include "../../sysutils/dbus/buildlink3.mk" 299.include "../../sysutils/dbus/buildlink3.mk"
300.include "../../sysutils/dbus-glib/buildlink3.mk" 300.include "../../sysutils/dbus-glib/buildlink3.mk"
301.include "../../sysutils/desktop-file-utils/desktopdb.mk" 301.include "../../sysutils/desktop-file-utils/desktopdb.mk"
302.include "../../textproc/expat/buildlink3.mk" 302.include "../../textproc/expat/buildlink3.mk"
303.include "../../textproc/hunspell/buildlink3.mk" 303.include "../../textproc/hunspell/buildlink3.mk"
304.include "../../textproc/hyphen/buildlink3.mk" 304.include "../../textproc/hyphen/buildlink3.mk"
305.include "../../textproc/icu/buildlink3.mk" 305.include "../../textproc/icu/buildlink3.mk"
306.include "../../textproc/libclucene/buildlink3.mk" 306.include "../../textproc/libclucene/buildlink3.mk"
307.include "../../textproc/libodfgen/buildlink3.mk" 307.include "../../textproc/libodfgen/buildlink3.mk"
308.include "../../textproc/libxml2/buildlink3.mk" 308.include "../../textproc/libxml2/buildlink3.mk"
309.include "../../textproc/libxslt/buildlink3.mk" 309.include "../../textproc/libxslt/buildlink3.mk"