diff options
| author | nork <nork@FreeBSD.org> | 2010-01-25 00:14:28 +0800 |
|---|---|---|
| committer | nork <nork@FreeBSD.org> | 2010-01-25 00:14:28 +0800 |
| commit | ed3ac431911b2665eef5957327b5a69233db951a (patch) | |
| tree | c37727f701728562309ef3c67440a80c5ef92d8f /japanese/kterm | |
| parent | 27cc800dce3ada9e2bc27d940aa27699b9726a61 (diff) | |
| download | freebsd-ports-gnome-ed3ac431911b2665eef5957327b5a69233db951a.tar.gz freebsd-ports-gnome-ed3ac431911b2665eef5957327b5a69233db951a.tar.zst freebsd-ports-gnome-ed3ac431911b2665eef5957327b5a69233db951a.zip | |
Fix build error on 9-current (utmpx) by disabling UTMP.
Pointed out by: pointyhat via erwin
Diffstat (limited to 'japanese/kterm')
| -rw-r--r-- | japanese/kterm/files/patch-aa | 20 | ||||
| -rw-r--r-- | japanese/kterm/files/patch-main.c | 13 |
2 files changed, 28 insertions, 5 deletions
diff --git a/japanese/kterm/files/patch-aa b/japanese/kterm/files/patch-aa index fa9ce0249f59..ae37fe2a036d 100644 --- a/japanese/kterm/files/patch-aa +++ b/japanese/kterm/files/patch-aa @@ -1,5 +1,5 @@ ---- Imakefile.orig 2009-01-12 06:30:54.603258900 +0900 -+++ Imakefile 2009-01-12 06:45:23.991164903 +0900 +--- Imakefile.orig 2010-01-25 00:56:38.287976000 +0900 ++++ Imakefile 2010-01-25 00:59:31.955886193 +0900 @@ -13,6 +13,17 @@ XPOLL_DEF = -DNO_XPOLL_H #endif @@ -18,7 +18,21 @@ /* * add -DWTMP and -DLASTLOG if you want them. */ -@@ -72,7 +83,7 @@ +@@ -27,9 +38,12 @@ + OSMAJORVERSION = OSMajorVersion + OSMINORVERSION = OSMinorVersion + +- MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \ ++ MAIN_DEFINES = $(TTYGROUPDEF) $(PUCCPTYDDEF) \ + -DOSMAJORVERSION=$(OSMAJORVERSION) \ + -DOSMINORVERSION=$(OSMINORVERSION) ++#if defined(OSRelVersion) && OSRelVersion < 900007 ++ MAIN_DEFINES+= -DUTMP ++#endif + MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ + XKB_DEFINES = XkbClientDefines + DEFINES = $(XKB_DEFINES) $(XPOLL_DEF) -DKTERM -DSTATUSLINE -DKEEPALIVE -DWALLPAPER +@@ -72,7 +86,7 @@ #endif #endif diff --git a/japanese/kterm/files/patch-main.c b/japanese/kterm/files/patch-main.c index ff60ca9ddb6c..90216ef760d3 100644 --- a/japanese/kterm/files/patch-main.c +++ b/japanese/kterm/files/patch-main.c @@ -1,5 +1,5 @@ ---- main.c.orig 2009-01-12 06:02:34.419192340 +0900 -+++ main.c 2009-01-12 06:29:01.427571571 +0900 +--- main.c.orig 2010-01-25 01:02:47.051647000 +0900 ++++ main.c 2010-01-25 01:03:35.081557857 +0900 @@ -210,7 +210,9 @@ #undef FIOCLEX #undef FIONCLEX @@ -19,6 +19,15 @@ #include <sgtty.h> #endif #include <sys/resource.h> +@@ -293,7 +295,7 @@ + #define ttyslot() 1 + #endif /* apollo */ + +-#ifdef SVR4 ++#if defined(SVR4) || (defined(__FreeBSD__) && __FreeBSD_version >= 900007) + #include <utmpx.h> + #define setutent setutxent + #define getutent getutxent @@ -319,6 +321,10 @@ int Ptyfd; #endif /* PUCC_PTYD */ |