Upgrade to 1.3.1.

Reminded by:	Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>

7 files changed, 14 insertions, 71 deletions

diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 12cc8c860536..0d6fa491c698 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openjade
-PORTVERSION=	1.3
-PORTREVISION=	2
+PORTVERSION=	1.3.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,6 +24,9 @@ PLIST_SUB=	MKCATALOG=${MKCATALOG}
 
 MKCATALOG=	${PREFIX}/sbin/mkcatalog
 
+post-patch:
+	@${CP} ${PREFIX}/bin/libtool ${WRKSRC}/libtool
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/sgml/openjade
 	@${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/openjade
diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo
index fd94193109f1..af7ba4f653ff 100644
--- a/textproc/openjade/distinfo
+++ b/textproc/openjade/distinfo
@@ -1 +1 @@
-MD5 (openjade-1.3.tar.gz) = 4cbc2a8c15431b3f08b4487a5702c938
+MD5 (openjade-1.3.1.tar.gz) = c453a50001de6cdf132d85ecfb99a0f9
diff --git a/textproc/openjade/files/patch-aa b/textproc/openjade/files/patch-aa
deleted file mode 100644
index a77b7020197c..000000000000
--- a/textproc/openjade/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- style/LangObj.cxx~	Fri Jul  2 07:49:58 1999
-+++ style/LangObj.cxx	Tue May 16 12:59:00 2000
-@@ -12,11 +12,11 @@
- #include <string.h>
- #include <ctype.h>
- #include <string.h>
--#include <wchar.h>
--#include <wctype.h>
- 
- #ifdef SP_HAVE_LOCALE
- #include <locale.h>
-+#include <wchar.h>
-+#include <wctype.h>
- #endif
- 
- #ifdef DSSSL_NAMESPACE
diff --git a/textproc/openjade/files/patch-ab b/textproc/openjade/files/patch-ab
deleted file mode 100644
index f5f805a14b13..000000000000
--- a/textproc/openjade/files/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	Wed Sep  1 16:25:58 1999
-+++ configure	Tue May 16 15:39:23 2000
-@@ -1943,15 +1943,15 @@
- rm -f conftest*
- fi
- 
--if eval "test \"`echo '$ac_cv_func_'setlocale`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
--#define SP_HAVE_LOCALE 1
--EOF
--
--else
--  echo "$ac_t""no" 1>&6
--fi
-+# if eval "test \"`echo '$ac_cv_func_'setlocale`\" = yes"; then
-+#   echo "$ac_t""yes" 1>&6
-+#   cat >> confdefs.h <<\EOF
-+# #define SP_HAVE_LOCALE 1
-+# EOF
-+#
-+# else
-+#   echo "$ac_t""no" 1>&6
-+# fi
- 
- echo $ac_n "checking for gettext""... $ac_c" 1>&6
- echo "configure:1958: checking for gettext" >&5
diff --git a/textproc/openjade/files/patch-ac b/textproc/openjade/files/patch-ac
deleted file mode 100644
index bb2d46f9c989..000000000000
--- a/textproc/openjade/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.comm.in.orig	Mon Jun  5 00:24:18 2000
-+++ Makefile.comm.in	Mon Jun  5 00:24:41 2000
-@@ -19,6 +19,7 @@
- PERL=@PERL@
- LIBTOOL=@LIBTOOL@
- INSTALL=@INSTALL@
-+INSTALL_PROGRAM=@INSTALL_PROGRAM@
- 
- LIBOBJS=@LIBOBJS@
- LIBS=@LIBS@
diff --git a/textproc/openjade/files/patch-ad b/textproc/openjade/files/patch-ad
index a32ebb117842..fca2de38d47f 100644
--- a/textproc/openjade/files/patch-ad
+++ b/textproc/openjade/files/patch-ad
@@ -1,11 +1,11 @@
---- Makefile.prog.in.orig	Mon Jun  5 00:26:11 2000
-+++ Makefile.prog.in	Mon Jun  5 00:26:37 2000
-@@ -21,7 +21,7 @@
- install: $(PROG)
- 	-test -d $(bindir) || (mkdir $(bindir); chmod 755 $(bindir))
- 	-rm -f $(bindir)/$(PROG)
--	$(LIBTOOL) --mode=install $(INSTALL) $(PROG) $(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) $(bindir)
+--- Makefile.prog.in.orig	Tue Jan 22 20:57:53 2002
++++ Makefile.prog.in	Fri Mar 15 15:29:12 2002
+@@ -25,7 +25,7 @@
+ 	-test -d $(DESTDIR)$(bindir) || \
+ 	  (mkdir $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
+ 	-rm -f $(DESTDIR)$(bindir)/$(PROG)
+-	$(LIBTOOL) --mode=install $(INSTALL) $(PROG) $(DESTDIR)$(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)
  
  depend: depend_src
  depend.temp: $(GENSRCS)
diff --git a/textproc/openjade/pkg-plist b/textproc/openjade/pkg-plist
index 5acd36cd2121..21ea9f2471f6 100644
--- a/textproc/openjade/pkg-plist
+++ b/textproc/openjade/pkg-plist
@@ -13,8 +13,7 @@ lib/libospgrove.so.0
 lib/libostyle.so
 lib/libostyle.so.0
 @unexec %%MKCATALOG%% -q deinstall openjade
-share/sgml/openjade/ChangeLog
-share/sgml/openjade/Makefile.jadetex
+share/sgml/openjade/README.jadetex
 share/sgml/openjade/builtins.dsl
 share/sgml/openjade/catalog
 share/sgml/openjade/demo.dsl
@@ -22,12 +21,7 @@ share/sgml/openjade/demo.sgm
 share/sgml/openjade/dsssl.dtd
 share/sgml/openjade/extensions.dsl
 share/sgml/openjade/fot.dtd
-share/sgml/openjade/jadetex.dtx
-share/sgml/openjade/jadetex.ini
-share/sgml/openjade/jadetex.ins
-share/sgml/openjade/pdfjadetex.ini
 share/sgml/openjade/style-sheet.dtd
-share/sgml/openjade/unicode.sty
 @dirrm share/sgml/openjade
 @unexec rmdir %D/share/sgml 2>/dev/null || true
 @exec %%MKCATALOG%% -q install openjade