svn commit: r329642 - in head/sysutils/libutempter: . files

[John Marino]

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 at 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;
+