ports/117033: [patch] Fix build of net/pppoa on current

[Raaf]

>Number:         117033
>Category:       ports
>Synopsis:       [patch] Fix build of net/pppoa on current
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 09 02:00:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Raaf
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD zen.mooo.com 7.0-CURRENT FreeBSD 7.0-CURRENT #3: Mon Oct 8 06:17:41 CEST 2007 raaf at zen.mooo.com:/usr/obj/usr/src/sys/RANI i386

>Description:
The net/pppoa port is broken on current. Attached patch fixes it.

Files removed: files/patch-aa
Files added:   files/patch-src_modem_run.c

>How-To-Repeat:
	
>Fix:

	

--- patch-pppoa begins here ---
diff -ruN /usr/ports/net/pppoa.bak/Makefile /usr/ports/net/pppoa/Makefile
--- /usr/ports/net/pppoa.bak/Makefile	2007-10-08 23:42:06.000000000 +0200
+++ /usr/ports/net/pppoa/Makefile	2007-10-09 02:29:44.000000000 +0200
@@ -32,9 +32,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700000
-BROKEN=			Does not build on FreeBSD >= 7.0
-.endif
 
 post-extract:
 	@${TAR} -zxf ${DISTDIR}/${ALCATELDRIVER} -C ${WRKSRC}
diff -ruN /usr/ports/net/pppoa.bak/files/patch-aa /usr/ports/net/pppoa/files/patch-aa
--- /usr/ports/net/pppoa.bak/files/patch-aa	2007-10-08 23:27:28.000000000 +0200
+++ /usr/ports/net/pppoa/files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Dec 27 22:22:11 2004
-+++ configure.in	Mon Dec 27 22:21:45 2004
-@@ -98,7 +98,7 @@
- 		PUSB_SOURCE="pusb-bsd.c"
- 		AC_DEFINE(FREEBSD)
- 		;;
--	*-freebsd5*)
-+	*-freebsd[56]*)
- 		st_compile="modem_run pppoa2 pppoa3"
- 		THREAD_LIBS="-lkse"
- 		AC_CHECK_HEADER(semaphore.h, , [AC_MSG_WARN([Missing header file, pppoa3 won't be compiled]); st_compile="modem_run pppoa2"])
diff -ruN /usr/ports/net/pppoa.bak/files/patch-ab /usr/ports/net/pppoa/files/patch-ab
--- /usr/ports/net/pppoa.bak/files/patch-ab	2007-10-08 23:27:53.000000000 +0200
+++ /usr/ports/net/pppoa/files/patch-ab	2007-10-09 02:30:50.000000000 +0200
@@ -5,7 +5,7 @@
  
  		;;
 -	*-freebsd5*)
-+	*-freebsd[56]*)
++	*-freebsd[567]*)
  		st_compile="modem_run pppoa2 pppoa3"
  		THREAD_LIBS="-pthread"
  		if test "${ac_cv_header_semaphore_h+set}" = set; then
diff -ruN /usr/ports/net/pppoa.bak/files/patch-src_modem_run.c /usr/ports/net/pppoa/files/patch-src_modem_run.c
--- /usr/ports/net/pppoa.bak/files/patch-src_modem_run.c	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net/pppoa/files/patch-src_modem_run.c	2007-10-09 02:42:15.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/modem_run.c.orig	2007-10-09 02:38:11.000000000 +0200
++++ src/modem_run.c	2007-10-09 02:38:24.000000000 +0200
+@@ -91,7 +91,7 @@
+ * Global variables
+ ******************************************************************************/
+ 
+-static int verbose = 0;
++int verbose = 0;
+ FILE *flog = NULL;
+ 
+ /*****************************************************************************
--- patch-pppoa ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: