Index: head/deskutils/plan/Makefile
===================================================================
--- head/deskutils/plan/Makefile	(revision 394565)
+++ head/deskutils/plan/Makefile	(revision 394566)
@@ -1,56 +1,51 @@
 # Created by: Daniel Eischen <deischen@FreeBSD.org>
 # $FreeBSD$
 
 # Also update	ports/japanese/plan/ (ja-plan) when this port is updated
 
 PORTNAME=	plan
 PORTVERSION=	1.10.1
 CATEGORIES+=	deskutils
 MASTER_SITES=	ftp://plan.ftp.fu-berlin.de/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X/Motif schedule planner with calendar
 
 USES=		motif
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 ALL_TARGET=	freebsd
 
 MAKE_ENV+=	DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 900006
-EXTRA_PATCHES=	${PATCHDIR}/utmpx-src-daemon.c
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 
 	cd ${WRKSRC} \
 	   && ${INSTALL_PROGRAM} plan pland netplan notifier ${STAGEDIR}${PREFIX}/bin		\
 	   && ${INSTALL_SCRIPT}  ../misc/Killpland ${STAGEDIR}${PREFIX}/bin			\
 	   && ${INSTALL_MAN} ../misc/netplan.1 ../misc/plan.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	\
 	   && ${INSTALL_MAN} ../misc/plan.4 ${STAGEDIR}${MAN4PREFIX}/man/man4
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/.. \
 	   && ${INSTALL_DATA} misc/plan_cal.ps language/* misc/Mkdoc misc/Mkdoc.nawk	\
 	                      misc/BlackWhite misc/Monochrome README			\
 	                      ${STAGEDIR}${DOCSDIR}
 
 	cd ${WRKSRC}/../holiday \
 	   && ${INSTALL_DATA}   \
 	      holiday_australia holiday_austria holiday_bavarian holiday_belgium		\
 	      holiday_canada holiday_combi holiday_czech holiday_denmark holiday_dutch		\
 	      holiday_finnish holiday_french holiday_frswiss holiday_german holiday_greek	\
 	      holiday_hungary holiday_italy holiday_japan holiday_norway holiday_portugal	\
 	      holiday_quebec holiday_slovak holiday_spain holiday_swedish holiday_uk		\
 	      holiday_us ${STAGEDIR}${EXAMPLESDIR}
 
 .if !target(post-install)
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/netplan.dir
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/deskutils/plan/files/utmpx-src-daemon.c
===================================================================
--- head/deskutils/plan/files/utmpx-src-daemon.c	(revision 394565)
+++ head/deskutils/plan/files/utmpx-src-daemon.c	(nonexistent)
@@ -1,33 +0,0 @@
---- 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)) {

Property changes on: head/deskutils/plan/files/utmpx-src-daemon.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/deskutils/plan/files/patch-utmpx-src-daemon.c
===================================================================
--- head/deskutils/plan/files/patch-utmpx-src-daemon.c	(nonexistent)
+++ head/deskutils/plan/files/patch-utmpx-src-daemon.c	(revision 394566)
@@ -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)) {

Property changes on: head/deskutils/plan/files/patch-utmpx-src-daemon.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property