ports/164977: Allow poptop to build on FreeBSD 9.x/-current

[Daniel Austin]

>Number:         164977
>Category:       ports
>Synopsis:       Allow poptop to build on FreeBSD 9.x/-current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 11 10:10:06 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Austin
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD bolton.dan.me.uk 9.0-STABLE FreeBSD 9.0-STABLE #2: Sat Jan 14 14:29:17 GMT 2012 dan at bolton.dan.me.uk:/usr/obj/usr/src/sys/DAN amd64


	
>Description:
	poptop currently does not compile due to the utmpx changes in FreeBSD 9
>How-To-Repeat:
	Try to compile on FreeBSD 9 or above
>Fix:
	The attached patch removes the requirement for utmp.h header file (as it is unused by the plugin anyway) allowing poptop to compile and run on FreeBSD 9 and higher.

	New files:
		files/patch-plugins_pptpd-logwtmp.c

	Modified files:
		Makefile

	Patch tested on FreeBSD 8 and 9

--- poptop.diff begins here ---
diff -ruN poptop.orig/Makefile poptop/Makefile
--- poptop.orig/Makefile	2011-09-23 23:24:34.000000000 +0100
+++ poptop/Makefile	2012-02-11 09:52:31.518801233 +0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	poptop
 PORTVERSION=	1.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/pptpd/pptpd-${PORTVERSION}
 DISTNAME=	pptpd-${PORTVERSION:S/.b/-b/}
@@ -40,8 +40,4 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
-.endif
-
 .include <bsd.port.post.mk>
diff -ruN poptop.orig/files/patch-plugins_pptpd-logwtmp.c poptop/files/patch-plugins_pptpd-logwtmp.c
--- poptop.orig/files/patch-plugins_pptpd-logwtmp.c	1970-01-01 01:00:00.000000000 +0100
+++ poptop/files/patch-plugins_pptpd-logwtmp.c	2012-02-11 09:48:29.000000000 +0000
@@ -0,0 +1,10 @@
+--- plugins/pptpd-logwtmp.c.orig	2012-02-11 09:39:49.169959858 +0000
++++ plugins/pptpd-logwtmp.c	2012-02-11 09:39:56.512074889 +0000
+@@ -10,7 +10,6 @@
+  *  2 of the License, or (at your option) any later version.
+  */
+ #include <unistd.h>
+-#include <utmp.h>
+ #include <string.h>
+ #include "pppd.h"
+ 
--- poptop.diff ends here ---


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