Update to 0.5.15. Now works more nicely with tcl-8.x; also profits from

the uulib changes (see there).

8 files changed, 26 insertions, 142 deletions

diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 329e5af383a..1bf0d7a04d4 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.17 2001/05/05 19:51:13 jlam Exp $
-# FreeBSD Id: Makefile,v 1.11 1998/02/24 21:43:45 jseger Exp
+# $NetBSD: Makefile,v 1.18 2001/06/10 17:41:01 wiz Exp $
 #
 
-DISTNAME=	uudeview-0.5.13
-PKGNAME=	xdeview-0.5.13
+DISTNAME=	uudeview-0.5.15
+PKGNAME=	xdeview-0.5.15
 CATEGORIES=	converters
-MASTER_SITES=	http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
+MASTER_SITES=	http://www.fpx.de/fp/Software/UUDeview/download/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.informatik.uni-frankfurt.de/~fp/uudeview/
+HOMEPAGE=	http://www.fpx.de/fp/Software/UUDeview/
 COMMENT=	X11 program for uu/xx/Base64/BinHex de-/encoding
 
 DEPENDS+=	tk>=8.3.2:../../x11/tk
-DEPENDS+=	uulib-0.5.13:../../converters/uulib
+DEPENDS+=	uulib-0.5.15:../../converters/uulib
 
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
@@ -25,13 +24,7 @@ CONFIGURE_ENV=	LDFLAGS=-s\
 ALL_TARGET=	xdeview
 INSTALL_TARGET=	install-tcl
 
-PORTDOCDIR=	${PREFIX}/share/doc/xdeview
-DOCFILES=	${FILESDIR}/porting.notes ${WRKSRC}/HOWTO
-
 post-install:
-	@${ECHO_MSG} "===>  Copying documents to ${PORTDOCDIR}"
-	@${INSTALL_DATA_DIR} ${PORTDOCDIR}
-	${INSTALL_DATA} ${DOCFILES} ${PORTDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/man/xdeview.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${PREFIX}/man/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/xdeview/distinfo b/converters/xdeview/distinfo
index c5a6cc40505..f246d893fd9 100644
--- a/converters/xdeview/distinfo
+++ b/converters/xdeview/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:28:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/10 17:41:01 wiz Exp $
 
-SHA1 (uudeview-0.5.13.tar.gz) = 889bbadadede2525bfb90f21863dc4a879b97287
-Size (uudeview-0.5.13.tar.gz) = 259627 bytes
-SHA1 (patch-aa) = 327d033d9dd2fae9362d7e0999bc519386756fb6
-SHA1 (patch-ab) = ee096ff5992b6f0761ca5559a0e9592945035544
-SHA1 (patch-ac) = 1ad59d94648acbd9d8676f9eeb86efae3fdff7c5
-SHA1 (patch-ad) = 21e3b391daf64effe0840ec8c5201b27d3d91ea1
+SHA1 (uudeview-0.5.15.tar.gz) = 56c6916be5082fe7a83b5ab3d9d85c2fc86fd2ee
+Size (uudeview-0.5.15.tar.gz) = 255166 bytes
+SHA1 (patch-ab) = dea2e56b811327e61264627852e1b6bb1eb6a643
+SHA1 (patch-ac) = 57e2b11157b47abfdc2a2f71444feb42e8c012eb
diff --git a/converters/xdeview/files/porting.notes b/converters/xdeview/files/porting.notes
deleted file mode 100644
index e7a5aca6cc7..00000000000
--- a/converters/xdeview/files/porting.notes
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: porting.notes,v 1.2 1998/08/07 10:40:18 agc Exp $
-
-This was originally one distribution for UUdeview, but I have broken
-it up into ``libuu', ``uudeview'', and ``xdeview'', hopefully making
-it cleaner and more useful.
-
-The source itself is quite portable and required no patching, although
-I have added support for compilation as a shared library.
-
-The package is covered under the GNU license.
-
-The author has also written patches to the popular newsreaders `nn'
-and `elm' to allow them to make use of this library.  They are
-available from the website mentioned in this library's 
-associated manpage.
-
-Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
diff --git a/converters/xdeview/patches/patch-aa b/converters/xdeview/patches/patch-aa
deleted file mode 100644
index b5ea26e5710..00000000000
--- a/converters/xdeview/patches/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/09/03 14:45:22 wiz Exp $
---- configure.orig	Thu Jan  9 09:22:00 1997
-+++ configure	Wed Aug 30 13:07:40 2000
-@@ -2202,14 +2202,14 @@
- cat > conftest.$ac_ext <<EOF
- #line 2204 "configure"
- #include "confdefs.h"
-+#include <tk.h>
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char Tk_Main();
- 
- int main() { return 0; }
- int t() {
--Tk_Main()
-+Tk_MainEx(0, (char **)0, (char *)0)
- ; return 0; }
- EOF
- if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-@@ -2245,11 +2245,11 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char Tk_Main();
-+char Tk_MainEx();
- 
- int main() { return 0; }
- int t() {
--Tk_Main()
-+Tk_MainEx(0, (char **)0, (char *)0)
- ; return 0; }
- EOF
- if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-@@ -2286,11 +2286,11 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char Tk_Main();
-+char Tk_MainEx();
- 
- int main() { return 0; }
- int t() {
--Tk_Main()
-+Tk_Main(0, (char **)0, (char *)0)
- ; return 0; }
- EOF
- if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-@@ -3148,7 +3148,7 @@
- 
- fi
- 
--for ac_hdr in fcntl.h unistd.h memory.h malloc.h errno.h direct.h
-+for ac_hdr in fcntl.h unistd.h memory.h errno.h direct.h
- do
- ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/converters/xdeview/patches/patch-ab b/converters/xdeview/patches/patch-ab
index 0ee9c19c998..b4a3e2cbf8a 100644
--- a/converters/xdeview/patches/patch-ab
+++ b/converters/xdeview/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:18 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/06/10 17:41:02 wiz Exp $
 
---- tcl/Makefile.in.orig	Thu Jun  6 13:09:05 1996
-+++ tcl/Makefile.in	Wed Apr  2 00:06:10 1997
+--- tcl/Makefile.in.orig	Mon Jun  4 18:26:57 2001
++++ tcl/Makefile.in
 @@ -95,8 +95,8 @@
- 	rm -f uuwish [Xx]deview gif2gfp
+ 	rm -f uuwish
  	make all
  
 -uuwish:		$(OBJ) ../uulib/libuu.a
@@ -11,5 +11,5 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:40:18 agc Exp $
 +uuwish:		$(OBJ)
 +	$(CC) -o $@ $(OBJ) -luu $(LIBS)
  
- xdeview:	xdeview.head tk_MFSbox.tcl xdeview.tail
- 	rm -f $@
+ xdeview:
+ 	chmod 755 $@
diff --git a/converters/xdeview/patches/patch-ac b/converters/xdeview/patches/patch-ac
index ea1dd7008a0..2ac175edb25 100644
--- a/converters/xdeview/patches/patch-ac
+++ b/converters/xdeview/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:40:18 agc Exp $
+$NetBSD: patch-ac,v 1.3 2001/06/10 17:41:02 wiz Exp $
 
---- Makefile.in.orig	Mon Oct 14 22:19:01 1996
-+++ Makefile.in	Mon Mar  2 01:25:08 1998
-@@ -164,7 +164,7 @@
+--- Makefile.in.orig	Sat Jun  9 14:47:02 2001
++++ Makefile.in
+@@ -167,7 +167,7 @@
  uudeview:	unix/config.h libuu.a
- 	(cd unix;  $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
+ 	(cd unix ; $(MAKE))
  
 -xdeview:	tcl/config.h libuu.a
 +xdeview:	tcl/config.h
- 	(cd tcl;   $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
+ 	(cd tcl ; $(MAKE))
  
  libuu.a:	uulib/config.h
diff --git a/converters/xdeview/patches/patch-ad b/converters/xdeview/patches/patch-ad
deleted file mode 100644
index d436b805fcf..00000000000
--- a/converters/xdeview/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/09/03 14:45:22 wiz Exp $
---- tcl/uuwish.c.orig	Thu Jun  6 15:41:11 1996
-+++ tcl/uuwish.c	Wed Aug 30 13:24:05 2000
-@@ -79,17 +79,20 @@
- main (int argc, char *argv[])
- {
- #ifdef HAVE_TK
--  Tk_Main
-+#ifdef TMAIN_THREE
-+  Tk_Main(argc, argv, Tcl_AppInit);
-+#else
-+  Tk_Main(argc, argv);
-+#endif
- #else
- #ifdef HAVE_TCL
--  Tcl_Main
-+#ifdef TMAIN_THREE
-+  Tcl_Main(argc, argv, Tcl_AppInit);
-+#else
-+  Tcl_Main(argc, argv);
- #endif
- #endif
--    (argc, argv
--#ifdef TMAIN_THREE
--     , Tcl_AppInit
- #endif
--     );
- 
-   return 0;
- }
diff --git a/converters/xdeview/pkg/PLIST b/converters/xdeview/pkg/PLIST
index e2b127cdd96..ab9f28102d0 100644
--- a/converters/xdeview/pkg/PLIST
+++ b/converters/xdeview/pkg/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/03/02 00:35:28 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/06/10 17:41:03 wiz Exp $
 bin/uuwish
 bin/xdeview
-man/man1/xdeview.1.gz
-share/doc/xdeview/HOWTO
-share/doc/xdeview/porting.notes
-@dirrm share/doc/xdeview
+man/man1/xdeview.1