fix pkg_postinst

2 files changed, 66 insertions, 60 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index 0f7849cb3bca..f3b058a759e2 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,12 +1,13 @@
 # ChangeLog for app-text/openjade
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.4 2002/04/07 20:21:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.5 2002/04/07 22:11:40 azarah Exp $
 
 *openjade-1.3.1-r1 (06 Apr 2002)
 
   07 Apr 2002; M.Schlemmer <azarah@gentoo.org> openjade-1.3.1-r1.ebuild :
 
-  Another libtool "relink" bug bites the dust ... libtoolized it.
+  Another libtool "relink" bug bites the dust ... libtoolized it.  Also
+  added the catalog removing again.
 
 *openjade-1.3.1 (06 Apr 2002)
 
diff --git a/app-text/openjade/openjade-1.3.1-r1.ebuild b/app-text/openjade/openjade-1.3.1-r1.ebuild
index a0edae3c5bb6..d09ce9bf32fe 100644
--- a/app-text/openjade/openjade-1.3.1-r1.ebuild
+++ b/app-text/openjade/openjade-1.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.1-r1.ebuild,v 1.1 2002/04/07 20:21:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.1-r1.ebuild,v 1.2 2002/04/07 22:11:40 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Jade is an implemetation of DSSSL - an ISO standard for formatting SGML (and XML) documents"
@@ -26,59 +26,58 @@ src_compile() {
 	SGML_PREFIX=/usr/share/sgml
 
 	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --enable-http \
-		    --enable-default-catalog=/etc/sgml/catalog \
-		    --enable-default-search-path=/usr/share/sgml \
-		    --datadir=/usr/share/sgml/${P}
-	assert
+		--prefix=/usr \
+		--enable-http \
+		--enable-default-catalog=/etc/sgml/catalog \
+		--enable-default-search-path=/usr/share/sgml \
+		--datadir=/usr/share/sgml/${P} || die
  
 	make || die
 }
 
 src_install() {                               
 
-  dodir /usr
-  dodir /usr/lib
-  make prefix=${D}/usr \
-  	datadir=${D}/usr/share/sgml/${P} \
-	install || die
+	dodir /usr
+	dodir /usr/lib
+	make prefix=${D}/usr \
+	  	datadir=${D}/usr/share/sgml/${P} \
+		install || die
 	
-  dosym openjade  /usr/bin/jade
-  dosym onsgmls   /usr/bin/nsgmls
-  dosym osgmlnorm /usr/bin/sgmlnorm
-  dosym ospam     /usr/bin/spam
-  dosym ospent    /usr/bin/spent
-  dosym osx 	  /usr/bin/sgml2xml
-
-  insinto /usr/include/sp/generic
-  doins generic/*.h
-
-  insinto /usr/include/sp/include
-  doins include/*.h
-
-  insinto /usr/include/sp/lib
-  doins lib/*.h
-
-  insinto /usr/share/sgml/${P}/
-  doins dsssl/builtins.dsl
-
-  echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${D}/usr/share/sgml/${P}/catalog
-  insinto /usr/share/sgml/${P}/dsssl
-  doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
-  newins ${FILESDIR}/${P}.dsssl-catalog catalog
-#  insinto /usr/share/sgml/${P}/unicode
-#  doins unicode/{catalog,unicode.sd,unicode.syn}
-  insinto /usr/share/sgml/${P}/pubtext
-  doins pubtext/*
-
-  dodoc COPYING NEWS README VERSION
-  docinto html/doc
-  dodoc doc/*.htm
-  docinto html/jadedoc
-  dodoc jadedoc/*.htm
-  docinto html/jadedoc/images
-  dodoc jadedoc/images/*
+	dosym openjade  /usr/bin/jade
+	dosym onsgmls   /usr/bin/nsgmls
+	dosym osgmlnorm /usr/bin/sgmlnorm
+	dosym ospam     /usr/bin/spam
+	dosym ospent    /usr/bin/spent
+	dosym osx       /usr/bin/sgml2xml
+
+	insinto /usr/include/sp/generic
+	doins generic/*.h
+
+	insinto /usr/include/sp/include
+	doins include/*.h
+
+	insinto /usr/include/sp/lib
+	doins lib/*.h
+
+	insinto /usr/share/sgml/${P}/
+	doins dsssl/builtins.dsl
+
+	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${D}/usr/share/sgml/${P}/catalog
+	insinto /usr/share/sgml/${P}/dsssl
+	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
+	newins ${FILESDIR}/${P}.dsssl-catalog catalog
+	insinto /usr/share/sgml/${P}/unicode
+	doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+	insinto /usr/share/sgml/${P}/pubtext
+	doins pubtext/*
+
+	dodoc COPYING NEWS README VERSION
+	docinto html/doc
+	dodoc doc/*.htm
+	docinto html/jadedoc
+	dodoc jadedoc/*.htm
+	docinto html/jadedoc/images
+	dodoc jadedoc/images/*
 
 }
 
@@ -91,15 +90,21 @@ pkg_postinst() {
   fi
 }
 
-#pkg_prerm() {
-# if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-
-#    install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
-#    install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
-#    install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
-#    install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
-
-# fi
-#}
-
+pkg_postrm() {
+	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
+		if [ ! -e /usr/share/sgml/openjade-${PV}/catalog ] && \
+		   [ -e /etc/sgml/${P}.cat ] ; then
+			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
+		fi
+		if [ ! -e /usr/share/sgml/openjade-${PV}/dsssl/catalog ] && \
+		   [ -e /etc/sgml/${P}.cat ] ; then
+			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
+		fi
+		if [ ! -e /usr/share/sgml/openjade-${PV}/unicode/catalog ] && \
+		   [ -e /etc/sgml/${P}.cat ] ; then
+			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
+		fi
+#		install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
+	fi
+}