5 files changed, 18 insertions, 146 deletions

diff --git a/news/aub/Makefile b/news/aub/Makefile
index c62107fa3f23..c3fe8c432eaf 100644
--- a/news/aub/Makefile
+++ b/news/aub/Makefile
@@ -7,32 +7,25 @@
 #
 
 PORTNAME=	aub
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1.2
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../../scripts/news/nntpstuff/aub
-DISTFILES=	aub aub.1 BUG_FIXES
+MASTER_SITES=	http://yukidoke.org/~mako/projects/aub/download/
 
 MAINTAINER=	obrien@FreeBSD.org
 
-DIST_SUBDIR=	aub
-NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 MAN1=		aub.1
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-
-pre-patch:
-	@${SED} -e '1,1s:/usr/local/bin/perl:!${PERL5}:' \
-		-e 's:$SUM = "/bin/sum":$SUM = "/usr/bin/sum":' \
-		-e 's:/usr/tmp:/var/tmp:' \
-		${DISTDIR}/${DIST_SUBDIR}/aub > ${WRKDIR}/aub
+DOC_FILES=	COPYING README aubconf.example Introducing_AUB USAGE
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/aub ${PREFIX}/bin
-	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/aub.1 ${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/aub ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/aub.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/aub
-	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/BUG_FIXES ${PREFIX}/share/doc/aub
+.for doc in ${DOC_FILES}
+	${INSTALL_MAN} ${WRKSRC}/${doc} ${PREFIX}/share/doc/aub
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/news/aub/distinfo b/news/aub/distinfo
index 5579784e8288..3857e5867ffe 100644
--- a/news/aub/distinfo
+++ b/news/aub/distinfo
@@ -1,3 +1 @@
-MD5 (aub/aub) = 74892a6ae002937d011d3e1102269b7f
-MD5 (aub/aub.1) = 813f6c5782f6cce0412e462ab41e7f03
-MD5 (aub/BUG_FIXES) = 394a97815510cef50655646f54932915
+MD5 (aub-2.1.2.tar.gz) = 6fc8462809e1773636bfd41c7a3c1881
diff --git a/news/aub/files/patch-01 b/news/aub/files/patch-01
deleted file mode 100644
index 74cfba9de240..000000000000
--- a/news/aub/files/patch-01
+++ /dev/null
@@ -1,125 +0,0 @@
---- aub.orig	Sat Jan 15 18:12:02 2000
-+++ aub	Sat Jan 15 18:14:26 2000
-@@ -38,6 +38,8 @@
- $SUM = "/usr/bin/sum";   &find_pg("sum", 0)  unless (-x $SUM);
- $CAT = "/bin/cat";   &find_pg("cat", 0)  unless (-x $CAT);
- $MV = "/bin/mv";     &find_pg("mv", 0)   unless (-x $MV);
-+$HOSTNAME = "/bin/hostname"; $HOSTNAME = &find_pg("hostname", 0) unless
-+  (-x $HOSTNAME);
- 
- # CONSTANTS: 	most likely you want to leave these alone.  
- #
-@@ -149,6 +151,12 @@
- # v2.1 will be bug fixes for v2.0.)
- #
- 
-+# Modified the 7th of december 1994 by Laurent VALLEE
-+# in purpose of compatibility with Perl 5 :
-+#
-+# load the socket library to connect the server in NNTP mode
-+BEGIN { require "Socket.pm"; import Socket; }
-+
- (&Getopts("cd:nCMm")) || (exit(1));
- 
- &long_manual if ($opt_M);			# None of these subroutines
-@@ -198,15 +206,21 @@
-          "environment variable\nor specify an NNTP server or disk based " .
-          "news access in your configuration file.") unless ($server);
- 
--  if ($opt_d > 1) {
--    print "Searching library directories:";
--    foreach $libr (@INC) {
--      print " $libr";
--    }
--    print " for sys/socket.ph...\n";
--  } 
-+# Modified the 7th of december 1994 by Laurent VALLEE
-+# in purpose of compatibility with Perl 5 :
-+#
-+# no need to load the socket library because it has already been done
-+# at the beginning of the script. So comment the lines...
-+
-+#  if ($opt_d > 1) {
-+#    print "Searching library directories:";
-+#    foreach $libr (@INC) {
-+#      print " $libr";
-+#    }
-+#    print " for sys/socket.ph...\n";
-+#  } 
- 
--  &need_to_run_h2ph unless (eval("require <sys/socket.ph>"));
-+#  &need_to_run_h2ph unless (eval("require <sys/socket.ph>"));
- 
-   print "Using NNTP-based news access; server is $server\n"
-     if ($opt_d);
-@@ -929,7 +943,14 @@
-   local($sock) = pop(@_);
-   local($line) = &getline($sock);
- 
-+  if ($line =~ m/INN/) {                        # This code by mwe@dfw.net,
-+    &putline($sock, "mode reader");             #  looks pretty good to me.
-+    &getline($sock);                            #   -mfs, 2/95.
-+  }
-+
-   return if (($line =~ m/^200\s/) || ($line =~ m/^201\s/));
-+  &abort("Remote nntp service is too busy to talk to us now.")
-+    if ($line =~ m/^400\s/);
-   &abort("Remote nntp service doesn't look like nntp service to me.");
- } 
- 
-@@ -968,7 +989,7 @@
-   $timeout_flag = 0;				# Not a local variable
-   alarm($timeout_interval);			# Can't wait forever.
- 
--  while ($socket_stuff !~ m/\n/) {		# No complete line in buffer
-+  while ($socket_stuff !~ m/\r\n/) {		# No complete line in buffer
-     recv($sockname, $inp, 256, 0);		# Need more data
-     $socket_stuff .= $inp;			# Append to our buffer.
-   }
-@@ -1022,7 +1043,7 @@
-   local($protocol) = "tcp";
-   local($thishost, $problem, $junk);
- 
--  $thishost = `hostname`; chop $thishost;
-+  $thishost = `$HOSTNAME`; chop $thishost;
- 
- # Figure out our address...
-   ($name, $junk, $junk, $junk, $ouraddr) = gethostbyname($thishost);
-@@ -1875,6 +1896,12 @@
- }
- 
- 
-+# Modified the 7th of december 1994 by Laurent VALLEE
-+# in purpose of compatibility with Perl 5 :
-+#
-+# in strings, "@" must be preceded by a "\". So the mail adresses
-+# must be modified.
-+
- sub long_manual {
- #
- #
-@@ -2463,8 +2490,8 @@
- 
- 
- 						Mark Stantz
--						stantz@sierra.stanford.edu
--						stantz@sgi.com
-+						stantz\@sierra.stanford.edu
-+						stantz\@sgi.com
- 						8/92
- 
- EOF
-@@ -2482,7 +2509,12 @@
- # This has some (not much) value as a debugging aid.
- #
- 
--&abort("", &process_line(join('&',"82G5S=\"!A;F]T:","5R('!E<FP@:","%C:V5R"),4))
-+# Modified the 7th of december 1994 by Laurent VALLEE
-+# in purpose of compatibility with Perl 5 :
-+#
-+# in strings, "@" must be preceded by a "\". So modify the expression.
-+
-+&abort("", &process_line(join('&',"82G5S=\"!A;F]T:","5R('!E<FP\@:","%C:V5R"),4))
-   if (open(DECODE, ">&STDOUT"));
- }
- 
diff --git a/news/aub/pkg-descr b/news/aub/pkg-descr
index dabb314b7aeb..11a126cccca7 100644
--- a/news/aub/pkg-descr
+++ b/news/aub/pkg-descr
@@ -20,4 +20,6 @@ over and over again.
 run:   ``aub -M | more'' for the long form documentation, or
        ``aub -m | more'' for the short form.
 
+WWW: http://yukidoke.org/~mako/projects/aub/
+
 -- David (obrien@NUXI.com)
diff --git a/news/aub/pkg-plist b/news/aub/pkg-plist
index 0919bb261cca..d5520188e2f1 100644
--- a/news/aub/pkg-plist
+++ b/news/aub/pkg-plist
@@ -1,4 +1,8 @@
 @comment $FreeBSD$
 bin/aub
-share/doc/aub/BUG_FIXES
+share/doc/aub/COPYING
+share/doc/aub/Introducing_AUB
+share/doc/aub/README
+share/doc/aub/USAGE
+share/doc/aub/aubconf.example
 @dirrm share/doc/aub