- fix extract

- make a proper patch
- integrate COMMENT
- clean-up
This commit is contained in:
naddy 2001-04-07 21:45:09 +00:00
parent ac9e034df2
commit d8c6749f18
5 changed files with 51 additions and 44 deletions

View File

@ -1,14 +1,11 @@
# $OpenBSD: Makefile,v 1.14 2001/02/09 17:55:32 angelos Exp $
# $OpenBSD: Makefile,v 1.15 2001/04/07 21:45:09 naddy Exp $
COMMENT= "assemble usenet binaries"
DISTNAME= aub
PKGNAME= aub-2.0.5
DISTNAME= aub
CATEGORIES= news
NEED_VERSION= 1.191
MASTER_SITES= ftp://ftp.freesoftware.com/pub/perl/CPAN/scripts/news/nntpstuff/aub/ \
ftp://ftp.digital.com/pub/plan/perl/CPAN/scripts/news/nntpstuff/aub/ \
ftp://ftp.perl.org/pub/CPAN/scripts/news/nntpstuff/aub/
DISTFILES= aub aub.1 BUG_FIXES
DIST_SUBDIR= aub
NEED_VERSION= 1.364
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>
@ -17,29 +14,21 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
NO_BUILD= Yes
MASTER_SITES= \
ftp://ftp.freesoftware.com/pub/perl/CPAN/scripts/news/nntpstuff/aub/ \
ftp://ftp.digital.com/pub/plan/perl/CPAN/scripts/news/nntpstuff/aub/ \
ftp://ftp.perl.org/pub/CPAN/scripts/news/nntpstuff/aub/
DISTFILES= aub aub.1 BUG_FIXES
DIST_SUBDIR= aub
EXTRACT_CASES= *) cp ${FULLDISTDIR}/$$archive . ;;
NO_BUILD= Yes
WRKDIST= ${WRKDIR}
do-extract:
@mkdir -p ${WRKDIR}
pre-configure:
@sed -e '1,1s:/usr/local/bin/perl:!/usr/bin/perl:' \
-e 's:$SUM = "/bin/sum":$SUM = "/usr/bin/sum":' \
-e 's:/usr/tmp:/var/tmp:' \
${FULLDISTDIR}/aub > ${WRKDIR}/aub
do-install:
cd ${WRKDIR}; patch < ${FILESDIR}/aub-perl5.diff
${INSTALL_SCRIPT} ${WRKDIR}/aub ${PREFIX}/bin
${INSTALL_MAN} ${FULLDISTDIR}/aub.1 ${PREFIX}/man/man1
${INSTALL_SCRIPT} ${WRKSRC}/aub ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/aub.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/aub
${INSTALL_MAN} ${FULLDISTDIR}/BUG_FIXES ${PREFIX}/share/doc/aub
#
# There is a patch to aub to run with perl5.
# You may find it in the files/ dir.
#
${INSTALL_MAN} ${WRKSRC}/BUG_FIXES ${PREFIX}/share/doc/aub
.include <bsd.port.mk>

View File

@ -1,7 +1,18 @@
--- aub.orig Tue Apr 6 00:00:00 1993
+++ aub Wed Apr 12 13:51:11 1995
@@ -38,6 +38,8 @@
$SUM = "/bin/sum"; &find_pg("sum", 0) unless (-x $SUM);
$OpenBSD: patch-aub,v 1.1 2001/04/07 21:45:09 naddy Exp $
--- aub.orig Sat Apr 7 23:07:34 2001
+++ aub Sat Apr 7 23:11:14 2001
@@ -1,4 +1,4 @@
-#/usr/local/bin/perl
+#!/usr/bin/perl
#
#
#
@@ -35,9 +35,11 @@
# in the standard place.
$ECHO = "/bin/echo"; &find_pg("echo", 0) unless (-x $ECHO);
-$SUM = "/bin/sum"; &find_pg("sum", 0) unless (-x $SUM);
+$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
@ -9,7 +20,16 @@
# CONSTANTS: most likely you want to leave these alone.
#
@@ -149,6 +151,12 @@
@@ -111,7 +113,7 @@ $aub_config = join("/", $ENV{"HOME"
$timeout_interval = 60;
$version = "2.0.5";
$last_version = "1.1";
-$temp_decode_file = "/usr/tmp/aub.decode$$";
+$temp_decode_file = "/var/tmp/aub.decode$$";
$nntpserver_file = "/usr/local/lib/rn/nntpserver";
$obsolete_init = join("/", $ENV{"HOME"}, ".aubinit");
@@ -149,6 +151,12 @@ $obsolete_init = join("/", $ENV{"HOM
# v2.1 will be bug fixes for v2.0.)
#
@ -22,7 +42,7 @@
(&Getopts("cd:nCMm")) || (exit(1));
&long_manual if ($opt_M); # None of these subroutines
@@ -198,15 +206,21 @@
@@ -198,15 +206,21 @@ if ($spooldir) {
"environment variable\nor specify an NNTP server or disk based " .
"news access in your configuration file.") unless ($server);
@ -52,7 +72,7 @@
print "Using NNTP-based news access; server is $server\n"
if ($opt_d);
@@ -929,9 +943,16 @@
@@ -929,9 +943,16 @@ sub get_nntp_header {
local($sock) = pop(@_);
local($line) = &getline($sock);
@ -70,7 +90,7 @@
sub setup_socket_io {
@@ -1022,7 +1043,7 @@
@@ -1022,7 +1043,7 @@ sub connect_tcp {
local($protocol) = "tcp";
local($thishost, $problem, $junk);
@ -79,7 +99,7 @@
# Figure out our address...
($name, $junk, $junk, $junk, $ouraddr) = gethostbyname($thishost);
@@ -1875,6 +1896,12 @@
@@ -1875,6 +1896,12 @@ EOF
}
@ -92,7 +112,7 @@
sub long_manual {
#
#
@@ -2463,8 +2490,8 @@
@@ -2463,8 +2490,8 @@ by the program.
Mark Stantz
@ -103,7 +123,7 @@
8/92
EOF
@@ -2482,7 +2509,12 @@
@@ -2482,7 +2509,12 @@ sub tribute {
# This has some (not much) value as a debugging aid.
#
@ -117,7 +137,7 @@
if (open(DECODE, ">&STDOUT"));
}
@@ -2510,4 +2542,5 @@
@@ -2510,4 +2542,5 @@ sub debug_parser {
print "spool $spooldir\nnntp $server\n";
print "debug $opt_d xhdr $have_gotten_subj_line_before\n";
}

View File

@ -1 +0,0 @@
assemble usenet binaries

View File

@ -17,7 +17,5 @@ also remembers which binaries it has already seen all of the pieces of
already, so that it does not waste time rebuilding the same binaries
over and over again.
run: ``aub -M | more'' for the long form documentation, or
``aub -m | more'' for the short form.
-- David (obrien@NUXI.com)
run: "aub -M | more" for the long form documentation, or
"aub -m | more" for the short form.

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/04/07 21:45:10 naddy Exp $
bin/aub
man/man1/aub.1
share/doc/aub/BUG_FIXES