Mon Oct 29 14:42:19 2018 UTC ()
Adjust CC_VERSION check from gcc-8* to gcc-[89]*


(abs)
diff -r1.19 -r1.20 pkgsrc/textproc/libodfgen/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/textproc/libodfgen/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libodfgen/Makefile 2018/10/28 16:32:36 1.19
+++ pkgsrc/textproc/libodfgen/Makefile 2018/10/29 14:42:19 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2018/10/28 16:32:36 abs Exp $ 1# $NetBSD: Makefile,v 1.20 2018/10/29 14:42:19 abs Exp $
2 2
3DISTNAME= libodfgen-0.1.6 3DISTNAME= libodfgen-0.1.6
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwpd/libodfgen/libodfgen-${PKGVERSION_NOREV}/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwpd/libodfgen/libodfgen-${PKGVERSION_NOREV}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://libwpd.sourceforge.net/ 10HOMEPAGE= http://libwpd.sourceforge.net/
11COMMENT= Library to generate ODF documents through libwpd and libwps 11COMMENT= Library to generate ODF documents through libwpd and libwps
12LICENSE= mpl-2.0 OR gnu-lgpl-v2 12LICENSE= mpl-2.0 OR gnu-lgpl-v2
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -18,23 +18,23 @@ USE_LANGUAGES= c c++ @@ -18,23 +18,23 @@ USE_LANGUAGES= c c++
18 18
19CONFIGURE_ARGS+= --without-docs 19CONFIGURE_ARGS+= --without-docs
20 20
21PKGCONFIG_OVERRIDE+= libodfgen.pc.in 21PKGCONFIG_OVERRIDE+= libodfgen.pc.in
22 22
23.include "../../mk/compiler.mk" 23.include "../../mk/compiler.mk"
24.if !empty(PKGSRC_COMPILER:Mclang) 24.if !empty(PKGSRC_COMPILER:Mclang)
25CONFIGURE_ARGS+= --with-sharedptr=c++11 25CONFIGURE_ARGS+= --with-sharedptr=c++11
26.else 26.else
27CONFIGURE_ARGS+= --with-sharedptr=tr1 27CONFIGURE_ARGS+= --with-sharedptr=tr1
28.endif 28.endif
29 29
30# Avoid erroring out due to multiple -Werror=parentheses with gcc8 30# Avoid erroring out due to multiple -Werror=parentheses with gcc8
31.if !empty(CC_VERSION:Mgcc-8*) 31.if !empty(CC_VERSION:Mgcc-[89]*)
32CONFIGURE_ARGS+=--disable-werror 32CONFIGURE_ARGS+=--disable-werror
33.endif 33.endif
34 34
35.include "../../converters/libetonyek/buildlink3.mk" 35.include "../../converters/libetonyek/buildlink3.mk"
36.include "../../converters/librevenge/buildlink3.mk" 36.include "../../converters/librevenge/buildlink3.mk"
37.include "../../converters/libwpd/buildlink3.mk" 37.include "../../converters/libwpd/buildlink3.mk"
38.include "../../converters/libwpg/buildlink3.mk" 38.include "../../converters/libwpg/buildlink3.mk"
39.include "../../devel/zlib/buildlink3.mk" 39.include "../../devel/zlib/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"