[pkgsrc/trunk]: pkgsrc/textproc ${DESTDIR} shouldn't be included in ${SGML_CA...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0dea165a9260
branches:  trunk
changeset: 557174:0dea165a9260
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Apr 12 07:19:22 2009 +0000

description:
${DESTDIR} shouldn't be included in ${SGML_CATALOGS}.

Bump PKGREVISION.

diffstat:

 textproc/docbook/Makefile               |  8 ++++----
 textproc/dsssl-docbook-modular/Makefile |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r f19178ff8fdd -r 0dea165a9260 textproc/docbook/Makefile
--- a/textproc/docbook/Makefile Sun Apr 12 07:17:15 2009 +0000
+++ b/textproc/docbook/Makefile Sun Apr 12 07:19:22 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2009/04/08 22:43:25 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2009/04/12 07:19:22 minskim Exp $
 
 DISTNAME=      docbook-4.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=          http://www.oasis-open.org/docbook/sgml/4.4/
 SITES.docbook-4.3.zip= http://www.oasis-open.org/docbook/sgml/4.3/
@@ -30,11 +30,11 @@
 EXTRACT_ONLY=  # nothing
 
 INSTDIR=       ${DESTDIR}${PREFIX}/share/sgml/docbook
-ISOCAT=                ${DESTDIR}${PREFIX}/share/sgml/iso8879/catalog
+ISOCAT=                ${PREFIX}/share/sgml/iso8879/catalog
 
 SGML_CATALOGS=
 .for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2 4.3 4.4
-SGML_CATALOGS+=        ${INSTDIR}/${ver}/catalog
+SGML_CATALOGS+=        ${PREFIX}/share/sgml/docbook/${ver}/catalog
 .endfor
 
 do-build:
diff -r f19178ff8fdd -r 0dea165a9260 textproc/dsssl-docbook-modular/Makefile
--- a/textproc/dsssl-docbook-modular/Makefile   Sun Apr 12 07:17:15 2009 +0000
+++ b/textproc/dsssl-docbook-modular/Makefile   Sun Apr 12 07:19:22 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2009/04/08 22:43:25 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/04/12 07:20:10 minskim Exp $
 
 DISTNAME=      docbook-dsssl-1.79
 PKGNAME=       dsssl-docbook-modular-1.79
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=docbook/}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} docbook-dsssl-doc-1.79${EXTRACT_SUFX}
@@ -19,7 +19,7 @@
 USE_LANGUAGES= # empty
 INSTDIR=       ${PREFIX}/share/sgml/docbook/dsssl/modular
 
-SGML_CATALOGS= ${INSTDIR}/catalog
+SGML_CATALOGS= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
 
 do-build:
        @${RM} -rf ${WRKSRC}/docsrc