diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2010-01-27 01:03:35 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2010-01-27 01:03:35 +0000 |
| commit | 12554f9a603cbd9099a2e963e36229bd59409df3 (patch) | |
| tree | 5a8812d65f7f1d12c37c197457824b4afe230ab4 /deskutils/plan | |
| parent | 990966415a40a23e9584cb64693d0fe6ec53bebb (diff) | |
| download | ports-12554f9a603cbd9099a2e963e36229bd59409df3.tar.gz ports-12554f9a603cbd9099a2e963e36229bd59409df3.zip | |
- Fix build on HEAD
PR: 143236
Submitted by: Rob Farmer <rfarmer@predatorlabs.net>
Reviewed by: ed@
Notes
Notes:
svn path=/head/; revision=248641
Diffstat (limited to 'deskutils/plan')
| -rw-r--r-- | deskutils/plan/Makefile | 7 | ||||
| -rw-r--r-- | deskutils/plan/files/utmpx-src-daemon.c | 33 |
2 files changed, 39 insertions, 1 deletions
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile index c03f8ecba7e8..25361c012cf4 100644 --- a/deskutils/plan/Makefile +++ b/deskutils/plan/Makefile @@ -23,6 +23,11 @@ MAN4= plan.4 MAKE_ENV+= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR} +.include <bsd.port.pre.mk> +.if ${OSVERSION} > 900006 +EXTRA_PATCHES= ${PATCHDIR}/utmpx-src-daemon.c +.endif + do-install: @${MKDIR} ${EXAMPLESDIR} @@ -54,4 +59,4 @@ post-install: @${MKDIR} ${DATADIR}/netplan.dir .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/plan/files/utmpx-src-daemon.c b/deskutils/plan/files/utmpx-src-daemon.c new file mode 100644 index 000000000000..4d5a8accf999 --- /dev/null +++ b/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)) { |