5 files changed, 63 insertions, 11 deletions

diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile
index 8243092072a6..85eea539370c 100644
--- a/converters/btoa/Makefile
+++ b/converters/btoa/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	btoa
-PORTVERSION=	5.2.1
+PORTVERSION=	5.2
+PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS
-DISTNAME=	btoa-5.2
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	btoa-5.2-patch1.gz
+MAINTAINER=	martin@raq.cx
 
 MAKE_FLAGS=	DESTDIR=${PREFIX} -f
 MAKEFILE=	Makefile.sun
 MAN1=		btoa.1
 
-# Turn off the default from bsd.port.mk (-p0), which screws things up
-PATCH_DIST_STRIP=
-
 .include <bsd.port.mk>
diff --git a/converters/btoa/distinfo b/converters/btoa/distinfo
index 87ba658e1e34..c0f7c901d418 100644
--- a/converters/btoa/distinfo
+++ b/converters/btoa/distinfo
@@ -1,2 +1 @@
 MD5 (btoa-5.2.tar.gz) = c8fe1ee1e0f7ea0da0c49f44c5fe8f64
-MD5 (btoa-5.2-patch1.gz) = caf2fff3448242f432b407b797670312
diff --git a/converters/btoa/files/patch-aa b/converters/btoa/files/patch-aa
new file mode 100644
index 000000000000..ea68760fdd6f
--- /dev/null
+++ b/converters/btoa/files/patch-aa
@@ -0,0 +1,28 @@
+--- Makefile.sun.orig	Fri Oct  8 13:00:00 1993
++++ Makefile.sun	Wed May  8 17:05:41 2002
+@@ -1,5 +1,9 @@
+ OBJS     = btoa.o atob.o repair.o
+ 
++DESTDIR  ?= /usr/local
++
++all:	btoa
++
+ btoa:	$(OBJS)
+ 	cc -O $(OBJS) -o btoa
+ 
+@@ -11,3 +15,15 @@
+ 
+ repair.o: repair.c btoa.h
+ 	cc -c -O repair.c
++
++install: btoa btoa.1
++	-@mkdir -p $(DESTDIR)/bin
++	install -c -s -m 755 btoa $(DESTDIR)/bin/btoa
++	rm -f $(DESTDIR)/bin/atob
++	ln $(DESTDIR)/bin/btoa $(DESTDIR)/bin/atob
++	-@mkdir -p $(DESTDIR)/man/man1
++	install -c -m 644 btoa.1 $(DESTDIR)/man/man1/btoa.1
++	strip $(DESTDIR)/bin/btoa
++
++clean:
++	rm -f btoa $(OBJS)
diff --git a/converters/btoa/files/patch-ab b/converters/btoa/files/patch-ab
new file mode 100644
index 000000000000..88945613dea2
--- /dev/null
+++ b/converters/btoa/files/patch-ab
@@ -0,0 +1,23 @@
+--- btoa.c.orig	Fri Oct  8 13:00:00 1993
++++ btoa.c	Wed May  8 14:54:17 2002
+@@ -20,7 +20,7 @@
+ FILE *outfile;
+ 
+ 
+-void main(argc, argv)
++int main(argc, argv)
+ int argc;
+ BYTE **argv;
+ {
+@@ -39,6 +39,11 @@
+   error = openinput = openoutput = a_to_b = diagnosis = repair = FALSE;
+   new_version = TRUE;
+   infilename = NULL;
++
++  /* Assume a_to_b = TRUE if we're called 'atob' */
++  if (!strncmp(argv[0] + strlen(argv[0]) - 4, "atob", 4)) {
++    a_to_b = TRUE;
++  }
+ 
+   /* Scan for '-' options. The rest must be file names. */
+   while (!error && argc > 1 && *argv[1] == '-')
diff --git a/converters/btoa/pkg-descr b/converters/btoa/pkg-descr
index 6b6e8c642300..36a0b8edfbf0 100644
--- a/converters/btoa/pkg-descr
+++ b/converters/btoa/pkg-descr
@@ -8,6 +8,11 @@ text has a single-byte checksum for error detection.  A diagnosis
 file provides a list of errors found this way, which could then be
 used to retransmit only the failing lines.
 
-Port to FreeBSD 2.1 by
-Brent J. Nordquist <bjn@visi.com>
-Fri Apr  5 23:20:58  1996
+Patch 1 is an unofficial, non-platform-specific patch to version
+5.2 of btoa.  It allows for automatic decoding of btoa files if
+the program is invoked as "atob" (no -a argument necessary).  It
+also outfits the Makefile to do clean and install.
+
+Brent J. Nordquist (nordquist@platinum.com)
+Fri Apr  5 23:50:09  1996
+