aboutsummaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2010-01-24 16:14:28 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2010-01-24 16:14:28 +0000
commit2f1fac3cc2be1e656668954f1468b9cad96d8fc0 (patch)
tree4c610c55ae22edb294d3fb8d160d5bd4487f2ad1 /japanese
parent1e76a6e0c2a598a403f92b39d11dc4574606b011 (diff)
downloadports-2f1fac3cc2be1e656668954f1468b9cad96d8fc0.tar.gz
ports-2f1fac3cc2be1e656668954f1468b9cad96d8fc0.zip
Notes
Diffstat (limited to 'japanese')
-rw-r--r--japanese/kterm/files/patch-aa20
-rw-r--r--japanese/kterm/files/patch-main.c13
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 */