From owner-svn-ports-head@FreeBSD.ORG  Sun Oct  6 23:43:16 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CCCD8FA9;
 Sun,  6 Oct 2013 23:43:16 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A06E1257D;
 Sun,  6 Oct 2013 23:43:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96NhG8u086498;
 Sun, 6 Oct 2013 23:43:16 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96NhGfX086496;
 Sun, 6 Oct 2013 23:43:16 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201310062343.r96NhGfX086496@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Sun, 6 Oct 2013 23:43:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329642 - in head/sysutils/libutempter: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Oct 2013 23:43:16 -0000

Author: marino
Date: Sun Oct  6 23:43:15 2013
New Revision: 329642
URL: http://svnweb.freebsd.org/changeset/ports/329642

Log:
  sysutils/libutempter: Improve IGNORE condition for DragonFly
  
  Qualify the OSVERSION check with an OPSYS check for FreeBSD so that the
  check doesn't break the port on DragonFly.  Also import a local patch
  from dports for DragonFly.

Added:
  head/sysutils/libutempter/files/patch-utempter.c   (contents, props changed)
Modified:
  head/sysutils/libutempter/Makefile

Modified: head/sysutils/libutempter/Makefile
==============================================================================
--- head/sysutils/libutempter/Makefile	Sun Oct  6 23:34:30 2013	(r329641)
+++ head/sysutils/libutempter/Makefile	Sun Oct  6 23:43:15 2013	(r329642)
@@ -10,14 +10,14 @@ MASTER_SITES=	ftp://ftp.altlinux.org/pub
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interface to record user sessions to utmp and wtmp files
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 900004
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 900004
 IGNORE=		is now contained in the base system
 .endif
 

Added: head/sysutils/libutempter/files/patch-utempter.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libutempter/files/patch-utempter.c	Sun Oct  6 23:43:15 2013	(r329642)
@@ -0,0 +1,20 @@
+--- utempter.c.orig	2007-02-19 12:14:08.000000000 +0000
++++ utempter.c
+@@ -36,7 +36,7 @@
+ 
+ #ifdef __GLIBC__
+ # include <pty.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <libutil.h>
+ #else
+ # error Unsupported platform
+@@ -157,7 +157,7 @@ write_uwtmp_record(const char *user, con
+ 
+ 	(void) updwtmp(_PATH_WTMP, &ut);
+ 
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ 	ut.ut_time = tv.tv_sec;
+