Upgrade to uulib 0.5.18. This adds support for yEnc.

Significantly inspired by PR: ports/41508 (KATO Tsuguru)

8 files changed, 23 insertions, 25 deletions

diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index b79a83fb4b08..69fac9e823a0 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	uulib
-PORTVERSION=	0.5.13
+PORTVERSION=	0.5.18
 CATEGORIES=	converters
-MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
-		http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
+MASTER_SITES=	http://www.fpx.de/fp/Software/UUDeview/download/
 DISTNAME=	uudeview-${PORTVERSION}
 
 MAINTAINER=	hoek@FreeBSD.org
@@ -24,12 +23,12 @@ ALL_TARGET=	libuu.a	libuu.so.${VERSION}
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "elf"
-VERSION=	1
+VERSION=	2
 .else
-VERSION=	1.0
+VERSION=	2.0
 .endif
 
-DOCFILES=	HISTORY doc/Makefile doc/README doc/binhex.fig \
+DOCFILES=	COPYING HISTORY doc/Makefile doc/README doc/binhex.fig \
 		doc/library.ltx doc/structure.fig doc/td-v1.c doc/td-v2.c \
 		doc/td-v3.c doc/test.txt
 
diff --git a/converters/uulib/distinfo b/converters/uulib/distinfo
index bd0259d935c4..a4f77652cbb9 100644
--- a/converters/uulib/distinfo
+++ b/converters/uulib/distinfo
@@ -1,2 +1 @@
-MD5 (uudeview-0.5.13.tar.gz) = fda32e2de4a6b92eb56f1e286ae3815a
-MD5 (uudeview-0.5.13.tar.gz) = dddf4c01973307c7d203f55c5e0c7fc3
+MD5 (uudeview-0.5.18.tar.gz) = f852ab1a77e946dc7522df06b0c59e35
diff --git a/converters/uulib/files/patch-aa b/converters/uulib/files/patch-aa
index 04b956faad11..cf26a1cde72d 100644
--- a/converters/uulib/files/patch-aa
+++ b/converters/uulib/files/patch-aa
@@ -14,13 +14,13 @@
  	-$(RANLIB) $@
  
 +SOBJS=	$(UULIB_OBJ:.o=.so)
-+libuu.so.1.0:	$(SOBJS)
++libuu.so.2.0:	$(SOBJS)
 +	rm -f $(.TARGET)
-+	ld -Bshareable -x -o libuu.so.1.0 `lorder $(SOBJS) | tsort -q`
++	ld -Bshareable -x -o libuu.so.2.0 `lorder $(SOBJS) | tsort -q`
 +
-+libuu.so.1:	$(SOBJS)
++libuu.so.2:	$(SOBJS)
 +	rm -f $(.TARGET)
-+	ld -shared -x -soname libuu.so.1 -o libuu.so.1 $(SOBJS)
++	$(CC) -shared -Wl,-x,-soname,libuu.so.2 -o libuu.so.2 $(SOBJS)
 +
 +.c.so:
 +	$(CC) -fpic -DPIC -c -o $(.TARGET) $(CFLAGS) $(VDEF) $(.IMPSRC)
diff --git a/converters/uulib/files/patch-ab b/converters/uulib/files/patch-ab
index 412895cdb9ca..f0771d64e6f6 100644
--- a/converters/uulib/files/patch-ab
+++ b/converters/uulib/files/patch-ab
@@ -4,13 +4,13 @@
  libuu.a:	uulib/config.h
  	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
  
-+libuu.so.1.0:	uulib/config.h
++libuu.so.2.0:	uulib/config.h
 +	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \
-+		libuu.so.1.0 )
++		libuu.so.2.0 )
 +
-+libuu.so.1:	uulib/config.h
++libuu.so.2:	uulib/config.h
 +	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \
-+		libuu.so.1 )
++		libuu.so.2 )
 +
  minews:
  	(cd inews; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
diff --git a/converters/uulib/files/uulib.3 b/converters/uulib/files/uulib.3
index 6d8358ef1633..c2bf6ce69e08 100644
--- a/converters/uulib/files/uulib.3
+++ b/converters/uulib/files/uulib.3
@@ -1,18 +1,17 @@
-.Dd October, 1996
+.Dd September, 2002
 .Dt UULIB 3
 .Sh NAME
 .Nm libuu
 .Nd Decoding Library Programming Interface
 .Sh DESCRIPTION
-This library is used for encoding/unencoding uuencoded, xxencoded, 
-and Base64 encoded files.  It can also unencode BinHex files (but not
-encode them).
+This library is used for encoding and decoding files that are
+uuencoded, xxencoded, Base64-encoded, BinHex-encoded, and yEnc-encoded.
 .Sh DOCUMENTATION
 Documentation for uulib is contained in FUNKYTOKENHEREshare/doc/uulib.
 .Sh AUTHOR
 .Ar Libuu
 is written by
-.Nm Frank Pilhofer <fp@informatik.uni-frankfurt.de>
+.Nm Frank Pilhofer <fp@fpx.de>
 with thanks to
 .Nm Michael Newcomb,
 .Nm Nico Mak,
@@ -24,6 +23,6 @@ and
 .Xr uudeview 1
 .Xr xdeview 1
 
-http://zeus.informatik.uni-frankfurt.de/~fp/uudeview
+http://www.fpx.de/fp/Software/UUDeview/
 .Sh HISTORY
 See the file FUNKYTOKENHEREshare/doc/uulib/HISTORY.
diff --git a/converters/uulib/pkg-comment b/converters/uulib/pkg-comment
index b952a9de5c79..485a85cc4ef8 100644
--- a/converters/uulib/pkg-comment
+++ b/converters/uulib/pkg-comment
@@ -1 +1 @@
-A library for uu/xx/Base64/BinHex de-/encoding
+A library for uu/xx/Base64/BinHex/yEnc de-/encoding
diff --git a/converters/uulib/pkg-descr b/converters/uulib/pkg-descr
index 3bc061e87527..3ee326995ffb 100644
--- a/converters/uulib/pkg-descr
+++ b/converters/uulib/pkg-descr
@@ -4,6 +4,6 @@ This library is able to encode/decode files in the following formats:
         xxencode
         Base64
         BinHex
-		yEnc
+	yEnc
 
 WWW: http://www.fpx.de/fp/Software/UUDeview/
diff --git a/converters/uulib/pkg-plist b/converters/uulib/pkg-plist
index c5865b2aee50..cb91049d7218 100644
--- a/converters/uulib/pkg-plist
+++ b/converters/uulib/pkg-plist
@@ -1,6 +1,6 @@
 lib/libuu.a
 lib/libuu.so
-lib/libuu.so.1
+lib/libuu.so.2
 include/uudeview.h
 %%PORTDOCS%%share/doc/uulib/Makefile
 %%PORTDOCS%%share/doc/uulib/README
@@ -13,4 +13,5 @@ include/uudeview.h
 %%PORTDOCS%%share/doc/uulib/test.txt
 %%PORTDOCS%%share/doc/uulib/porting.notes
 %%PORTDOCS%%share/doc/uulib/HISTORY
+%%PORTDOCS%%share/doc/uulib/COPYING
 %%PORTDOCS%%@dirrm share/doc/uulib