Upgrade to version 1.0

Bump PORTEPOCH (as we're going from 20011007 to 1.0)
Add http://prdownloads.sourceforge.net/speedtouch/ as a master site
Correct a typo in the Makefile (arpwatch -> libdata)
Update accreditations as requested by the author
Default the mode to -ddial rather than -background
Fix a typo in the quick-install dialogue

6 files changed, 24 insertions, 24 deletions

diff --git a/net/pppoa/Makefile b/net/pppoa/Makefile
index 10a897b9586a..5b942903fd4c 100644
--- a/net/pppoa/Makefile
+++ b/net/pppoa/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	pppoa
-PORTVERSION=	20011007
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://www.xsproject.org/speedtouch/files/ \
+MASTER_SITES=	http://prdownloads.sourceforge.net/speedtouch/ \
+		http://www.xsproject.org/speedtouch/files/ \
 		http://www.alcatel.com/consumer/dsl/ \
     		http://benoit.papillault.free.fr/speedtouch/
 DISTFILES=	${SPEEDTOUCH}.tar.gz speedmgmt.tar.gz
@@ -16,7 +18,7 @@ DISTFILES=	${SPEEDTOUCH}.tar.gz speedmgmt.tar.gz
 MAINTAINER=	brian@Awfulhak.org
 
 HAS_CONFIGURE=		yes
-SPEEDTOUCH=		speedtouch-${PORTVERSION}
+SPEEDTOUCH=		speedtouch-1_0
 NO_CDROM=		"http://www.alcatel.com/consumer/dsl/disclaimer_lx.htm"
 NO_PACKAGE=		"http://www.alcatel.com/consumer/dsl/disclaimer_lx.htm"
 RESTRICTED_FILES=	speedmgmt.tar.gz
@@ -29,13 +31,10 @@ post-install:
 	if [ ! -d ${PREFIX}/libdata ]; then			\
 		${MKDIR} ${PREFIX}/libdata;			\
 		${CHMOD} 775 ${PREFIX}/libdata;			\
-		${CHOWN} root:wheel ${PREFIX}/arpwatch;		\
+		${CHOWN} root:wheel ${PREFIX}/libdata;		\
 	fi
 	${INSTALL_DATA} ${WRKSRC}/../mgmt/mgmt.o ${PREFIX}/libdata/.
 	${INSTALL_DATA} ${FILESDIR}/quick-install ${PREFIX}/share/speedtouch/.
 	${CAT} ${PREFIX}/share/speedtouch/quick-install
-	${INSTALL_MAN} ${WRKSRC}/doc-linux/modem_run.1 ${PREFIX}/man/man1/.
-	${INSTALL_MAN} ${WRKSRC}/doc-linux/pppoa2.1 ${PREFIX}/man/man1/.
-	${INSTALL_MAN} ${WRKSRC}/doc-linux/pppoa3.1 ${PREFIX}/man/man1/.
 
 .include <bsd.port.mk>
diff --git a/net/pppoa/distinfo b/net/pppoa/distinfo
index bcff8926ecb2..60d50bf7806f 100644
--- a/net/pppoa/distinfo
+++ b/net/pppoa/distinfo
@@ -1,2 +1,2 @@
-MD5 (speedtouch-20011007.tar.gz) = 0db56a01c7e5c12dd96e359b2e272bc4
+MD5 (speedtouch-1_0.tar.gz) = 67085d5725a02d49e67991a3b0e0d1ac
 MD5 (speedmgmt.tar.gz) = 102dc7a457c3942ee21dc834db68eac2
diff --git a/net/pppoa/files/patch-aa b/net/pppoa/files/patch-aa
index 1e4d8a872196..863fd7c5ae89 100644
--- a/net/pppoa/files/patch-aa
+++ b/net/pppoa/files/patch-aa
@@ -1,11 +1,11 @@
---- doc-bsd/adsl.sh.sample.orig	Sun Oct  7 19:46:13 2001
-+++ doc-bsd/adsl.sh.sample	Fri Oct 12 21:04:04 2001
-@@ -13,7 +13,7 @@
- case $1 in
-   start)
- 	modem_run -f $PREFIX/libdata/mgmt.o \
--	 && ppp -quiet -($MODE) $ISP \
-+	 && ppp -quiet -$MODE $ISP \
- 	 && echo -n ' ppp'
-         ;;
-   stop)
+--- doc-bsd/adsl.sh.sample.orig	Tue Dec 11 16:25:52 2001
++++ doc-bsd/adsl.sh.sample	Sat Jan  5 18:00:31 2002
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ ISP=adsl
+-MODE=background
++MODE=ddial
+ 
+ if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+     echo "$0: Cannot determine the PREFIX" >&2
diff --git a/net/pppoa/files/quick-install b/net/pppoa/files/quick-install
index 21951f6a5b66..54f7484dbc93 100644
--- a/net/pppoa/files/quick-install
+++ b/net/pppoa/files/quick-install
@@ -4,7 +4,7 @@
     To activate this port, create a new profile in /etc/ppp/ppp.conf
     called ``adsl'' using /usr/local/share/speedtouch/ppp.conf.sample
     as a template, then copy /usr/local/etc/rc.d/asdl.sh.sample to
-    /usr/local/etc/rc.d/asdl.sh.
+    /usr/local/etc/rc.d/adsl.sh.
 
     You may need to change the value of MODE in adsl.sh.
 
diff --git a/net/pppoa/pkg-descr b/net/pppoa/pkg-descr
index ef1854926e94..f497978b67b9 100644
--- a/net/pppoa/pkg-descr
+++ b/net/pppoa/pkg-descr
@@ -7,8 +7,8 @@ http://www.alcatel.com/consumer/dsl/disclaimer_lx.htm.
 Thanks to
 
   Benoit Papillault, who made the linux driver.
+  Francois Rogler and Richard Tobin who ported the driver to *BSD
   Jorgen Lundman and Jon Barlow for their help and their time
-  porting the driver to *BSD.
-  And also all the contributors i forget. 
+  porting the driver to NetBSD.
 
 WWW:	http://www.xsproject.org/speedtouch/
diff --git a/net/pppoa/pkg-plist b/net/pppoa/pkg-plist
index 6015a353aac6..967a81246b6a 100644
--- a/net/pppoa/pkg-plist
+++ b/net/pppoa/pkg-plist
@@ -1,10 +1,11 @@
-libdata/mgmt.o
 bin/modem_run
 bin/pppoa2
 bin/pppoa3
 etc/rc.d/adsl.sh.sample
-share/speedtouch/ppp.conf.sample
+libdata/mgmt.o
+share/speedtouch/FAQ
 share/speedtouch/INSTALL
+share/speedtouch/ppp.conf.sample
 share/speedtouch/quick-install
 @exec cat %D/share/speedtouch/quick-install
 @dirrm share/speedtouch