Date: Sat, 28 Jun 2003 08:30:21 -0700 (PDT) From: Hiroki Sato <hrs@eos.ocn.ne.jp> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/53818: New port: textproc/xmlcatmgr Message-ID: <200306281530.h5SFULo5087885@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/53818; it has been noted by GNATS.
From: Hiroki Sato <hrs@eos.ocn.ne.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/53818: New port: textproc/xmlcatmgr
Date: Sun, 29 Jun 2003 00:28:53 +0900 (JST)
Hiroki Sato <hrs@eos.ocn.ne.jp> wrote
in <200306271630.h5RGUILr005007@freefall.freebsd.org>:
hrs> I see. Thanks, naddy. The revised one is attached.
The previous version of the port skeleton has a problem that
${PREFIX}/share/{sgml,xml}/catalog are destroyed when the port is upgraded.
The additional patch to fix it is attached.
--
| Hiroki SATO <hrs@eos.ocn.ne.jp> / <hrs@FreeBSD.org>
--- xmlcatmgr.shar.old2 Sat Jun 28 00:42:26 2003
+++ xmlcatmgr.shar Sun Jun 29 00:16:01 2003
@@ -11,6 +11,7 @@
# xmlcatmgr/pkg-plist
# xmlcatmgr/pkg-descr
# xmlcatmgr/pkg-message
+# xmlcatmgr/pkg-deinstall
# xmlcatmgr/pkg-install
#
echo c - xmlcatmgr
@@ -54,6 +55,9 @@
Xpost-install:
X @${ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
X
+Xpost-deinstall:
+X @${ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} DEINSTALL
+X
X.include <bsd.port.mk>
END-of-xmlcatmgr/Makefile
echo x - xmlcatmgr/distinfo
@@ -64,10 +68,6 @@
sed 's/^X//' >xmlcatmgr/pkg-plist << 'END-of-xmlcatmgr/pkg-plist'
X@comment $FreeBSD$
Xbin/xmlcatmgr
-Xshare/sgml/catalog
-Xshare/sgml/catalog.ports
-Xshare/xml/catalog
-Xshare/xml/catalog.ports
X@unexec rmdir %D/share/sgml 2> /dev/null || true
X@unexec rmdir %D/share/xml 2> /dev/null || true
END-of-xmlcatmgr/pkg-plist
@@ -109,17 +109,52 @@
X This catalog is for handling XML stuff installed under
X ${PREFIX}/share/xml. It is changed by ports/packages.
END-of-xmlcatmgr/pkg-message
-echo x - xmlcatmgr/pkg-install
-sed 's/^X//' >xmlcatmgr/pkg-install << 'END-of-xmlcatmgr/pkg-install'
+echo x - xmlcatmgr/pkg-deinstall
+sed 's/^X//' >xmlcatmgr/pkg-deinstall << 'END-of-xmlcatmgr/pkg-deinstall'
X#!/bin/sh
X# $FreeBSD$
X
XPATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
Xexport PATH
X
-Xif [ "$2" != "POST-INSTALL" ]; then
-X exit 0
+XCATALOG_MASTER_SGML=${PKG_PREFIX}/share/sgml/catalog
+XCATALOG_MASTER_XML=${PKG_PREFIX}/share/xml/catalog
+XCATALOG_PORTS_SGML=${PKG_PREFIX}/share/sgml/catalog.ports
+XCATALOG_PORTS_XML=${PKG_PREFIX}/share/xml/catalog.ports
+X
+XXMLCATMGR=${PKG_PREFIX}/bin/xmlcatmgr
+X
+Xcase $2 in
+XDEINSTALL)
+X
+X${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
+Xif [ ! -s ${CATALOG_MASTER_SGML} ]; then
+X rm -f ${CATALOG_MASTER_SGML}
+Xfi
+Xif [ ! -s ${CATALOG_PORTS_SGML} ]; then
+X rm -f ${CATALOG_PORTS_SGML}
+Xfi
+X
+XT=`mktemp /tmp/_catalog_xml.XXXXXX`
+X${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
+X${XMLCATMGR} -c /dev/stdout create > ${T}
+Xif cmp -s ${T} ${CATALOG_MASTER_XML} ]; then
+X rm -f ${CATALOG_MASTER_XML}
Xfi
+Xif cmp -s ${T} ${CATALOG_PORTS_XML} ]; then
+X rm -f ${CATALOG_PORTS_XML}
+Xfi
+Xrm -f ${T}
+X;;
+Xesac
+END-of-xmlcatmgr/pkg-deinstall
+echo x - xmlcatmgr/pkg-install
+sed 's/^X//' >xmlcatmgr/pkg-install << 'END-of-xmlcatmgr/pkg-install'
+X#!/bin/sh
+X# $FreeBSD$
+X
+XPATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+Xexport PATH
X
XCATALOG_MASTER_SGML=${PKG_PREFIX}/share/sgml/catalog
XCATALOG_MASTER_XML=${PKG_PREFIX}/share/xml/catalog
@@ -128,6 +163,9 @@
X
XXMLCATMGR=${PKG_PREFIX}/bin/xmlcatmgr
X
+Xcase $2 in
+XPOST-INSTALL)
+X
Xif [ ! -r ${CATALOG_MASTER_SGML} ]; then
X ${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} create
Xfi
@@ -149,6 +187,8 @@
Xif [ ! -r ${CATALOG_PORTS_XML} ]; then
X ${XMLCATMGR} -c ${CATALOG_PORTS_XML} create
Xfi
+X;;
+Xesac
END-of-xmlcatmgr/pkg-install
exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306281530.h5SFULo5087885>