Upgrade to 1.1b.

5 files changed, 35 insertions, 136 deletions

diff --git a/net/pppoa/Makefile b/net/pppoa/Makefile
index a5ea2e80321f..2d41471db35f 100644
--- a/net/pppoa/Makefile
+++ b/net/pppoa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		pppoa
-PORTVERSION=		1.0
+PORTVERSION=		1.1b
 PORTEPOCH=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
@@ -16,10 +16,10 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 MASTER_SITE_SUBDIR=	speedtouch
 DISTFILES=		${SPEEDTOUCH}.tar.gz ${ALCATELDRIVER}
 
-MAINTAINER=		ports@freebsd-services.com
+MAINTAINER=		brian@FreeBSD.org
 
 HAS_CONFIGURE=		yes
-SPEEDTOUCH=		speedtouch-1_0
+SPEEDTOUCH=		speedtouch-1.1b
 ALCATELDRIVER=		speedmgmt.tar.gz
 NO_CDROM=		"http://www.alcatel.com/consumer/dsl/disclaimer_lx.htm"
 NO_PACKAGE=		"http://www.alcatel.com/consumer/dsl/disclaimer_lx.htm"
@@ -30,14 +30,11 @@ WRKSRC=			${WRKDIR}/${SPEEDTOUCH}
 MAN1=			modem_run.1 pppoa2.1 pppoa3.1
 
 post-install:
-	if [ ! -d ${PREFIX}/libdata ]; then			\
-		${MKDIR} ${PREFIX}/libdata;			\
-		${CHMOD} 775 ${PREFIX}/libdata;			\
-		${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} -m 0755 -o root -g wheel -d ${LOCALBASE}/libdata
+	${INSTALL_DATA} ${WRKSRC}/../mgmt/mgmt.o ${LOCALBASE}/libdata
+	${INSTALL_DATA} ${FILESDIR}/quick-install \
+	    ${LOCALBASE}/share/doc/speedtouch/.
+	@${CAT} ${LOCALBASE}/share/doc/speedtouch/quick-install
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/pppoa/distinfo b/net/pppoa/distinfo
index 60d50bf7806f..5970690c026e 100644
--- a/net/pppoa/distinfo
+++ b/net/pppoa/distinfo
@@ -1,2 +1,2 @@
-MD5 (speedtouch-1_0.tar.gz) = 67085d5725a02d49e67991a3b0e0d1ac
+MD5 (speedtouch-1.1b.tar.gz) = 6335423ffec64478cb01ad33f2cc9c82
 MD5 (speedmgmt.tar.gz) = 102dc7a457c3942ee21dc834db68eac2
diff --git a/net/pppoa/files/patch-ab b/net/pppoa/files/patch-ab
index 5fcc777670e4..b6a029a16008 100644
--- a/net/pppoa/files/patch-ab
+++ b/net/pppoa/files/patch-ab
@@ -1,113 +1,11 @@
---- src/pusb-bsd.c.orig	Wed Nov  7 19:45:26 2001
-+++ src/pusb-bsd.c	Tue Apr 30 09:50:20 2002
-@@ -100,7 +100,11 @@
- 	{
- 	    struct usb_device_info di;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 	    di.addr = device;
-+#else
-+	    di.udi_addr = device;
-+#endif
- 	    if(ioctl(cfd, USB_DEVICEINFO, &di) < 0)
- 		continue;
- 
-@@ -116,15 +120,25 @@
- 	    }
- #endif
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 	    if(di.vendorNo == vendorID && di.productNo == productID)
- 	    {
- 		if(strncmp(di.devnames[0], "ugen", 4) != 0)
-+#else
-+	    if(di.udi_vendorNo == vendorID && di.udi_productNo == productID)
-+	    {
-+		if(strncmp(di.udi_devnames[0], "ugen", 4) != 0)
-+#endif
- 		{
- 		    /* Has a real driver, don't mess with it */
- 		    continue;
- 		}
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 		sprintf(prefix, "/dev/%s", di.devnames[0]);
-+#else
-+		sprintf(prefix, "/dev/%s", di.udi_devnames[0]);
-+#endif
- #if defined(__FreeBSD__)
- 		sprintf(buf, "%s", prefix);
- #else		
-@@ -199,6 +213,7 @@
- {
-     struct usb_ctl_request req;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     req.request.bmRequestType = request_type;
-     req.request.bRequest = request;
-     USETW(req.request.wValue, value);
-@@ -206,7 +221,16 @@
-     USETW(req.request.wLength, size);
- 
-     req.data = buf;
--    req.flags = USBD_SHORT_XFER_OK;
-+#else
-+    req.ucr_request.bmRequestType = request_type;
-+    req.ucr_request.bRequest = request;
-+    USETW(req.ucr_request.wValue, value);
-+    USETW(req.ucr_request.wIndex, index);
-+    USETW(req.ucr_request.wLength, size);
-+
-+    req.ucr_data = buf;
-+    req.ucr_flags = USBD_SHORT_XFER_OK;
-+#endif
- 
-     /* !!! If your kernel is built with DIAGNOSTIC (which it is by
-        !!! default under some versions of NetBSD) this ioctl will fail.
-@@ -227,7 +251,11 @@
-     if(ioctl(dev->fd, USB_DO_REQUEST, &req) < 0)
- 	return -1;
-     else
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
- 	return req.actlen;
-+#else
-+	return req.ucr_actlen;
-+#endif
- }
- 
- int pusb_set_configuration(pusb_device_t dev, int config)
-@@ -249,8 +277,13 @@
-     struct usb_alt_interface intf;
-     int config;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     intf.interface_index = interface;
-     intf.alt_no = alternate;
-+#else
-+    intf.uai_interface_index = interface;
-+    intf.uai_alt_no = alternate;
-+#endif
- 
-     if(ioctl(dev->fd, USB_SET_ALTINTERFACE, &intf) < 0)
-     {
-@@ -278,12 +311,20 @@
- {
-     struct usb_alt_interface intf;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     intf.interface_index = interface;
-+#else
-+    intf.uai_interface_index = interface;
-+#endif
- 
-     if(ioctl(dev->fd, USB_GET_ALTINTERFACE, &intf) < 0)
- 	return -1;
- 
-+#if (__FreeBSD_version > 500000 && __FreeBSD_version < 500031) || (__FreeBSD_version < 450001)
-     return intf.alt_no;
-+#else
-+    return intf.uai_alt_no;
-+#endif
- }
- 
- pusb_endpoint_t pusb_endpoint_open(pusb_device_t dev, int epnum, int flags)
+--- doc-bsd/ppp.conf.sample.orig	Sat Jun  1 00:34:26 2002
++++ doc-bsd/ppp.conf.sample	Thu Jun 20 23:23:47 2002
+@@ -22,7 +22,7 @@
+ adsl:
+  set authname <login>
+  set authkey <password>
+- set device !"pppoa2 -vpi <VPI> -vci <VCI> -v 1"
++ set device !"/usr/local/sbin/pppoa2 -vpi <VPI> -vci <VCI> -v 1"
+  accept chap
+  set speed sync
+  set timeout 0
diff --git a/net/pppoa/files/quick-install b/net/pppoa/files/quick-install
index a67508bd75a7..fc49f3740726 100644
--- a/net/pppoa/files/quick-install
+++ b/net/pppoa/files/quick-install
@@ -6,8 +6,8 @@
     this software.
 
     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
+    called ``adsl'' using /usr/local/share/doc/speedtouch/ppp.conf.sample
+    as a template, then copy /usr/local/etc/rc.d/adsl.sh.sample to
     /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-plist b/net/pppoa/pkg-plist
index 967a81246b6a..fffa5ef6edef 100644
--- a/net/pppoa/pkg-plist
+++ b/net/pppoa/pkg-plist
@@ -1,11 +1,15 @@
-bin/modem_run
-bin/pppoa2
-bin/pppoa3
+sbin/modem_run
+sbin/pppoa2
+sbin/pppoa3
 etc/rc.d/adsl.sh.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
+share/doc/speedtouch/FAQ
+share/doc/speedtouch/FAQ-fr
+share/doc/speedtouch/INSTALL
+share/doc/speedtouch/INSTALL-de
+share/doc/speedtouch/INSTALL-fr
+share/doc/speedtouch/INSTALL-it
+share/doc/speedtouch/ppp.conf.sample
+share/doc/speedtouch/quick-install
+@exec cat %D/share/doc/speedtouch/quick-install
+@dirrm share/doc/speedtouch