Wed Mar 8 16:09:15 2017 UTC ()
Use local Docbook DTDs.  Fixes issue where xmllint --nonet doesn't actually
work.


(jperkin)
diff -r1.105 -r1.106 pkgsrc/sysutils/dbus/Makefile
cvs diff -r1.105 -r1.106 pkgsrc/sysutils/dbus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/Makefile 2017/02/16 16:07:05 1.105
+++ pkgsrc/sysutils/dbus/Makefile 2017/03/08 16:09:15 1.106
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.105 2017/02/16 16:07:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.106 2017/03/08 16:09:15 jperkin Exp $
2 2
3DISTNAME= dbus-1.10.16 3DISTNAME= dbus-1.10.16
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ 5MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.freedesktop.org/Software/dbus 8HOMEPAGE= http://www.freedesktop.org/Software/dbus
9COMMENT= Message bus system 9COMMENT= Message bus system
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12CONFLICTS+= dbus-glib<0.71 12CONFLICTS+= dbus-glib<0.71
13CONFLICTS+= py27-dbus<0.71 13CONFLICTS+= py27-dbus<0.71
14 14
@@ -46,26 +46,31 @@ CONFIGURE_ARGS+= --enable-checks @@ -46,26 +46,31 @@ CONFIGURE_ARGS+= --enable-checks
46CONFIGURE_ARGS+= --enable-static 46CONFIGURE_ARGS+= --enable-static
47 47
48### 48###
49### XXX the spawn test hangs, and some of these tests may be bogus 49### XXX the spawn test hangs, and some of these tests may be bogus
50### 50###
51#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) 51#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
52#PKG_OPTIONS.dbus+= debug 52#PKG_OPTIONS.dbus+= debug
53#TEST_TARGET= check 53#TEST_TARGET= check
54#.endif 54#.endif
55 55
56CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER} 56CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER}
57CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q} 57CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q}
58 58
 59SUBST_CLASSES+= docbook
 60SUBST_STAGE.docbook= pre-configure
 61SUBST_FILES.docbook= doc/*.xml*
 62SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g'
 63
59PTHREAD_AUTO_VARS= yes 64PTHREAD_AUTO_VARS= yes
60 65
61.if ${OPSYS} == "Linux" 66.if ${OPSYS} == "Linux"
62PLIST.linux= yes 67PLIST.linux= yes
63.else 68.else
64CONFIGURE_ARGS+= --disable-abstract-sockets 69CONFIGURE_ARGS+= --disable-abstract-sockets
65CONFIGURE_ARGS+= --disable-selinux 70CONFIGURE_ARGS+= --disable-selinux
66.endif 71.endif
67 72
68PLIST_VARS+= linux launchd 73PLIST_VARS+= linux launchd
69 74
70DBUS_CONF_DIR= ${PKG_SYSCONFBASE}/dbus-1 75DBUS_CONF_DIR= ${PKG_SYSCONFBASE}/dbus-1
71OWN_DIRS+= ${DBUS_CONF_DIR}/services 76OWN_DIRS+= ${DBUS_CONF_DIR}/services