Upgrade net/pppoa from 1.1b to 1.2-beta1 Although it's a beta version for me it works more stable than the 1.1 release driver, so here it is.
On Thu, Jun 26, 2003 at 02:04:18PM +0200, Rob Evers wrote: > >Description: > Upgrade net/pppoa from 1.1b to 1.2-beta1 > Although it's a beta version for me it works more stable > than the 1.1 release driver, so here it is. Thanks for your submission. Unfortunately, the patch does not apply cleanly (see my comments below). If I edit the Makefile by hand, the build process then fails because of patches in the files/ directory that no longer work. Please fix this patch and test it against a freshly checked-out or copied version of the pppoa port. The patch should both apply cleanly and enable the port to build. > -# $FreeBSD: /repoman/r/pcvs/ports/net/pppoa/Makefile,v 1.13 2003/03/07 06:07:59 ade Exp $ > +# $FreeBSD: ports/net/pppoa/Makefile,v 1.13 2003/03/07 06:07:59 ade Exp $ You don't need to change this line. > +PKGNAMESUFFIX= beta1 I suspect you don't want to do this - you specify "beta1" in the SPEEDTOUCH variable later. Tom
Tom, I made a new diff (against a clean port this time), files/patch-ab must be removed for the port to compile cleanly. cheers, Rob diff -r -u pppoa.orig/Makefile pppoa/Makefile --- pppoa.orig/Makefile Fri Jun 27 02:26:56 2003 +++ pppoa/Makefile Fri Jun 27 02:29:26 2003 @@ -6,7 +6,7 @@ # PORTNAME= pppoa -PORTVERSION= 1.1b +PORTVERSION= 1.2 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -20,7 +20,7 @@ COMMENT= Run PPP over Alcatel's USB Speedtouch device HAS_CONFIGURE= yes -SPEEDTOUCH= speedtouch-1.1b +SPEEDTOUCH= speedtouch-1.2-beta1 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" diff -r -u pppoa.orig/distinfo pppoa/distinfo --- pppoa.orig/distinfo Fri Jun 27 02:26:56 2003 +++ pppoa/distinfo Fri Jun 27 02:30:14 2003 @@ -1,2 +1,2 @@ -MD5 (speedtouch-1.1b.tar.gz) = 6335423ffec64478cb01ad33f2cc9c82 +MD5 (speedtouch-1.2-beta1.tar.gz) = d0f5de3d227bae0653c8da02629165b7 MD5 (speedmgmt.tar.gz) = 102dc7a457c3942ee21dc834db68eac2 Only in pppoa.orig/files: patch-ab diff -r -u pppoa.orig/pkg-plist pppoa/pkg-plist --- pppoa.orig/pkg-plist Fri Jun 27 02:26:56 2003 +++ pppoa/pkg-plist Fri Jun 27 02:29:54 2003 @@ -9,6 +9,7 @@ share/doc/speedtouch/INSTALL-de share/doc/speedtouch/INSTALL-fr share/doc/speedtouch/INSTALL-it +share/doc/speedtouch/INSTALL-nl share/doc/speedtouch/ppp.conf.sample share/doc/speedtouch/quick-install @exec cat %D/share/doc/speedtouch/quick-install
On Fri, Jun 27, 2003 at 02:39:58AM +0200, Rob wrote: > Tom, I made a new diff (against a clean port this time), > files/patch-ab must be removed for the port to compile cleanly. Thanks, Rob. I've altered your patch a little, and upgraded it to use the latest beta. Could you take a look and let me know what you think? Brian, I assume you're still busy and don't have time to look at this. Would you mind if I take over as the maintainer of this port? Tom
Responsible Changed From-To: freebsd-ports-bugs->tom I'll take this
On Thu, Jul 03, 2003 at 08:07:10PM +0100, Tom Hukins wrote: > Could you take a look and let me know what you think? I forgot to attach the patch. Here it is: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/pppoa/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 7 Mar 2003 06:07:59 -0000 1.13 +++ Makefile 3 Jul 2003 19:02:09 -0000 @@ -6,29 +6,32 @@ # PORTNAME= pppoa -PORTVERSION= 1.1b +PORTVERSION= 1.2b2 PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://www.xsproject.org/speedtouch/files/ \ - http://www.alcatel.com/consumer/dsl/ \ - http://benoit.papillault.free.fr/speedtouch/ +MASTER_SITES= http://download.ethomson.com/download/ \ + ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= speedtouch -DISTFILES= ${SPEEDTOUCH}.tar.gz ${ALCATELDRIVER} +DISTFILES= ${SPEEDTOUCH}.tar.bz2 ${ALCATELDRIVER} +EXTRACT_ONLY= ${SPEEDTOUCH}.tar.bz2 MAINTAINER= brian@FreeBSD.org COMMENT= Run PPP over Alcatel's USB Speedtouch device HAS_CONFIGURE= yes -SPEEDTOUCH= speedtouch-1.1b +SPEEDTOUCH= speedtouch-1.2-beta2 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" +NO_CDROM= "http://www.speedtouchdsl.com/disclaimer_lx.htm" +NO_PACKAGE= "http://www.speedtouchdsl.com/disclaimer_lx.htm" RESTRICTED_FILES= ${ALCATELDRIVER} WRKSRC= ${WRKDIR}/${SPEEDTOUCH} MAN1= modem_run.1 pppoa2.1 pppoa3.1 +USE_BZIP2= yes + +post-extract: + ${ECHO} ${TAR} -zxf ${DISTDIR}/${ALCATELDRIVER} -C ${WRKSRC} post-install: ${INSTALL} -m 0755 -o root -g wheel -d ${LOCALBASE}/libdata @@ -37,10 +40,4 @@ ${LOCALBASE}/share/doc/speedtouch/. @${CAT} ${LOCALBASE}/share/doc/speedtouch/quick-install -.include <bsd.port.pre.mk> - -.if !exists(${DISTDIR}/${ALCATELDRIVER}) -IGNORE= You must manually fetch the Alcatel driver distribution (${DISTDIR}/${ALCATELDRIVER}) via http://www.speedtouchdsl.com/dvrreg_lx.htm (select binary release 1.3.3), place it in ${DISTDIR} and then run make again -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/pppoa/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 20 Jun 2002 23:10:22 -0000 1.4 +++ distinfo 3 Jul 2003 19:02:09 -0000 @@ -1,2 +1,2 @@ -MD5 (speedtouch-1.1b.tar.gz) = 6335423ffec64478cb01ad33f2cc9c82 +MD5 (speedtouch-1.2-beta2.tar.bz2) = 450005ae68dc6b0323c54d4117460031 MD5 (speedmgmt.tar.gz) = 102dc7a457c3942ee21dc834db68eac2 Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/net/pppoa/pkg-descr,v retrieving revision 1.3 diff -u -r1.3 pkg-descr --- pkg-descr 10 Jan 2002 17:44:27 -0000 1.3 +++ pkg-descr 3 Jul 2003 19:02:09 -0000 @@ -1,15 +1,5 @@ -Support for the Alcatel Speedtouch USB device. This driver is GPL except -for the file that is downloaded from the Alcatel site. This file is -restricted, specifically in terms of distribution. See -http://www.alcatel.com/consumer/dsl/disclaimer_lx.htm. +Unofficial support for Alcatel's Speedtouch USB devices. This driver is +licensed under the GPL except for one restricted file: +http://www.speedtouchdsl.com/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 NetBSD. - -WWW: http://www.xsproject.org/speedtouch/ WWW: http://speedtouch.sourceforge.net/ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/pppoa/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 20 Jun 2002 23:10:22 -0000 1.5 +++ pkg-plist 3 Jul 2003 19:02:09 -0000 @@ -9,6 +9,7 @@ share/doc/speedtouch/INSTALL-de share/doc/speedtouch/INSTALL-fr share/doc/speedtouch/INSTALL-it +share/doc/speedtouch/INSTALL-nl share/doc/speedtouch/ppp.conf.sample share/doc/speedtouch/quick-install @exec cat %D/share/doc/speedtouch/quick-install Index: files/quick-install =================================================================== RCS file: /home/ncvs/ports/net/pppoa/files/quick-install,v retrieving revision 1.5 diff -u -r1.5 quick-install --- files/quick-install 20 Jun 2002 23:10:23 -0000 1.5 +++ files/quick-install 3 Jul 2003 19:02:09 -0000 @@ -1,9 +1,8 @@ ** IMPORTANT ** - Please ensure that you have read the Alcatel license agreement at - http://www.alcatel.com/consumer/dsl/dvrreg_lx.htm before running - this software. + Please ensure that you have read the license agreement at + http://www.speedtouchdsl.com/dvrreg_lx.htm before running this software. To activate this port, create a new profile in /etc/ppp/ppp.conf called ``adsl'' using /usr/local/share/doc/speedtouch/ppp.conf.sample
Hi Brian and Tom I looked at the patch you made Tom and it was nearly perfect ;-) But the firmware didn't get extracted during post-extract, attached is a new diff with the minor adjustments. Rob Evers
Looks like I forgot the patch
On Thu, 3 Jul 2003 20:07:10 +0100, Tom Hukins <tom@freebsd.org> wrote: > On Fri, Jun 27, 2003 at 02:39:58AM +0200, Rob wrote: > > Tom, I made a new diff (against a clean port this time), > > files/patch-ab must be removed for the port to compile cleanly. > > Thanks, Rob. I've altered your patch a little, and upgraded it to use > the latest beta. Could you take a look and let me know what you > think? > > Brian, I assume you're still busy and don't have time to look at this. > Would you mind if I take over as the maintainer of this port? > > Tom Hi, Actually, I've just acquired an Alcatel ``thing'' and spent some time trying to get it to work. I'd like to do a bit of work on the code in the next few days, and maybe muck about with the usb stack. I'd appreciate if you'd go ahead and commit the upgrade though. Thanks Tom. -- Brian <brian@Awfulhak.org> <brian@[uk.]FreeBSD.org> <http://www.Awfulhak.org> <brian@[uk.]OpenBSD.org> Don't _EVER_ lose your sense of humour !
State Changed From-To: open->closed Committed, thanks.