From hrs@allbsd.org  Mon Jan 12 07:13:32 2004
Return-Path: <hrs@allbsd.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ADFB416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Jan 2004 07:13:32 -0800 (PST)
Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [211.6.83.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C856643D76
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Jan 2004 07:12:37 -0800 (PST)
	(envelope-from hrs@allbsd.org)
Received: from delta.allbsd.org (p15093-adsao12honb4-acca.tokyo.ocn.ne.jp [219.161.235.93])
	by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id 6E62D17B6
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Jan 2004 00:12:36 +0900 (JST)
Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10])
	by delta.allbsd.org (8.12.9p2/8.12.9) with ESMTP id i0CFAU2R064758
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Jan 2004 00:10:31 +0900 (JST)
	(envelope-from hrs@alph.d.allbsd.org)
Received: from alph.allbsd.org (localhost [127.0.0.1])
	by alph.allbsd.org (8.12.9p2/8.12.9) with ESMTP id i0CFAUpP079184
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Jan 2004 00:10:30 +0900 (JST)
	(envelope-from hrs@alph.d.allbsd.org)
Received: (from hrs@localhost)
	by alph.allbsd.org (8.12.9p2/8.12.9/Submit) id i0CFAUu3079183;
	Tue, 13 Jan 2004 00:10:30 +0900 (JST)
	(envelope-from hrs)
Message-Id: <200401121510.i0CFAUu3079183@alph.allbsd.org>
Date: Tue, 13 Jan 2004 00:10:30 +0900 (JST)
From: Hiroki Sato <hrs@freebsd.org>
Reply-To: Hiroki Sato <hrs@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: textproc/xmlcatmgr 2.0alpha1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61254
>Category:       ports
>Synopsis:       Update port: textproc/xmlcatmgr 2.0alpha1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 12 07:20:17 PST 2004
>Closed-Date:    Mon Jan 12 14:26:59 PST 2004
>Last-Modified:  Mon Jan 12 14:26:59 PST 2004
>Originator:     Hiroki Sato
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Tokyo University of Science
>Environment:
System: FreeBSD alph.allbsd.org 4.9-RC FreeBSD 4.9-RC #0: Sat Oct 25 04:40:22 JST 2003     hrs@alph.allbsd.org:/usr/obj/usr/src/sys/ALPH  i386

>Description:
	Update to 2.0alpha1.  It is quite stable while the name
	includes "alpha".

>How-To-Repeat:
	N/A

>Fix:

Index: xmlcatmgr/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xmlcatmgr/Makefile,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 Makefile
--- xmlcatmgr/Makefile	29 Dec 2003 07:56:40 -0000	1.4
+++ xmlcatmgr/Makefile	12 Jan 2004 14:10:02 -0000
@@ -6,28 +6,57 @@
 #
 
 PORTNAME=	xmlcatmgr
-PORTVERSION=	1.2
+PORTVERSION=	2.0.a1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a1$//}alpha1
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	SGML and XML catalog manager
 
-BUILD_DEPENDS=	buildtool:${PORTSDIR}/devel/buildtool
-
 MAN1=		xmlcatmgr.1
 
-do-configure:
-	cd ${WRKSRC} && buildtool config -p ${PREFIX} \
-		--dir-catalog=${PREFIX}/share/xml \
-		--dir-doc=${DOCSDIR}
+HAS_CONFIGURE=	yes
 
-do-build:
-	cd ${WRKSRC} && buildtool build
+CONFIGURE_SCRIPT=	configure.sh
+CONFIGURE_ARGS=		-D
+CONFIGURE_ARGS+=	-p ${PREFIX}
+CONFIGURE_ARGS+=	-d ${DOCSDIR}
+CONFIGURE_ARGS+=	-c ${CATALOG_PORTS_XML}
+CONFIGURE_ENV=		SED="${SED}"
+CONFIGURE_ENV+=		INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+=		INSTALL_DIR="${INSTALL_DATA_DIR}"
+CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
-do-install:
-	cd ${WRKSRC} && buildtool install
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+BUILD_WRKSRC=		${WRKSRC}/work
+INSTALL_WRKSRC=		${WRKSRC}/work
+
+COMMONVARS=		${WRKDIR}/commonvars.sh
+XMLCATMGR?=		${PREFIX}/bin/xmlcatmgr
+CATALOG_MASTER_SGML?=	${PREFIX}/share/sgml/catalog
+CATALOG_PORTS_SGML?=	${PREFIX}/share/sgml/catalog.ports
+CATALOG_MASTER_XML?=	${PREFIX}/share/xml/catalog
+CATALOG_PORTS_XML?=	${PREFIX}/share/xml/catalog.ports
+
+DOCFILES=		CHANGES COPYING PEOPLE README TODO
+PKGINSTALL=		${WRKDIR}/pkg-install.sh
+PKGDEINSTALL=		${WRKDIR}/pkg-deinstall.sh
+
+post-build:
+	${TOUCH} ${COMMONVARS}
+	${ECHO} '#!/bin/sh' >> ${COMMONVARS}
+	${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin' >> ${COMMONVARS}
+	${ECHO} 'export PATH;' >> ${COMMONVARS}
+.for V in XMLCATMGR CATALOG_MASTER_SGML CATALOG_MASTER_XML CATALOG_PORTS_SGML CATALOG_PORTS_XML
+	${ECHO} '${V}=${${V}}' >> ${COMMONVARS}
+.endfor
+	${CAT} ${COMMONVARS} ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	${CAT} ${COMMONVARS} ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+	${CHMOD} 0555 ${PKGINSTALL} ${PKGDEINSTALL}
+
+post-install:
+	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: xmlcatmgr/distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/xmlcatmgr/distinfo,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.3 distinfo
--- xmlcatmgr/distinfo	29 Dec 2003 07:56:40 -0000	1.3
+++ xmlcatmgr/distinfo	12 Jan 2004 13:15:12 -0000
@@ -1 +1 @@
-MD5 (xmlcatmgr-1.2.tar.gz) = 1a1b0f869d7a45b93c8270e88fd93550
+MD5 (xmlcatmgr-2.0alpha1.tar.gz) = a0b81617f6a979b00871df13ee6a9704
Index: xmlcatmgr/pkg-deinstall
===================================================================
RCS file: xmlcatmgr/pkg-deinstall
diff -N xmlcatmgr/pkg-deinstall
--- xmlcatmgr/pkg-deinstall	30 Jun 2003 13:32:18 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/textproc/xmlcatmgr/pkg-deinstall,v 1.1 2003/06/30 13:32:18 kuriyama Exp $
-
-PATH=${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
-export PATH
-
-CATALOG_MASTER_SGML=${PKG_PREFIX}/share/sgml/catalog
-CATALOG_MASTER_XML=${PKG_PREFIX}/share/xml/catalog
-CATALOG_PORTS_SGML=${PKG_PREFIX}/share/sgml/catalog.ports
-CATALOG_PORTS_XML=${PKG_PREFIX}/share/xml/catalog.ports
-
-XMLCATMGR=${PKG_PREFIX}/bin/xmlcatmgr
-
-case $2 in
-DEINSTALL)
-
-${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
-if [ ! -s ${CATALOG_MASTER_SGML} ]; then
-    rm -f ${CATALOG_MASTER_SGML}
-fi
-if [ ! -s ${CATALOG_PORTS_SGML} ]; then
-    rm -f ${CATALOG_PORTS_SGML}
-fi
-
-T=`mktemp /tmp/_catalog_xml.XXXXXX`
-${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
-${XMLCATMGR} -c /dev/stdout create > ${T}
-if cmp -s ${T} ${CATALOG_MASTER_XML} ]; then
-    rm -f ${CATALOG_MASTER_XML}
-fi
-if cmp -s ${T} ${CATALOG_PORTS_XML} ]; then
-    rm -f ${CATALOG_PORTS_XML}
-fi
-rm -f ${T}
-;;
-esac
Index: xmlcatmgr/pkg-descr
===================================================================
RCS file: /home/ncvs/ports/textproc/xmlcatmgr/pkg-descr,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-descr
--- xmlcatmgr/pkg-descr	30 Jun 2003 13:32:18 -0000	1.1
+++ xmlcatmgr/pkg-descr	12 Jan 2004 13:18:06 -0000
@@ -1,11 +1,7 @@
-xmlcatmgr is a command line script used to manipulate SGML and XML catalogs.
-It is designed with simplicity in mind:  it does not depend on external
-programs nor libraries, so it is ideal to manage catalog files from inside
-pkgsrc.  It is also useful to handle shared directories like share/sgml and
-share/xml.
-
-XML catalogs are files that contain mappings from public identifiers to
-system identifiers.  This allows XML parsers to locate public identifiers
-in the local system.
+XML Catalog Manager (xmlcatmgr in its short form) is a small utility
+used to manipulate SGML and XML catalogs. It is extremely small and
+lightweight, requiring no more dependancies than an awk and a shell
+interpreter. Basically, it allows adding and removing entries from
+catalogs, in a completely automated way.
 
 WWW: http://xmlcatmgr.sourceforge.net/
Index: xmlcatmgr/pkg-install
===================================================================
RCS file: xmlcatmgr/pkg-install
diff -N xmlcatmgr/pkg-install
--- xmlcatmgr/pkg-install	30 Jun 2003 13:32:18 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/textproc/xmlcatmgr/pkg-install,v 1.1 2003/06/30 13:32:18 kuriyama Exp $
-
-PATH=${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
-export PATH
-
-CATALOG_MASTER_SGML=${PKG_PREFIX}/share/sgml/catalog
-CATALOG_MASTER_XML=${PKG_PREFIX}/share/xml/catalog
-CATALOG_PORTS_SGML=${PKG_PREFIX}/share/sgml/catalog.ports
-CATALOG_PORTS_XML=${PKG_PREFIX}/share/xml/catalog.ports
-
-XMLCATMGR=${PKG_PREFIX}/bin/xmlcatmgr
-
-case $2 in
-POST-INSTALL)
-
-if [ ! -r ${CATALOG_MASTER_SGML} ]; then
-    ${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} create
-fi
-
-${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
-${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} add CATALOG catalog.ports
-
-if [ ! -r ${CATALOG_PORTS_SGML} ]; then
-    ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} create
-fi
-
-if [ ! -r ${CATALOG_MASTER_XML} ]; then
-    ${XMLCATMGR} -c ${CATALOG_MASTER_XML} create
-fi
-
-${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
-${XMLCATMGR} -c ${CATALOG_MASTER_XML} add nextCatalog ${CATALOG_PORTS_XML}
-
-if [ ! -r ${CATALOG_PORTS_XML} ]; then
-    ${XMLCATMGR} -c ${CATALOG_PORTS_XML} create
-fi
-;;
-esac
Index: xmlcatmgr/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/xmlcatmgr/pkg-plist,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 pkg-plist
--- xmlcatmgr/pkg-plist	14 Oct 2003 06:16:45 -0000	1.2
+++ xmlcatmgr/pkg-plist	12 Jan 2004 13:35:37 -0000
@@ -4,4 +4,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/PEOPLE
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 @dirrm %%PORTDOCS%%%%DOCSDIR%%
Index: xmlcatmgr/files/pkg-deinstall.in
===================================================================
RCS file: xmlcatmgr/files/pkg-deinstall.in
diff -N xmlcatmgr/files/pkg-deinstall.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xmlcatmgr/files/pkg-deinstall.in	12 Jan 2004 14:02:15 -0000
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+case $2 in
+DEINSTALL)
+
+T=/tmp/catalog.$$
+
+${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
+${XMLCATMGR} -sc ${T} create
+if cmp -s ${T} ${CATALOG_MASTER_SGML} ]; then
+	echo " + Removing ${CATALOG_MASTER_SGML}.  It is empty."
+	rm -f ${CATALOG_MASTER_SGML}
+fi
+if cmp -s ${T} ${CATALOG_PORTS_SGML} ]; then
+	echo " + Removing ${CATALOG_PORTS_SGML}.  It is empty."
+	rm -f ${CATALOG_PORTS_SGML}
+fi
+rm -f ${T}
+
+${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
+${XMLCATMGR} -c ${T} create
+if cmp -s ${T} ${CATALOG_MASTER_XML} ]; then
+	echo " + Removing ${CATALOG_MASTER_XML}.  It is empty."
+	rm -f ${CATALOG_MASTER_XML}
+fi
+if cmp -s ${T} ${CATALOG_PORTS_XML} ]; then
+	echo " + Removing ${CATALOG_PORTS_XML}.  It is empty."
+	rm -f ${CATALOG_PORTS_XML}
+fi
+rm -f ${T}
+;;
+esac
Index: xmlcatmgr/files/pkg-install.in
===================================================================
RCS file: xmlcatmgr/files/pkg-install.in
diff -N xmlcatmgr/files/pkg-install.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xmlcatmgr/files/pkg-install.in	12 Jan 2004 13:58:39 -0000
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+case $2 in
+POST-INSTALL)
+
+if [ ! -r ${CATALOG_MASTER_SGML} ]; then
+	echo " + Creating ${CATALOG_MASTER_SGML}"
+	${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} create
+fi
+
+if ! ${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} lookup catalog.ports > /dev/null 2>&1; then
+	echo " + Registering CATALOG catalog.ports (SGML)"
+	${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} add CATALOG catalog.ports
+fi
+
+if [ ! -r ${CATALOG_PORTS_SGML} ]; then
+	echo " + Creating ${CATALOG_PORTS_SGML}"
+	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} create
+fi
+
+if [ ! -r ${CATALOG_MASTER_XML} ]; then
+	echo " + Creating ${CATALOG_MASTER_XML}"
+	${XMLCATMGR} -c ${CATALOG_MASTER_XML} create
+fi
+
+if ! ${XMLCATMGR} -c ${CATALOG_MASTER_XML} lookup ${CATALOG_PORTS_XML} > /dev/null 2>&1 ; then
+	echo " + Registering nextCatalog catalog.ports (XML)"
+	${XMLCATMGR} -c ${CATALOG_MASTER_XML} add nextCatalog ${CATALOG_PORTS_XML}
+fi
+
+if [ ! -r ${CATALOG_PORTS_XML} ]; then
+	echo " + Creating ${CATALOG_PORTS_XML}"
+	${XMLCATMGR} -c ${CATALOG_PORTS_XML} create
+fi
+;;
+esac
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: ale 
Responsible-Changed-When: Mon Jan 12 07:41:38 PST 2004 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61254 

From: Alex Dupre <ale@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, hrs@FreeBSD.org
Cc: Norikatsu Shigemura <nork@FreeBSD.org>
Subject: Re: ports/61254: Update port: textproc/xmlcatmgr 2.0alpha1
Date: Mon, 12 Jan 2004 17:57:52 +0100

 This is a multi-part message in MIME format.
 --------------010605030509030702020100
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Do you agree with this diff? Basically I slightly modified your port and 
 added patch-configure.sh to correctly support NOPORTDOCS.
 
 --
 Alex Dupre
 
 --------------010605030509030702020100
 Content-Type: text/x-patch;
  name="xmlcatmgr.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="xmlcatmgr.diff"
 
 Index: xmlcatmgr/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/xmlcatmgr/Makefile,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile
 --- xmlcatmgr/Makefile	29 Dec 2003 07:56:40 -0000	1.4
 +++ xmlcatmgr/Makefile	12 Jan 2004 16:50:35 -0000
 @@ -6,28 +6,57 @@
  #
  
  PORTNAME=	xmlcatmgr
 -PORTVERSION=	1.2
 +PORTVERSION=	2.0.a1
  CATEGORIES=	textproc
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 +DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/alpha/}
  
  MAINTAINER=	hrs@FreeBSD.org
  COMMENT=	SGML and XML catalog manager
  
 -BUILD_DEPENDS=	buildtool:${PORTSDIR}/devel/buildtool
 -
  MAN1=		xmlcatmgr.1
  
 -do-configure:
 -	cd ${WRKSRC} && buildtool config -p ${PREFIX} \
 -		--dir-catalog=${PREFIX}/share/xml \
 -		--dir-doc=${DOCSDIR}
 -
 -do-build:
 -	cd ${WRKSRC} && buildtool build
 -
 -do-install:
 -	cd ${WRKSRC} && buildtool install
 -	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 +HAS_CONFIGURE=	yes
 +
 +CONFIGURE_SCRIPT=	configure.sh
 +CONFIGURE_ARGS=		-D
 +CONFIGURE_ARGS+=	-p ${PREFIX}
 +CONFIGURE_ARGS+=	-d ${DOCSDIR}
 +CONFIGURE_ARGS+=	-c ${CATALOG_PORTS_XML}
 +CONFIGURE_ENV=		SED="${SED}"
 +CONFIGURE_ENV+=		INSTALL_DATA="${INSTALL_DATA}"
 +CONFIGURE_ENV+=		INSTALL_DIR="${INSTALL_DATA_DIR}"
 +CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 +CONFIGURE_ENV+=		NOPORTDOCS="${NOPORTDOCS}"
 +
 +BUILD_WRKSRC=		${WRKSRC}/work
 +INSTALL_WRKSRC=		${WRKSRC}/work
 +
 +COMMONVARS=		${WRKDIR}/commonvars.sh
 +XMLCATMGR?=		${PREFIX}/bin/xmlcatmgr
 +CATALOG_MASTER_SGML?=	${PREFIX}/share/sgml/catalog
 +CATALOG_PORTS_SGML?=	${PREFIX}/share/sgml/catalog.ports
 +CATALOG_MASTER_XML?=	${PREFIX}/share/xml/catalog
 +CATALOG_PORTS_XML?=	${PREFIX}/share/xml/catalog.ports
 +
 +PKGINSTALL=		${WRKDIR}/pkg-install.sh
 +PKGDEINSTALL=		${WRKDIR}/pkg-deinstall.sh
 +
 +post-build:
 +	${TOUCH} ${COMMONVARS}
 +	${ECHO} '#!/bin/sh' >> ${COMMONVARS}
 +	${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin' >> ${COMMONVARS}
 +	${ECHO} 'export PATH;' >> ${COMMONVARS}
 +.for V in XMLCATMGR CATALOG_MASTER_SGML CATALOG_MASTER_XML CATALOG_PORTS_SGML CATALOG_PORTS_XML
 +	${ECHO} '${V}=${${V}}' >> ${COMMONVARS}
 +.endfor
 +	${CAT} ${COMMONVARS} ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 +	${CAT} ${COMMONVARS} ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 +	${CHMOD} 0555 ${PKGINSTALL} ${PKGDEINSTALL}
 +
 +post-install:
 +	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
 +	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.mk>
 Index: xmlcatmgr/distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/xmlcatmgr/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- xmlcatmgr/distinfo	29 Dec 2003 07:56:40 -0000	1.3
 +++ xmlcatmgr/distinfo	12 Jan 2004 16:50:35 -0000
 @@ -1 +1 @@
 -MD5 (xmlcatmgr-1.2.tar.gz) = 1a1b0f869d7a45b93c8270e88fd93550
 +MD5 (xmlcatmgr-2.0alpha1.tar.gz) = a0b81617f6a979b00871df13ee6a9704
 Index: xmlcatmgr/pkg-deinstall
 ===================================================================
 RCS file: xmlcatmgr/pkg-deinstall
 diff -N xmlcatmgr/pkg-deinstall
 --- xmlcatmgr/pkg-deinstall	30 Jun 2003 13:32:18 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,36 +0,0 @@
 -#!/bin/sh
 -# $FreeBSD: ports/textproc/xmlcatmgr/pkg-deinstall,v 1.1 2003/06/30 13:32:18 kuriyama Exp $
 -
 -PATH=${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
 -export PATH
 -
 -CATALOG_MASTER_SGML=${PKG_PREFIX}/share/sgml/catalog
 -CATALOG_MASTER_XML=${PKG_PREFIX}/share/xml/catalog
 -CATALOG_PORTS_SGML=${PKG_PREFIX}/share/sgml/catalog.ports
 -CATALOG_PORTS_XML=${PKG_PREFIX}/share/xml/catalog.ports
 -
 -XMLCATMGR=${PKG_PREFIX}/bin/xmlcatmgr
 -
 -case $2 in
 -DEINSTALL)
 -
 -${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
 -if [ ! -s ${CATALOG_MASTER_SGML} ]; then
 -    rm -f ${CATALOG_MASTER_SGML}
 -fi
 -if [ ! -s ${CATALOG_PORTS_SGML} ]; then
 -    rm -f ${CATALOG_PORTS_SGML}
 -fi
 -
 -T=`mktemp /tmp/_catalog_xml.XXXXXX`
 -${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
 -${XMLCATMGR} -c /dev/stdout create > ${T}
 -if cmp -s ${T} ${CATALOG_MASTER_XML} ]; then
 -    rm -f ${CATALOG_MASTER_XML}
 -fi
 -if cmp -s ${T} ${CATALOG_PORTS_XML} ]; then
 -    rm -f ${CATALOG_PORTS_XML}
 -fi
 -rm -f ${T}
 -;;
 -esac
 Index: xmlcatmgr/pkg-descr
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/xmlcatmgr/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- xmlcatmgr/pkg-descr	30 Jun 2003 13:32:18 -0000	1.1
 +++ xmlcatmgr/pkg-descr	12 Jan 2004 16:50:35 -0000
 @@ -1,11 +1,7 @@
 -xmlcatmgr is a command line script used to manipulate SGML and XML catalogs.
 -It is designed with simplicity in mind:  it does not depend on external
 -programs nor libraries, so it is ideal to manage catalog files from inside
 -pkgsrc.  It is also useful to handle shared directories like share/sgml and
 -share/xml.
 -
 -XML catalogs are files that contain mappings from public identifiers to
 -system identifiers.  This allows XML parsers to locate public identifiers
 -in the local system.
 +XML Catalog Manager (xmlcatmgr in its short form) is a small utility
 +used to manipulate SGML and XML catalogs. It is extremely small and
 +lightweight, requiring no more dependancies than an awk and a shell
 +interpreter. Basically, it allows adding and removing entries from
 +catalogs, in a completely automated way.
  
  WWW: http://xmlcatmgr.sourceforge.net/
 Index: xmlcatmgr/pkg-install
 ===================================================================
 RCS file: xmlcatmgr/pkg-install
 diff -N xmlcatmgr/pkg-install
 --- xmlcatmgr/pkg-install	30 Jun 2003 13:32:18 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,39 +0,0 @@
 -#!/bin/sh
 -# $FreeBSD: ports/textproc/xmlcatmgr/pkg-install,v 1.1 2003/06/30 13:32:18 kuriyama Exp $
 -
 -PATH=${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
 -export PATH
 -
 -CATALOG_MASTER_SGML=${PKG_PREFIX}/share/sgml/catalog
 -CATALOG_MASTER_XML=${PKG_PREFIX}/share/xml/catalog
 -CATALOG_PORTS_SGML=${PKG_PREFIX}/share/sgml/catalog.ports
 -CATALOG_PORTS_XML=${PKG_PREFIX}/share/xml/catalog.ports
 -
 -XMLCATMGR=${PKG_PREFIX}/bin/xmlcatmgr
 -
 -case $2 in
 -POST-INSTALL)
 -
 -if [ ! -r ${CATALOG_MASTER_SGML} ]; then
 -    ${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} create
 -fi
 -
 -${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
 -${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} add CATALOG catalog.ports
 -
 -if [ ! -r ${CATALOG_PORTS_SGML} ]; then
 -    ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} create
 -fi
 -
 -if [ ! -r ${CATALOG_MASTER_XML} ]; then
 -    ${XMLCATMGR} -c ${CATALOG_MASTER_XML} create
 -fi
 -
 -${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
 -${XMLCATMGR} -c ${CATALOG_MASTER_XML} add nextCatalog ${CATALOG_PORTS_XML}
 -
 -if [ ! -r ${CATALOG_PORTS_XML} ]; then
 -    ${XMLCATMGR} -c ${CATALOG_PORTS_XML} create
 -fi
 -;;
 -esac
 Index: xmlcatmgr/pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/xmlcatmgr/pkg-plist,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-plist
 --- xmlcatmgr/pkg-plist	14 Oct 2003 06:16:45 -0000	1.2
 +++ xmlcatmgr/pkg-plist	12 Jan 2004 16:50:35 -0000
 @@ -4,4 +4,5 @@
  %%PORTDOCS%%%%DOCSDIR%%/COPYING
  %%PORTDOCS%%%%DOCSDIR%%/PEOPLE
  %%PORTDOCS%%%%DOCSDIR%%/README
 -@dirrm %%PORTDOCS%%%%DOCSDIR%%
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 Index: xmlcatmgr/files/patch-configure.sh
 ===================================================================
 RCS file: xmlcatmgr/files/patch-configure.sh
 diff -N xmlcatmgr/files/patch-configure.sh
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ xmlcatmgr/files/patch-configure.sh	12 Jan 2004 16:50:35 -0000
 @@ -0,0 +1,22 @@
 +--- configure.sh.orig	Tue Dec 23 11:27:37 2003
 ++++ configure.sh	Mon Jan 12 17:37:47 2004
 +@@ -462,16 +462,18 @@
 + install: all
 + EOF
 + 
 +-install_dir ${DIR_DOC} >> ${mkfile}
 + install_dir ${DIR_EXEC} >> ${mkfile}
 + install_dir ${DIR_MAN}/man1 >> ${mkfile}
 + install_program xmlcatmgr ${DIR_EXEC}/xmlcatmgr >> ${mkfile}
 + install_data xmlcatmgr.1 ${DIR_MAN}/man1/xmlcatmgr.1 >> ${mkfile}
 ++if [ ! ${NOPORTDOCS} ]; then
 ++install_dir ${DIR_DOC} >> ${mkfile}
 + install_data ${TOPDIR}/CHANGES ${DIR_DOC}/CHANGES >> ${mkfile}
 + install_data ${TOPDIR}/COPYING ${DIR_DOC}/COPYING >> ${mkfile}
 + install_data ${TOPDIR}/PEOPLE ${DIR_DOC}/PEOPLE >> ${mkfile}
 + install_data ${TOPDIR}/README ${DIR_DOC}/README >> ${mkfile}
 + install_data ${TOPDIR}/TODO ${DIR_DOC}/TODO >> ${mkfile}
 ++fi
 + 
 + echo "# End of generated Makefile." >> ${mkfile}
 + 
 Index: xmlcatmgr/files/pkg-deinstall.in
 ===================================================================
 RCS file: xmlcatmgr/files/pkg-deinstall.in
 diff -N xmlcatmgr/files/pkg-deinstall.in
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ xmlcatmgr/files/pkg-deinstall.in	12 Jan 2004 16:50:35 -0000
 @@ -0,0 +1,32 @@
 +# $FreeBSD$
 +
 +case $2 in
 +DEINSTALL)
 +
 +T=/tmp/catalog.$$
 +
 +${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
 +${XMLCATMGR} -sc ${T} create
 +if cmp -s ${T} ${CATALOG_MASTER_SGML} ]; then
 +	echo " + Removing ${CATALOG_MASTER_SGML}.  It is empty."
 +	rm -f ${CATALOG_MASTER_SGML}
 +fi
 +if cmp -s ${T} ${CATALOG_PORTS_SGML} ]; then
 +	echo " + Removing ${CATALOG_PORTS_SGML}.  It is empty."
 +	rm -f ${CATALOG_PORTS_SGML}
 +fi
 +rm -f ${T}
 +
 +${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
 +${XMLCATMGR} -c ${T} create
 +if cmp -s ${T} ${CATALOG_MASTER_XML} ]; then
 +	echo " + Removing ${CATALOG_MASTER_XML}.  It is empty."
 +	rm -f ${CATALOG_MASTER_XML}
 +fi
 +if cmp -s ${T} ${CATALOG_PORTS_XML} ]; then
 +	echo " + Removing ${CATALOG_PORTS_XML}.  It is empty."
 +	rm -f ${CATALOG_PORTS_XML}
 +fi
 +rm -f ${T}
 +;;
 +esac
 Index: xmlcatmgr/files/pkg-install.in
 ===================================================================
 RCS file: xmlcatmgr/files/pkg-install.in
 diff -N xmlcatmgr/files/pkg-install.in
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ xmlcatmgr/files/pkg-install.in	12 Jan 2004 16:50:35 -0000
 @@ -0,0 +1,36 @@
 +# $FreeBSD$
 +
 +case $2 in
 +POST-INSTALL)
 +
 +if [ ! -r ${CATALOG_MASTER_SGML} ]; then
 +	echo " + Creating ${CATALOG_MASTER_SGML}"
 +	${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} create
 +fi
 +
 +if ! ${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} lookup catalog.ports > /dev/null 2>&1; then
 +	echo " + Registering CATALOG catalog.ports (SGML)"
 +	${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} add CATALOG catalog.ports
 +fi
 +
 +if [ ! -r ${CATALOG_PORTS_SGML} ]; then
 +	echo " + Creating ${CATALOG_PORTS_SGML}"
 +	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} create
 +fi
 +
 +if [ ! -r ${CATALOG_MASTER_XML} ]; then
 +	echo " + Creating ${CATALOG_MASTER_XML}"
 +	${XMLCATMGR} -c ${CATALOG_MASTER_XML} create
 +fi
 +
 +if ! ${XMLCATMGR} -c ${CATALOG_MASTER_XML} lookup ${CATALOG_PORTS_XML} > /dev/null 2>&1 ; then
 +	echo " + Registering nextCatalog catalog.ports (XML)"
 +	${XMLCATMGR} -c ${CATALOG_MASTER_XML} add nextCatalog ${CATALOG_PORTS_XML}
 +fi
 +
 +if [ ! -r ${CATALOG_PORTS_XML} ]; then
 +	echo " + Creating ${CATALOG_PORTS_XML}"
 +	${XMLCATMGR} -c ${CATALOG_PORTS_XML} create
 +fi
 +;;
 +esac
 
 --------------010605030509030702020100--
 

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Alex Dupre <ale@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org, hrs@FreeBSD.org,
	nork@FreeBSD.org
Subject: Re: ports/61254: Update port: textproc/xmlcatmgr 2.0alpha1
Date: Tue, 13 Jan 2004 02:29:15 +0900 (JST)

 On Mon, 12 Jan 2004 17:57:52 +0100
 Alex Dupre <ale@FreeBSD.org> wrote:
 > Do you agree with this diff? Basically I slightly modified your port and 
 > added patch-configure.sh to correctly support NOPORTDOCS.
 
 	Ah!  I think that to modify is not problem:-).  hrs, do you think?

From: Hiroki Sato <hrs@FreeBSD.org>
To: nork@FreeBSD.org
Cc: ale@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org,
	hrs@FreeBSD.org
Subject: Re: ports/61254: Update port: textproc/xmlcatmgr 2.0alpha1
Date: Tue, 13 Jan 2004 04:01:29 +0900 (JST)

 ----Security_Multipart(Tue_Jan_13_04_01_29_2004_380)--
 Content-Type: Text/Plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 Norikatsu Shigemura <nork@FreeBSD.org> wrote
   in <200401121729.i0CHTFeF060060@sakura.ninth-nine.com>:
 
 nork> On Mon, 12 Jan 2004 17:57:52 +0100
 nork> Alex Dupre <ale@FreeBSD.org> wrote:
 nork> > Do you agree with this diff? Basically I slightly modified your port and 
 nork> > added patch-configure.sh to correctly support NOPORTDOCS.
 nork> 
 nork> 	Ah!  I think that to modify is not problem:-).  hrs, do you think?
 
  Gee, I forgot to make NOPORTDOCS work properly.
  Alex, your patch is okay to me.  Thank you for the review.   
 
 -- 
 | Hiroki SATO
 
 ----Security_Multipart(Tue_Jan_13_04_01_29_2004_380)--
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.3 (FreeBSD)
 
 iD8DBQBAAu8LTyzT2CeTzy0RAnngAKCrlCzMiTwnQYNmd2k3X8W8F4+neQCgy8MK
 NNWDfE623uvQekzcaRLYRLs=
 =05NR
 -----END PGP SIGNATURE-----
 
 ----Security_Multipart(Tue_Jan_13_04_01_29_2004_380)----
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Mon Jan 12 14:26:28 PST 2004 
State-Changed-Why:  
Patch committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61254 
>Unformatted:
