Date: Fri, 27 Jun 2003 09:30:18 -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: <200306271630.h5RGUILr005007@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: naddy@mips.inka.de
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/53818: New port: textproc/xmlcatmgr
Date: Sat, 28 Jun 2003 01:20:51 +0900 (JST)
naddy@mips.inka.de (Christian Weisgerber) wrote
in <bdhk5e$13ga$1@kemoauc.mips.inka.de>:
naddy> > Xpost-install:
naddy> > X @if [ -r ${CATALOG_MASTER_SGML} ]; then\
naddy> > X ${WRKSRC}/bin/xmlcatmgr -sc ${CATALOG_MASTER_SGML} add CATALOG
naddy> > catalog.ports;\
naddy> [...]
naddy>
naddy> So this is only executed when the port is installed, but not when
naddy> the corresponding package is installed. I think this behavior is
naddy> wrong. The commands should be moved into a pkg-install script,
naddy> which will be executed automatically when the package is installed.
naddy> For port installs, you can add a post-install target that simply
naddy> calls pkg-install.
I see. Thanks, naddy. The revised one is attached.
--
| Hiroki SATO <hrs@eos.ocn.ne.jp> / <hrs@FreeBSD.org>
--- /home/hrs/xmlcatmgr.shar.old Sat Jun 28 01:14:10 2003
+++ /home/hrs/xmlcatmgr.shar Sat Jun 28 00:42:26 2003
@@ -11,6 +11,7 @@
# xmlcatmgr/pkg-plist
# xmlcatmgr/pkg-descr
# xmlcatmgr/pkg-message
+# xmlcatmgr/pkg-install
#
echo c - xmlcatmgr
mkdir -p xmlcatmgr > /dev/null 2>&1
@@ -37,7 +38,6 @@
XCATALOG_MASTER_SGML_DIR?= ${PREFIX}/share/sgml
XCATALOG_MASTER_SGML?= ${CATALOG_MASTER_SGML_DIR}/catalog
XCATALOG_PORTS_SGML?= ${CATALOG_MASTER_SGML_DIR}/catalog.ports
-X
XCATALOG_MASTER_XML_DIR?= ${PREFIX}/share/xml
XCATALOG_MASTER_XML?= ${CATALOG_MASTER_XML_DIR}/catalog
XCATALOG_PORTS_XML?= ${CATALOG_MASTER_XML_DIR}/catalog.ports
@@ -51,39 +51,8 @@
XMAKE_ENV+= BT_INSTALL_BIN="${INSTALL_SCRIPT}"
XMAKE_ENV+= BT_INSTALL_DATA="${INSTALL_DATA}"
X
-Xpost-build:
-X @${ECHO} "Creating SGML catalogs..."
-X ${WRKSRC}/bin/xmlcatmgr.sh -sc ${WRKDIR}/catalog.sgml create
-X ${WRKSRC}/bin/xmlcatmgr.sh -sc ${WRKDIR}/catalog.ports.sgml create
-X ${WRKSRC}/bin/xmlcatmgr.sh -sc ${WRKDIR}/catalog.sgml add \
-X CATALOG catalog.ports
-X @${ECHO} "Creating XML catalogs..."
-X ${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.xml create
-X ${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.ports.xml create
-X ${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.xml add \
-X nextCatalog catalog.ports
-X
Xpost-install:
-X @if [ -r ${CATALOG_MASTER_SGML} ]; then\
-X ${WRKSRC}/bin/xmlcatmgr -sc ${CATALOG_MASTER_SGML} add CATALOG catalog.ports;\
-X else\
-X ${INSTALL_DATA} ${WRKDIR}/catalog.sgml ${CATALOG_MASTER_SGML};\
-X fi
-X @if [ -r ${CATALOG_PORTS_SGML} ]; then\
-X echo "Skipped: ${CATALOG_PORTS_SGML} is already exist.";\
-X else\
-X ${INSTALL_DATA} ${WRKDIR}/catalog.ports.sgml ${CATALOG_PORTS_SGML};\
-X fi
-X @if [ -r ${CATALOG_MASTER_XML} ]; then\
-X ${WRKSRC}/bin/xmlcatmgr -c ${CATALOG_MASTER_XML} add nextCatalog catalog.ports;\
-X else\
-X ${INSTALL_DATA} ${WRKDIR}/catalog.xml ${CATALOG_MASTER_XML};\
-X fi
-X @if [ -r ${CATALOG_PORTS_XML} ]; then\
-X echo "Skipped: ${CATALOG_PORTS_XML} is already exist.";\
-X else\
-X ${INSTALL_DATA} ${WRKDIR}/catalog.ports.xml ${CATALOG_PORTS_XML};\
-X fi
+X @${ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
X
X.include <bsd.port.mk>
END-of-xmlcatmgr/Makefile
@@ -99,8 +68,8 @@
Xshare/sgml/catalog.ports
Xshare/xml/catalog
Xshare/xml/catalog.ports
-X@dirrm share/sgml
-X@dirrm share/xml
+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
echo x - xmlcatmgr/pkg-descr
sed 's/^X//' >xmlcatmgr/pkg-descr << 'END-of-xmlcatmgr/pkg-descr'
@@ -114,6 +83,7 @@
Xsystem identifiers. This allows XML parsers to locate public identifiers
Xin the local system.
X
+XWWW: http://xmlcatmgr.sourceforge.net/
END-of-xmlcatmgr/pkg-descr
echo x - xmlcatmgr/pkg-message
sed 's/^X//' >xmlcatmgr/pkg-message << 'END-of-xmlcatmgr/pkg-message'
@@ -121,23 +91,64 @@
X
X 1) ${PREFIX}/share/sgml/catalog
X
-X The top level catalog for SGML stuff. This is not changed
-X by ports/packages but textproc/xmlcatmgr.
+X The top level catalog for SGML stuff. It is not changed
+X by any ports/packages except textproc/xmlcatmgr.
X
X 2) ${PREFIX}/share/sgml/catalog.ports
X
-X The catalog is for handling SGML stuff installed under
-X ${PREFIX}/share/sgml. This is changed by ports/packages.
+X This catalog is for handling SGML stuff installed under
+X ${PREFIX}/share/sgml. It is changed by ports/packages.
X
X 3) ${PREFIX}/share/xml/catalog
X
-X The top level catalog for XML stuff. This is not changed
-X by ports/packages but textproc/xmlcatmgr.
+X The top level catalog for XML stuff. It is not changed
+X by any ports/packages except textproc/xmlcatmgr.
X
X 4) ${PREFIX}/share/xml/catalog.ports
X
-X The catalog is for handling XML stuff installed under
-X ${PREFIX}/share/xml. This is changed by ports/packages.
-X
+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'
+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
+Xfi
+X
+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
+Xif [ ! -r ${CATALOG_MASTER_SGML} ]; then
+X ${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} create
+Xfi
+X
+X${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports
+X${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} add CATALOG catalog.ports
+X
+Xif [ ! -r ${CATALOG_PORTS_SGML} ]; then
+X ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} create
+Xfi
+X
+Xif [ ! -r ${CATALOG_MASTER_XML} ]; then
+X ${XMLCATMGR} -c ${CATALOG_MASTER_XML} create
+Xfi
+X
+X${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML}
+X${XMLCATMGR} -c ${CATALOG_MASTER_XML} add nextCatalog ${CATALOG_PORTS_XML}
+X
+Xif [ ! -r ${CATALOG_PORTS_XML} ]; then
+X ${XMLCATMGR} -c ${CATALOG_PORTS_XML} create
+Xfi
+END-of-xmlcatmgr/pkg-install
exit
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306271630.h5RGUILr005007>