Sat Oct 31 23:41:56 2009 UTC ()
Fix registration of the DTD in the catalog by not prefixing the destdir.
This makes the package work again.  Bump PKGREVISION.


(jmmv)
diff -r1.17 -r1.18 pkgsrc/textproc/docbook-simple/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/textproc/docbook-simple/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/docbook-simple/Makefile 2009/06/14 22:58:09 1.17
+++ pkgsrc/textproc/docbook-simple/Makefile 2009/10/31 23:41:56 1.18
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.17 2009/06/14 22:58:09 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2009/10/31 23:41:56 jmmv Exp $
2# 2#
3 3
4DISTNAME= docbook-simple-1.1 4DISTNAME= docbook-simple-1.1
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://docbook.org/xml/simple/1.1/ 7MASTER_SITES= http://docbook.org/xml/simple/1.1/
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= minskim@NetBSD.org 10MAINTAINER= minskim@NetBSD.org
11HOMEPAGE= http://docbook.org/xml/simple/ 11HOMEPAGE= http://docbook.org/xml/simple/
12COMMENT= Simplified DocBook XML DTD 12COMMENT= Simplified DocBook XML DTD
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_LANGUAGES= # empty 16USE_LANGUAGES= # empty
17NO_CONFIGURE= YES 17NO_CONFIGURE= YES
18NO_BUILD= YES 18NO_BUILD= YES
19 19
20WRKSRC= ${WRKDIR} 20WRKSRC= ${WRKDIR}
21INSTDIR= ${DESTDIR}${PREFIX}/share/xml 21DTDDIR= ${PREFIX}/share/xml/docbook/simple/1.1
22DTDDIR= ${INSTDIR}/docbook/simple/1.1 
23DTDFILES= sdbcent.mod sdocbook-custom.dtd sdocbookref-custom.dtd \ 22DTDFILES= sdbcent.mod sdocbook-custom.dtd sdocbookref-custom.dtd \
24 sdbhier.mod sdocbookref.dtd sdbpool.mod sdocbook.dtd \ 23 sdbhier.mod sdocbookref.dtd sdbpool.mod sdocbook.dtd \
25 sinclist.mod 24 sinclist.mod
26MISCFILES= sdocbook.css 25MISCFILES= sdocbook.css
27 26
28XML_CATALOGS= ${DTDDIR}/catalog.xml 27XML_CATALOGS= ${DTDDIR}/catalog.xml
29XML_ENTRIES= rewriteSystem http://www.oasis-open.org/docbook/xml/simple/1.1 \ 28XML_ENTRIES= rewriteSystem http://www.oasis-open.org/docbook/xml/simple/1.1 \
30 ${DTDDIR} 29 ${DTDDIR}
31 30
32do-install: 31do-install:
33 ${INSTALL_DATA_DIR} ${DTDDIR} 32 ${INSTALL_DATA_DIR} ${DESTDIR}${DTDDIR}
34 (cd ${WRKSRC}; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR}) 33 (cd ${WRKSRC}; ${INSTALL_DATA} ${DTDFILES} ${DESTDIR}${DTDDIR})
35 (cd ${WRKSRC}; ${INSTALL_DATA} ${MISCFILES} ${DTDDIR}) 34 (cd ${WRKSRC}; ${INSTALL_DATA} ${MISCFILES} ${DESTDIR}${DTDDIR})
36 ${INSTALL_DATA} ${FILESDIR}/catalog.xml.in ${DTDDIR}/catalog.xml 35 ${INSTALL_DATA} ${FILESDIR}/catalog.xml.in \
 36 ${DESTDIR}${DTDDIR}/catalog.xml
37 37
38.include "../../textproc/xmlcatmgr/catalogs.mk" 38.include "../../textproc/xmlcatmgr/catalogs.mk"
39.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"