Fri Oct 17 16:06:04 2008 UTC ()
restore the without-threads config arg which I accidentally commented
out in the last update, bump PKGREVISION
fixes PR pkg/39755 by David A. Holland


(drochner)
diff -r1.97 -r1.98 pkgsrc/textproc/libxml2/Makefile

cvs diff -r1.97 -r1.98 pkgsrc/textproc/libxml2/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/Makefile 2008/10/16 13:31:57 1.97
+++ pkgsrc/textproc/libxml2/Makefile 2008/10/17 16:06:04 1.98
@@ -1,43 +1,44 @@ @@ -1,43 +1,44 @@
1# $NetBSD: Makefile,v 1.97 2008/10/16 13:31:57 drochner Exp $ 1# $NetBSD: Makefile,v 1.98 2008/10/17 16:06:04 drochner Exp $
2 2
3DISTNAME= libxml2-2.7.2 3DISTNAME= libxml2-2.7.2
 4PKGREVISION= 1
4CATEGORIES= textproc 5CATEGORIES= textproc
5MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ 6MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
6 http://xmlsoft.org/sources/ 7 http://xmlsoft.org/sources/
7#MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.7/} 8#MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.7/}
8 9
9MAINTAINER= recht@NetBSD.org 10MAINTAINER= recht@NetBSD.org
10HOMEPAGE= http://xmlsoft.org/ 11HOMEPAGE= http://xmlsoft.org/
11COMMENT= XML parser library from the GNOME project 12COMMENT= XML parser library from the GNOME project
12 13
13PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
17USE_FEATURES= glob 18USE_FEATURES= glob
18USE_LIBTOOL= yes 19USE_LIBTOOL= yes
19PKGCONFIG_OVERRIDE= libxml-2.0.pc.in 20PKGCONFIG_OVERRIDE= libxml-2.0.pc.in
20 21
21GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
22CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 23CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
23CONFIGURE_ARGS+= --with-html-subdir=libxml2 24CONFIGURE_ARGS+= --with-html-subdir=libxml2
24CONFIGURE_ARGS+= --without-python 25CONFIGURE_ARGS+= --without-python
25 26
26.include "options.mk" 27.include "options.mk"
27 28
28# Don't use threads - it's not apparent whether it's necessary or not, 29# Don't use threads - it's not apparent whether it's necessary or not,
29# and this library needs to be usable by non-threaded applications too 30# and this library needs to be usable by non-threaded applications too
30#CONFIGURE_ARGS+= --without-threads 31CONFIGURE_ARGS+= --without-threads
31 32
32MAKE_ENV+= PAX=${PAX:Q} 33MAKE_ENV+= PAX=${PAX:Q}
33 34
34.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
35 36
36.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) 37.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
37USE_TOOLS+= perl 38USE_TOOLS+= perl
38TEST_TARGET= check 39TEST_TARGET= check
39.endif 40.endif
40 41
41SUBST_CLASSES+= cat 42SUBST_CLASSES+= cat
42SUBST_STAGE.cat= pre-configure 43SUBST_STAGE.cat= pre-configure
43SUBST_FILES.cat= catalog.c xmlcatalog.c 44SUBST_FILES.cat= catalog.c xmlcatalog.c