diff options
| author | cracauer <cracauer@FreeBSD.org> | 2010-06-05 07:35:48 +0800 |
|---|---|---|
| committer | cracauer <cracauer@FreeBSD.org> | 2010-06-05 07:35:48 +0800 |
| commit | 559468b02f8a5a172cdb898f6cd62803be0e4a43 (patch) | |
| tree | 04ca17fdc1759ba478465460c3db1910f5bf0d5e /editors | |
| parent | 04975d26687347d30072ee592f278d6306ef4d11 (diff) | |
| download | freebsd-ports-gnome-559468b02f8a5a172cdb898f6cd62803be0e4a43.tar.gz freebsd-ports-gnome-559468b02f8a5a172cdb898f6cd62803be0e4a43.tar.zst freebsd-ports-gnome-559468b02f8a5a172cdb898f6cd62803be0e4a43.zip | |
Unbreak after utmp changes.
Maintainer timeout, I mailed this in February when I fixed emacs22.
Tested on amd64/current and i386/8-stable.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs21/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs21/files/patch-src:utmpx.c | 35 |
2 files changed, 35 insertions, 4 deletions
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index 5a5c9df46a8d..db77c22b02b4 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -60,10 +60,6 @@ LATEST_LINK= emacs21 .include <bsd.port.pre.mk> -.if ${OSVERSION} > 900007 -BROKEN= fails to build with new utmpx -.endif - .if ${ARCH} == "ia64" CFLAGS:= ${CFLAGS:C/-O.?/-O0/g} CONFIGURE_ENV= CFLAGS="${CFLAGS}" diff --git a/editors/emacs21/files/patch-src:utmpx.c b/editors/emacs21/files/patch-src:utmpx.c new file mode 100644 index 000000000000..c3988abd2bf6 --- /dev/null +++ b/editors/emacs21/files/patch-src:utmpx.c @@ -0,0 +1,35 @@ +--- src/filelock.c.orig 2008-01-07 23:30:11.000000000 -0500 ++++ src/filelock.c 2010-02-12 18:40:07.000000000 -0500 +@@ -64,7 +64,13 @@ + + #ifdef CLASH_DETECTION + ++#if __FreeBSD_version >= 900007 ++#include <utmpx.h> ++#undef BOOT_TIME ++#define ut_time ut_tv.tv_sec ++#else + #include <utmp.h> ++#endif + + #if !defined (S_ISLNK) && defined (S_IFLNK) + #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) +@@ -253,13 +259,17 @@ + the first reboot record otherwise. + Ignore all reboot records on or before BOOT_TIME. + Success is indicated by setting BOOT_TIME to a larger value. */ +- + void + get_boot_time_1 (filename, newest) + char *filename; + int newest; + { ++#if __FreeBSD_version >= 900007 ++ struct utmpx ut, *utp; ++#else + struct utmp ut, *utp; ++#endif ++ + int desc; + + if (filename) |