Thu May 10 04:43:53 2012 UTC ()
Merge wiz's build fixes for goffice0.8. Add pcre's bl3 to Makefile
(was previously only in the bl3 file, which pkglint justifiably
considers broken) and bump PKGREVISION to 16.


(dholland)
diff -r1.24 -r1.25 pkgsrc/misc/goffice0.6/Makefile
diff -r1.6 -r1.7 pkgsrc/misc/goffice0.6/distinfo
diff -r0 -r1.1 pkgsrc/misc/goffice0.6/patches/patch-configure
diff -r0 -r1.1 pkgsrc/misc/goffice0.6/patches/patch-goffice_utils_regutf8.c
cvs diff -r1.24 -r1.25 pkgsrc/misc/goffice0.6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/goffice0.6/Attic/Makefile 2012/03/03 00:11:52 1.24
+++ pkgsrc/misc/goffice0.6/Attic/Makefile 2012/05/10 04:43:53 1.25
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.24 2012/03/03 00:11:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2012/05/10 04:43:53 dholland Exp $
2# 2#
3 3
4DISTNAME= goffice-0.6.6 4DISTNAME= goffice-0.6.6
5PKGNAME= goffice0.6-0.6.6 5PKGNAME= goffice0.6-0.6.6
6PKGREVISION= 15 6PKGREVISION= 16
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goffice/0.6/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goffice/0.6/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Library of document-centric objects and utilities 12COMMENT= Library of document-centric objects and utilities
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS+= goffice<0.4.2nb1 goffice0.5<0.5.4 16CONFLICTS+= goffice<0.4.2nb1 goffice0.5<0.5.4
17 17
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgoffice.pc.in 20PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgoffice.pc.in
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22CONFIGURE_ARGS+= --disable-gnome 22CONFIGURE_ARGS+= --disable-gnome
23USE_TOOLS+= gmake intltool msgfmt pkg-config 23USE_TOOLS+= gmake intltool msgfmt pkg-config
24 24
25.include "../../converters/libiconv/buildlink3.mk" 25.include "../../converters/libiconv/buildlink3.mk"
26.include "../../devel/gettext-lib/buildlink3.mk" 26.include "../../devel/gettext-lib/buildlink3.mk"
 27.include "../../devel/pcre/buildlink3.mk"
27BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 28BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
28.include "../../devel/glib2/buildlink3.mk" 29.include "../../devel/glib2/buildlink3.mk"
29.include "../../devel/libglade/buildlink3.mk" 30.include "../../devel/libglade/buildlink3.mk"
30.include "../../devel/libgsf/buildlink3.mk" 31.include "../../devel/libgsf/buildlink3.mk"
31BUILDLINK_API_DEPENDS.pango+= pango>=1.8.1 32BUILDLINK_API_DEPENDS.pango+= pango>=1.8.1
32.include "../../devel/pango/buildlink3.mk" 33.include "../../devel/pango/buildlink3.mk"
33.include "../../graphics/cairo/buildlink3.mk" 34.include "../../graphics/cairo/buildlink3.mk"
34BUILDLINK_API_DEPENDS.libart+= libart>=2.3.11 35BUILDLINK_API_DEPENDS.libart+= libart>=2.3.11
35.include "../../graphics/libart/buildlink3.mk" 36.include "../../graphics/libart/buildlink3.mk"
36.include "../../textproc/libxml2/buildlink3.mk" 37.include "../../textproc/libxml2/buildlink3.mk"
37BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 38BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
38.include "../../x11/gtk2/buildlink3.mk" 39.include "../../x11/gtk2/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/misc/goffice0.6/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/goffice0.6/Attic/distinfo 2009/01/20 20:41:23 1.6
+++ pkgsrc/misc/goffice0.6/Attic/distinfo 2012/05/10 04:43:53 1.7
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.6 2009/01/20 20:41:23 drochner Exp $ 1$NetBSD: distinfo,v 1.7 2012/05/10 04:43:53 dholland Exp $
2 2
3SHA1 (goffice-0.6.6.tar.gz) = fdb00804de201e057628ba5b997512ab882ca9ea 3SHA1 (goffice-0.6.6.tar.gz) = fdb00804de201e057628ba5b997512ab882ca9ea
4RMD160 (goffice-0.6.6.tar.gz) = d67f6eef8ecc4e26a4ddc807e6682b08d42d86f9 4RMD160 (goffice-0.6.6.tar.gz) = d67f6eef8ecc4e26a4ddc807e6682b08d42d86f9
5Size (goffice-0.6.6.tar.gz) = 3246559 bytes 5Size (goffice-0.6.6.tar.gz) = 3246559 bytes
 6SHA1 (patch-configure) = 820c5696f0d158c83558020ca06b8b8d5e81e5a3
 7SHA1 (patch-goffice_utils_regutf8.c) = 4e058782463cf539339c6ac2782119ae9966eb24
File Added: pkgsrc/misc/goffice0.6/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2012/05/10 04:43:53 dholland Exp $

pcretest -C also reports UTF-16 support, adapt pattern.

--- configure~	2008-09-02 17:35:35.000000000 +0000
+++ configure
@@ -27158,7 +27158,7 @@ fi
 
   { echo "$as_me:$LINENO: checking for UTF-8 support in pcre" >&5
 echo $ECHO_N "checking for UTF-8 support in pcre... $ECHO_C" >&6; }
-  if (pcretest -C 2>&1) | grep -i "^ *UTF-8 support" >/dev/null; then
+  if (pcretest -C 2>&1) | grep -i "^ *UTF-8 .*support" >/dev/null; then
       { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
       LIBS="$LIBS -lpcre"
File Added: pkgsrc/misc/goffice0.6/patches/Attic/patch-goffice_utils_regutf8.c
$NetBSD: patch-goffice_utils_regutf8.c,v 1.1 2012/05/10 04:43:53 dholland Exp $

Replace call to obsolete function.

--- goffice/utils/regutf8.c~	2008-07-08 09:54:59.000000000 +0000
+++ goffice/utils/regutf8.c
@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *p
 		default: return REG_BADPAT;
 		}
 	} else {
-		gor->re_nsub = pcre_info (r, NULL, NULL);
+		pcre_fullinfo (r, NULL, PCRE_INFO_CAPTURECOUNT, &gor->re_nsub);
 		gor->nosub = (cflags & REG_NOSUB) != 0;
 		return 0;
 	}