svn commit: r394566 - in head/deskutils/plan: . files

[Mathieu Arnold]

Author: mat
Date: Tue Aug 18 10:01:44 2015
New Revision: 394566
URL: https://svnweb.freebsd.org/changeset/ports/394566

Log:
  OSVERSION is always > 900006.
  
  Sponsored by:	Absolight

Added:
  head/deskutils/plan/files/patch-utmpx-src-daemon.c
     - copied unchanged from r394565, head/deskutils/plan/files/utmpx-src-daemon.c
Deleted:
  head/deskutils/plan/files/utmpx-src-daemon.c
Modified:
  head/deskutils/plan/Makefile

Modified: head/deskutils/plan/Makefile
==============================================================================
--- head/deskutils/plan/Makefile	Tue Aug 18 09:53:01 2015	(r394565)
+++ head/deskutils/plan/Makefile	Tue Aug 18 10:01:44 2015	(r394566)
@@ -19,11 +19,6 @@ MAKE_ENV+=	DATADIR=${DATADIR} EXAMPLESDI
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 900006
-EXTRA_PATCHES=	${PATCHDIR}/utmpx-src-daemon.c
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 
@@ -53,4 +48,4 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/netplan.dir
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Copied: head/deskutils/plan/files/patch-utmpx-src-daemon.c (from r394565, head/deskutils/plan/files/utmpx-src-daemon.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/plan/files/patch-utmpx-src-daemon.c	Tue Aug 18 10:01:44 2015	(r394566, copy of r394565, head/deskutils/plan/files/utmpx-src-daemon.c)
@@ -0,0 +1,33 @@
+--- daemon.c.orig	2010-01-25 17:34:06.000000000 -0800
++++ daemon.c	2010-01-25 17:38:29.000000000 -0800
+@@ -42,7 +42,7 @@
+ #ifdef __EMX__
+ #include <io.h>
+ #else
+-#include <utmp.h>
++#include <utmpx.h>
+ #endif
+ #ifdef AIXV3
+ struct utmp *getutent();
+@@ -266,7 +266,7 @@
+ 		refresh_lock(resolve_tilde(PLANDLOCK));
+ 		logged_in = FALSE;
+ 		if (pw) {
+-#if defined(SUN) || defined(BSD) || defined(__FreeBSD__)
++#if defined(SUN)
+ 		    struct utmp	ut;
+ 		    int		fd;
+ 		    int		l;
+@@ -289,9 +289,9 @@
+ 		    logged_in = TRUE;
+ #else
+ 		    short pid = getpid();
+-		    struct utmp *u;
+-		    setutent();
+-		    while ((u = getutent()))
++		    struct utmpx *u;
++		    setutxent();
++		    while ((u = getutxent()))
+ 			if (u->ut_type == USER_PROCESS &&
+ 			    u->ut_pid != pid &&
+ 			    !strncmp(pw->pw_name, u->ut_user, 8)) {