Wed Jul 8 10:34:46 2015 UTC ()
Add docbook-xml and docbook-xsl to avoid nonet load failures as well as
add to xsltproc-nonet.mk a variable XSLTPROC_PATH allowing packages to
specify where to find locally files such as dtds, avoiding warnings like
'warning: failed to load external entity'.

At the same time add a BUILD_DEPENDS to libxslt for xsltproc-nonet.mk
and bump PKGREVISION.


(richard)
diff -r1.100 -r1.101 pkgsrc/textproc/libxslt/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/libxslt/xsltproc-nonet.mk
cvs diff -r1.100 -r1.101 pkgsrc/textproc/libxslt/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libxslt/Makefile 2015/07/04 09:25:48 1.100
+++ pkgsrc/textproc/libxslt/Makefile 2015/07/08 10:34:46 1.101
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.100 2015/07/04 09:25:48 richard Exp $ 1# $NetBSD: Makefile,v 1.101 2015/07/08 10:34:46 richard Exp $
2 2
3DISTNAME= libxslt-1.1.28 3DISTNAME= libxslt-1.1.28
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ftp://xmlsoft.org/libxslt/ \ 6MASTER_SITES= ftp://xmlsoft.org/libxslt/ \
7 http://xmlsoft.org/sources/ 7 http://xmlsoft.org/sources/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://xmlsoft.org/XSLT/ 10HOMEPAGE= http://xmlsoft.org/XSLT/
11COMMENT= XSLT parser library from the GNOME project 11COMMENT= XSLT parser library from the GNOME project
12LICENSE= mit # with advertisement clause 12LICENSE= mit # with advertisement clause
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake perl 15USE_TOOLS+= gmake perl
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2} 17CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
cvs diff -r1.1 -r1.2 pkgsrc/textproc/libxslt/xsltproc-nonet.mk (expand / switch to unified diff)

--- pkgsrc/textproc/libxslt/xsltproc-nonet.mk 2009/10/27 14:37:13 1.1
+++ pkgsrc/textproc/libxslt/xsltproc-nonet.mk 2015/07/08 10:34:46 1.2
@@ -1,9 +1,15 @@ @@ -1,9 +1,15 @@
1# $NetBSD: xsltproc-nonet.mk,v 1.1 2009/10/27 14:37:13 drochner Exp $ 1# $NetBSD: xsltproc-nonet.mk,v 1.2 2015/07/08 10:34:46 richard Exp $
 2
 3BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
2 4
3pre-configure: create-xsltproc-wrapper 5pre-configure: create-xsltproc-wrapper
4 6
 7# --nonet avoids network connections during builds
 8# XLSTPROC_PATH allows any necessary files (e.g. dtds) to be found
 9# locally in the paths provided with the default being '--path .'
5create-xsltproc-wrapper: 10create-xsltproc-wrapper:
6 ${PRINTF} "#! ${SH}\\n\ 11 ${PRINTF} "#! ${SH}\\n\
7 ${LOCALBASE}/bin/xsltproc --nonet \$$*\\n\ 12 ${LOCALBASE}/bin/xsltproc --nonet \
 13 --path ${XLSTPROC_PATH:U.:O:u:ts::Q} \$$*\\n\
8 " > ${BUILDLINK_DIR}/bin/xsltproc 14 " > ${BUILDLINK_DIR}/bin/xsltproc
9 ${CHMOD} +x ${BUILDLINK_DIR}/bin/xsltproc 15 ${CHMOD} +x ${BUILDLINK_DIR}/bin/xsltproc