Upgrade to 1.2.1.

Uses autoconf and libtool, now. Thus shared libraries are working now
and the bmakefiles are not necessary any longer.

OK'ed by:	John Fieber <jfieber@FreeBSD.ORG>

4 files changed, 48 insertions, 55 deletions

diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 3d8ddbe3cfaf..3b856e5ca2b8 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -3,25 +3,25 @@
 # Date created:		June 19, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.11 1998/06/05 16:47:12 jfieber Exp $
+# $Id: Makefile,v 1.12 1998/09/28 16:35:54 jfieber Exp $
 #
 
-DISTNAME=	jade1_2
-PKGNAME=	jade-1.2
+DISTNAME=	jade-1.2.1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.jclark.com/pub/jade/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	jfieber@FreeBSD.ORG
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 
-EXTRACT_CMD=	unzip
-EXTRACT_BEFORE_ARGS=	-a -U -qq
-NO_WRKSUBDIR=	yes
-
-# Shared libraries are currently broken for this port.
-# post-install:
-# 	${LDCONFIG} -m ${PREFIX}/lib
+post-install:
+	${MKDIR} ${PREFIX}/include/sp
+	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/sp
+	${MKDIR} ${PREFIX}/share/doc/jade
+	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${PREFIX}/share/doc/jade
+	${MKDIR} ${PREFIX}/share/sgml/jade
+	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${PREFIX}/share/sgml/jade
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m $(PREFIX)/lib
 
 .include <bsd.port.mk>
diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo
index 26a7ecc543be..a9447b5f79b7 100644
--- a/textproc/openjade/distinfo
+++ b/textproc/openjade/distinfo
@@ -1 +1 @@
-MD5 (jade1_2.zip) = c898d09eaaefd4e0074462ad85c645bd
+MD5 (jade-1.2.1.tar.gz) = 4239670ca6b578bff68b8c2e7cd1225f
diff --git a/textproc/openjade/files/patch-aa b/textproc/openjade/files/patch-aa
deleted file mode 100644
index 0970cfee6c77..000000000000
--- a/textproc/openjade/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-*** include/config.h.orig	Wed Jun 12 11:56:06 1996
---- include/config.h	Tue Oct 15 17:08:09 1996
-***************
-*** 7,12 ****
---- 7,18 ----
-  #define SP_INCLUDE_UNISTD_H
-  #define SP_POSIX_FILENAMES
-  
-+ #if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
-+ #define SP_HAVE_LOCALE
-+ #define SP_HAVE_SOCKET
-+ #define SP_MULTI_BYTE
-+ #endif
-+ 
-  #ifdef __GNUG__
-  // It's not missing, but it pulls in libg++
-  #define SP_NEW_H_MISSING
diff --git a/textproc/openjade/pkg-plist b/textproc/openjade/pkg-plist
index 61b7fa1a5c8a..dc698d45a2c6 100644
--- a/textproc/openjade/pkg-plist
+++ b/textproc/openjade/pkg-plist
@@ -35,7 +35,6 @@ include/sp/EntityManager.h
 include/sp/ErrnoMessageArg.h
 include/sp/ErrorCountEventHandler.h
 include/sp/Event.h
-include/sp/EventGenerator.h
 include/sp/EventsWanted.h
 include/sp/ExtendEntityManager.h
 include/sp/ExternalId.h
@@ -93,7 +92,6 @@ include/sp/Owner.h
 include/sp/OwnerTable.cxx
 include/sp/OwnerTable.h
 include/sp/ParserApp.h
-include/sp/ParserEventGeneratorKit.h
 include/sp/ParserOptions.h
 include/sp/PointerTable.cxx
 include/sp/PointerTable.h
@@ -104,7 +102,6 @@ include/sp/RangeMap.cxx
 include/sp/RangeMap.h
 include/sp/Resource.h
 include/sp/RewindStorageObject.h
-include/sp/SGMLApplication.h
 include/sp/SJISCodingSystem.h
 include/sp/SOEntityCatalog.h
 include/sp/Sd.h
@@ -131,11 +128,11 @@ include/sp/UnivCharsetDesc.h
 include/sp/Vector.cxx
 include/sp/Vector.h
 include/sp/Win32CodingSystem.h
-include/sp/WinInetStorage.h
 include/sp/WinApp.h
+include/sp/WinInetStorage.h
+include/sp/XMLCodingSystem.h
 include/sp/XcharMap.cxx
 include/sp/XcharMap.h
-include/sp/XMLCodingSystem.h
 include/sp/config.h
 include/sp/constant.h
 include/sp/macros.h
@@ -143,21 +140,26 @@ include/sp/rtti.h
 include/sp/sptchar.h
 include/sp/types.h
 include/sp/xnew.h
-lib/libsp.a
-@comment lib/libsp.so.1.4
-share/doc/jade/TeX.htm
+lib/libgrove.la
+lib/libgrove.so
+lib/libgrove.so.1.3
+lib/libsp.la
+lib/libsp.so
+lib/libsp.so.1.3
+lib/libspgrove.la
+lib/libspgrove.so
+lib/libspgrove.so.1.3
+lib/libstyle.la
+lib/libstyle.so
+lib/libstyle.so.1.3
 share/doc/jade/archform.htm
 share/doc/jade/build.htm
 share/doc/jade/catalog.htm
 share/doc/jade/charset.htm
-share/doc/jade/copying.txt
-share/doc/jade/dsssl2.htm
 share/doc/jade/features.htm
 share/doc/jade/generic.htm
 share/doc/jade/ideas.htm
 share/doc/jade/index.htm
-share/doc/jade/jade.htm
-share/doc/jade/mif.htm
 share/doc/jade/new.htm
 share/doc/jade/nsgmls.htm
 share/doc/jade/sgmldecl.htm
@@ -168,20 +170,28 @@ share/doc/jade/spent.htm
 share/doc/jade/sx.htm
 share/doc/jade/sysdecl.htm
 share/doc/jade/sysid.htm
-share/doc/jade/transform.htm
 share/doc/jade/xml.htm
-share/sgml/jade/Makefile.jadetex
-share/sgml/jade/catalog
-share/sgml/jade/demo.dsl
-share/sgml/jade/demo.sgm
-share/sgml/jade/dsssl.dtd
-share/sgml/jade/fot.dtd
-share/sgml/jade/style-sheet.dtd
-share/sgml/jade/jadetex.dtx
-share/sgml/jade/jadetex.ini
-share/sgml/jade/jadetex.ins
-share/sgml/jade/pdfjadetex.ini
-@comment @exec /sbin/ldconfig -m %D/lib
+share/sgml/jade/archform.htm
+share/sgml/jade/build.htm
+share/sgml/jade/catalog.htm
+share/sgml/jade/charset.htm
+share/sgml/jade/features.htm
+share/sgml/jade/generic.htm
+share/sgml/jade/ideas.htm
+share/sgml/jade/index.htm
+share/sgml/jade/new.htm
+share/sgml/jade/nsgmls.htm
+share/sgml/jade/sgmldecl.htm
+share/sgml/jade/sgmlnorm.htm
+share/sgml/jade/sgmlsout.htm
+share/sgml/jade/spam.htm
+share/sgml/jade/spent.htm
+share/sgml/jade/sx.htm
+share/sgml/jade/sysdecl.htm
+share/sgml/jade/sysid.htm
+share/sgml/jade/xml.htm
 @dirrm include/sp
 @dirrm share/doc/jade
 @dirrm share/sgml/jade
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R