From fuyuki@mj.0038.net  Sun Dec 30 04:37:32 2001
Return-Path: <fuyuki@mj.0038.net>
Received: from t-mta8.odn.ne.jp (mfep8.odn.ne.jp [143.90.131.186])
	by hub.freebsd.org (Postfix) with ESMTP id D6C6037B405
	for <freebsd-gnats-submit@freebsd.org>; Sun, 30 Dec 2001 04:37:30 -0800 (PST)
Received: from localhost ([61.201.64.62]) by t-mta8.odn.ne.jp with ESMTP
          id <20011230123730150.XOTY.30377.t-mta8.odn.ne.jp@mta8.odn.ne.jp>;
          Sun, 30 Dec 2001 21:37:30 +0900
Message-Id: <20011230123730150.XOTY.30377.t-mta8.odn.ne.jp@mta8.odn.ne.jp>
Date: Sun, 30 Dec 2001 21:37:29 +0900 (JST)
From: Kimura Fuyuki <fuyuki@mj.0038.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: textproc/xhtml doesn't install catalog
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         33342
>Category:       ports
>Synopsis:       textproc/xhtml doesn't install catalog
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kuriyama
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 30 04:40:00 PST 2001
>Closed-Date:    Mon Dec 31 08:11:03 PST 2001
>Last-Modified:  Mon Dec 31 08:11:18 PST 2001
>Originator:     Kimura Fuyuki
>Release:        FreeBSD 4.5-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD ns.test 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #3: Mon Dec 24 14:54:22 JST 2001 root@ns.test:/sack/obj/usr/src/sys/NS i386

>Description:
textproc/xhtml port doesn't install a catalog file correctly so we
have a difficulty when using some kind of tool like psgml.

>How-To-Repeat:
Install textproc/xhtml,

% ls /usr/local/share/xml
dtd

catalog is missing.

>Fix:
This patch would solve the problem, but I'm not certain. I have very
little knowledge about xhtml, dtd, etc.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xhtml/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	2001/02/05 16:35:22	1.2
+++ Makefile	2001/12/30 12:20:15
@@ -13,6 +13,9 @@

 MAINTAINER=	kuriyama@FreeBSD.org

+BUILD_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+
 USE_ZIP=	YES
 NO_MTREE=	YES
 NO_BUILD=	YES
@@ -23,11 +26,16 @@
 DTDFILES=	xhtml-lat1.ent xhtml-special.ent xhtml-symbol.ent \
 		xhtml.soc xhtml1-frameset.dtd xhtml1-strict.dtd \
 		xhtml1-transitional.dtd xhtml1.dcl
+MKCATALOG=	${PREFIX}/sbin/mkcatalog
+PLIST_SUB=	MKCATALOG=${MKCATALOG}

 pre-install:
 	@[ -d ${DTDDIR}	 ] || ${MKDIR} ${DTDDIR}

 do-install:
 	@(cd ${WRKSRC}/DTD; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
+
+post-install:
+	@${MKCATALOG} -c ${INSTDIR}/catalog -q install dtd/xhtml xhtml.soc

 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/xhtml/pkg-plist,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-plist
--- pkg-plist	2000/05/10 13:24:51	1.1.1.1
+++ pkg-plist	2001/12/30 12:20:15
@@ -1,7 +1,9 @@
 share/xml/dtd/xhtml/xhtml-lat1.ent
 share/xml/dtd/xhtml/xhtml-special.ent
 share/xml/dtd/xhtml/xhtml-symbol.ent
+@unexec %%MKCATALOG%% -c %D/share/xml/catalog -q deinstall dtd/xhtml xhtml.soc
 share/xml/dtd/xhtml/xhtml.soc
+@exec %%MKCATALOG%% -c %D/share/xml/catalog -q install dtd/xhtml xhtml.soc
 share/xml/dtd/xhtml/xhtml1-frameset.dtd
 share/xml/dtd/xhtml/xhtml1-strict.dtd
 share/xml/dtd/xhtml/xhtml1-transitional.dtd


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->kuriyama 
Responsible-Changed-By: ijliao 
Responsible-Changed-When: Sun Dec 30 07:44:57 PST 2001 
Responsible-Changed-Why:  
over to maintainer 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=33342 
State-Changed-From-To: open->closed 
State-Changed-By: kuriyama 
State-Changed-When: Mon Dec 31 08:11:03 PST 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=33342 
>Unformatted:
