small fix0rs

5 files changed, 26 insertions, 113 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index 0905ea63b7e1..13c2f17dcd95 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,15 @@
 # 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.6 2002/04/23 18:41:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.7 2002/06/28 11:50:03 seemant Exp $
+
+*openjade-1.3.1-r2 (28 Jun 2002)
+
+  28 Jun 2002; Seemant Kulleen <seemant@gentoo.org> openjade-1.3.1-r3.ebuild
+  files/digest-openjade-1.3.1-r3 :
+
+  elibtoolized, added SLOT and LICENSE, and install header files into
+  /usr/include/OpenSP instead of /usr/include/sp.  Thanks to
+  simons+gentoo@cryp.to (Peter Simons) in bug #3994
 
 *openjade-1.3.1-r2 (23 Apr 2002)
 
diff --git a/app-text/openjade/files/digest-openjade-1.3.1-r1 b/app-text/openjade/files/digest-openjade-1.3.1-r1
deleted file mode 100644
index 06187d8bce59..000000000000
--- a/app-text/openjade/files/digest-openjade-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c453a50001de6cdf132d85ecfb99a0f9 openjade-1.3.1.tar.gz 1397606
diff --git a/app-text/openjade/files/digest-openjade-1.3.1 b/app-text/openjade/files/digest-openjade-1.3.1-r3
index 06187d8bce59..06187d8bce59 100644
--- a/app-text/openjade/files/digest-openjade-1.3.1
+++ b/app-text/openjade/files/digest-openjade-1.3.1-r3
diff --git a/app-text/openjade/openjade-1.3.1-r1.ebuild b/app-text/openjade/openjade-1.3.1-r3.ebuild
index 855a6b278592..5a0fe32f3607 100644
--- a/app-text/openjade/openjade-1.3.1-r1.ebuild
+++ b/app-text/openjade/openjade-1.3.1-r3.ebuild
@@ -1,12 +1,15 @@
 # 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.3 2002/04/07 23:50:23 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.1-r3.ebuild,v 1.1 2002/06/28 11:50:03 seemant Exp $
+
+inherit libtool
 
 S=${WORKDIR}/${P}
-DESCRIPTION="Jade is an implemetation of DSSSL - an ISO standard for formatting SGML (and XML) documents"
+DESCRIPTION="Jade is an implemetation of DSSSL - an ISO standard for formatting SGML and XML documents"
 SRC_URI="http://download.sourceforge.net/openjade/${P}.tar.gz"
 HOMEPAGE="http://openjade.sourceforge.net"
+SLOT=""
+LICENSE="as-is"
 
 DEPEND="virtual/glibc
 	sys-devel/perl"
@@ -17,16 +20,12 @@ RDEPEND="virtual/glibc
 
 src_compile() {
 
-	#real weird setup here. we need to libtoolize to fix .la files.
-	#
-	#Azarah -- (7 April 2002)
 	ln -s config/configure.in configure.in
-	libtoolize --copy --force
+	elibtoolize
 
 	SGML_PREFIX=/usr/share/sgml
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
+	econf \
 		--enable-http \
 		--enable-default-catalog=/etc/sgml/catalog \
 		--enable-default-search-path=/usr/share/sgml \
@@ -50,13 +49,14 @@ src_install() {
 	dosym ospent    /usr/bin/spent
 	dosym osx       /usr/bin/sgml2xml
 
-	insinto /usr/include/sp/generic
+	SPINCDIR="/usr/include/OpenSP"
+	insinto ${SPINCDIR}/generic
 	doins generic/*.h
 
-	insinto /usr/include/sp/include
+	insinto ${SPINCDIR}/include
 	doins include/*.h
 
-	insinto /usr/include/sp/lib
+	insinto ${SPINCDIR}/lib
 	doins lib/*.h
 
 	insinto /usr/share/sgml/${P}/
@@ -66,8 +66,9 @@ src_install() {
 	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}
+# Breaks sgml2xml among other things
+#	insinto /usr/share/sgml/${P}/unicode
+#	doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
 	insinto /usr/share/sgml/${P}/pubtext
 	doins pubtext/*
 
@@ -85,7 +86,7 @@ pkg_postinst() {
   if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
     install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
     install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
-    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
+#    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
     install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
   fi
 }
diff --git a/app-text/openjade/openjade-1.3.1.ebuild b/app-text/openjade/openjade-1.3.1.ebuild
deleted file mode 100644
index 66f3659ce422..000000000000
--- a/app-text/openjade/openjade-1.3.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2000 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.ebuild,v 1.2 2002/04/06 13:34:50 gbevin Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Jade is an implemetation of DSSSL - an ISO standard for formatting SGML (and XML) documents"
-SRC_URI="http://download.sourceforge.net/openjade/${P}.tar.gz"
-HOMEPAGE="http://openjade.sourceforge.net"
-
-DEPEND="virtual/glibc
-	sys-devel/perl"
-
-RDEPEND="virtual/glibc
-	app-text/sgml-common"
-
-
-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
- 
-	make || die
-}
-
-src_install() {                               
-
-  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/*
-
-}
-
-pkg_postinst() {
-  if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
-    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
-    install-catalog --add /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_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
-#}
-
-