From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 11 10:10:07 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4BE2106566C for ; Sat, 11 Feb 2012 10:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BD4B68FC15 for ; Sat, 11 Feb 2012 10:10:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q1BAA6jU030617 for ; Sat, 11 Feb 2012 10:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q1BAA6Ax030616; Sat, 11 Feb 2012 10:10:06 GMT (envelope-from gnats) Resent-Date: Sat, 11 Feb 2012 10:10:06 GMT Resent-Message-Id: <201202111010.q1BAA6Ax030616@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Austin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC918106564A for ; Sat, 11 Feb 2012 10:07:41 +0000 (UTC) (envelope-from dan@bolton.dan.me.uk) Received: from bolton.dan.me.uk (mail.dan.me.uk [IPv6:2001:67c:26b4:8:21e:bff:fec7:87a]) by mx1.freebsd.org (Postfix) with ESMTP id 957698FC14 for ; Sat, 11 Feb 2012 10:07:41 +0000 (UTC) Received: (from root@localhost) by bolton.dan.me.uk (8.14.5/8.14.5) id q1BA7bYw013930; Sat, 11 Feb 2012 10:07:37 GMT Message-Id: <201202111007.q1BA7bYw013930@bolton.dan.me.uk> Date: Sat, 11 Feb 2012 10:07:37 GMT From: Daniel Austin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/164977: Allow poptop to build on FreeBSD 9.x/-current X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Austin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2012 10:10:07 -0000 >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@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 -.if ${OSVERSION} > 900007 -BROKEN= fails to build with new utmpx -.endif - .include 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 +-#include + #include + #include "pppd.h" + --- poptop.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: