Thu Oct 9 19:20:36 2008 UTC ()
Split off options.mk file.
Remove ancient workaround for sparc64/1.6 problem.


(wiz)
diff -r1.95 -r1.96 pkgsrc/textproc/libxml2/Makefile
diff -r0 -r1.1 pkgsrc/textproc/libxml2/options.mk
cvs diff -r1.95 -r1.96 pkgsrc/textproc/libxml2/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/Makefile 2008/10/09 15:01:27 1.95
+++ pkgsrc/textproc/libxml2/Makefile 2008/10/09 19:20:36 1.96
@@ -1,56 +1,45 @@ @@ -1,56 +1,45 @@
1# $NetBSD: Makefile,v 1.95 2008/10/09 15:01:27 tron Exp $ 1# $NetBSD: Makefile,v 1.96 2008/10/09 19:20:36 wiz Exp $
2 2
3DISTNAME= libxml2-2.7.1 3DISTNAME= libxml2-2.7.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ 6MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
7 http://xmlsoft.org/sources/ 7 http://xmlsoft.org/sources/
8#MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.7/} 8#MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.7/}
9 9
10MAINTAINER= recht@NetBSD.org 10MAINTAINER= recht@NetBSD.org
11HOMEPAGE= http://xmlsoft.org/ 11HOMEPAGE= http://xmlsoft.org/
12COMMENT= XML parser library from the GNOME project 12COMMENT= XML parser library from the GNOME project
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18USE_FEATURES= glob 18USE_FEATURES= glob
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20PKGCONFIG_OVERRIDE= libxml-2.0.pc.in 20PKGCONFIG_OVERRIDE= libxml-2.0.pc.in
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 23CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
24CONFIGURE_ARGS+= --with-html-subdir=libxml2 24CONFIGURE_ARGS+= --with-html-subdir=libxml2
25CONFIGURE_ARGS+= --without-python 25CONFIGURE_ARGS+= --without-python
26 26
27PKG_OPTIONS_VAR= PKG_OPTIONS.libxml2 27.include "options.mk"
28PKG_SUPPORTED_OPTIONS+= inet6 
29.include "../../mk/bsd.options.mk" 
30.if !empty(PKG_OPTIONS:Minet6) 
31CONFIGURE_ARGS+= --enable-ipv6 
32.else 
33CONFIGURE_ARGS+= --disable-ipv6 
34.endif 
35 28
36# 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,
37# 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
38CONFIGURE_ARGS+= --without-threads 31CONFIGURE_ARGS+= --without-threads
39 32
40# NetBSD-sparc64-1.6*'s f77 makes configure failing and as f77 is not 
41# needed for this package the following does no harm on other platforms. 
42CONFIGURE_ENV+= F77=${FALSE:Q} 
43 
44MAKE_ENV+= PAX=${PAX:Q} 33MAKE_ENV+= PAX=${PAX:Q}
45 34
46.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
47 36
48.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) 37.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
49USE_TOOLS+= perl 38USE_TOOLS+= perl
50TEST_TARGET= check 39TEST_TARGET= check
51.endif 40.endif
52 41
53SUBST_CLASSES+= cat 42SUBST_CLASSES+= cat
54SUBST_STAGE.cat= pre-configure 43SUBST_STAGE.cat= pre-configure
55SUBST_FILES.cat= catalog.c xmlcatalog.c 44SUBST_FILES.cat= catalog.c xmlcatalog.c
56SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g" 45SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
File Added: pkgsrc/textproc/libxml2/options.mk
# $NetBSD: options.mk,v 1.1 2008/10/09 19:20:36 wiz Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.libxml2
PKG_SUPPORTED_OPTIONS+=	inet6

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+=	--enable-ipv6
.else
CONFIGURE_ARGS+=	--disable-ipv6
.endif