summaryrefslogtreecommitdiff
path: root/x11/eterm/patches/patch-ah
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-12-26 04:58:44 +0000
committerwiz <wiz@pkgsrc.org>2002-12-26 04:58:44 +0000
commitc74b642a931d6c1984f7a6125ebfb6d5d79716db (patch)
tree19d8989e44dc903ec0923792868c815265284b09 /x11/eterm/patches/patch-ah
parente055ea1ae3fe377cd4ad55ebcc80f67b41e66b51 (diff)
downloadpkgsrc-c74b642a931d6c1984f7a6125ebfb6d5d79716db.tar.gz
Update to 0.9.2, provided by Tracy J. Di Marco White in PR 19393.
The ReleaseNotes say: Changes in 0.9: --------------- You're kidding, right? There have been so many changes here it's not funny. If you really want to know what they all are, you can read the ChangeLog. But I'd settle for this: - All new theme format. - 3-state image support. - Pixmapped scrollbars and popup menus. - Action bindings. - IPC interface to Eterm and Enlightenment. - Auto mode for automatic syncing with Enlightenment themes.
Diffstat (limited to 'x11/eterm/patches/patch-ah')
-rw-r--r--x11/eterm/patches/patch-ah141
1 files changed, 71 insertions, 70 deletions
diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah
index 9e55f00b586..7702d5feb06 100644
--- a/x11/eterm/patches/patch-ah
+++ b/x11/eterm/patches/patch-ah
@@ -1,76 +1,77 @@
-$NetBSD: patch-ah,v 1.2 2002/08/25 21:52:39 jlam Exp $
-
---- src/utmp.c 2002/06/17 21:59:32 1.1
-+++ src/utmp.c 2002/06/17 22:03:43
-@@ -39,6 +39,7 @@
- # undef HAVE_UTMPX_H
- #endif
- #ifdef HAVE_UTMPX_H
-+# include <utmp.h>
- # include <utmpx.h>
- # define USE_SYSV_UTMP
- #else
-@@ -95,7 +96,11 @@
+$NetBSD: patch-ah,v 1.3 2002/12/26 04:58:45 wiz Exp $
+--- src/utmp.c.orig Thu Jun 27 14:15:53 2002
++++ src/utmp.c Sat Dec 14 21:44:17 2002
+@@ -47,8 +47,13 @@
+ # ifdef USE_SYSV_UTMP
# ifdef HAVE_UTMPX_H
- # undef WTMP_FILENAME
--# define WTMP_FILENAME WTMPX_FILE
-+# if defined(WTMPX_FILE)
-+# define WTMP_FILENAME WTMPX_FILE
-+# else
-+# define WTMP_FILENAME _PATH_WTMPX
-+# endif
- # define update_wtmp updwtmpx
- # else /* HAVE_UTMPX_H */
++# include <utmp.h>
+ # undef WTMP_FILENAME
+-# define WTMP_FILENAME WTMPX_FILE
++# if defined(WTMPX_FILE)
++# define WTMP_FILENAME WTMPX_FILE
++# else
++# define WTMP_FILENAME _PATH_WTMPX
++# endif
+ # define update_wtmp updwtmpx
+ # else /* HAVE_UTMPX_H */
-@@ -179,7 +184,7 @@
- privileges(INVOKE);
- #ifdef HAVE_UTMPX_H
- getutmp(&utmp, &utmp2);
-- getutid(&utmp2); /* position to entry in utmp file */
-+ getutxid(&utmp); /* position to entry in utmp file */
- #else
- getutid(&utmp); /* position to entry in utmp file */
- #endif
-@@ -203,16 +208,15 @@
- /*
- * write a utmp entry to the utmp file
- */
-- utmpname(UTMP_FILENAME);
-+ utmpxname(UTMP_FILENAME);
- #ifdef HAVE_UTMPX_H
- getutmp(&utmp, &utmp2);
-- pututline(&utmp2);
- pututxline(&utmp);
- #else
- pututline(&utmp);
- #endif
- update_wtmp(WTMP_FILENAME, &utmp);
-- endutent(); /* close the file */
-+ endutxent(); /* close the file */
- privileges(REVERT);
- }
+@@ -128,9 +133,9 @@
+ privileges(INVOKE);
+ # ifdef HAVE_UTMPX_H
+ getutmp(&utmp, &utmp2);
+- getutid(&utmp2); /* position to entry in utmp file */
++ getutxid(&utmp); /* position to entry in utmp file */
+ # else
+- getutid(&utmp); /* position to entry in utmp file */
++ getutxid(&utmp); /* position to entry in utmp file */
+ # endif
-@@ -228,16 +232,16 @@
- return; /* entry not made */
-
- privileges(INVOKE);
-- utmpname(UTMP_FILENAME);
-- setutent();
-- if (getutid(&utmp) == NULL)
-+ utmpxname(UTMP_FILENAME);
-+ setutxent();
-+ if (getutxid(&utmpx) == NULL)
+ /* set up the new entry */
+@@ -152,16 +157,15 @@
+ /*
+ * write a utmp entry to the utmp file
+ */
+- utmpname(UTMP_FILENAME);
++ utmpxname(UTMP_FILENAME);
+ # ifdef HAVE_UTMPX_H
+ getutmp(&utmp, &utmp2);
+- pututline(&utmp2);
+ pututxline(&utmp);
+ # else
+ pututline(&utmp);
+ # endif
+ update_wtmp(WTMP_FILENAME, &utmp);
+- endutent(); /* close the file */
++ endutxent(); /* close the file */
+ privileges(REVERT);
return;
-- utmp.ut_type = DEAD_PROCESS;
-+ utmpx.ut_type = DEAD_PROCESS;
- utmp.ut_time = time(NULL);
-- pututline(&utmp);
-+ pututxline(&utmpx);
- getutmpx(&utmp, &utmpx);
- update_wtmp(WTMP_FILENAME, &utmpx);
-- endutent();
-+ endutxent();
- privileges(REVERT);
+ fd = 0;
+@@ -177,19 +181,19 @@
+ if (!ut_id[0])
+ return; /* entry not made */
+
+- utmpname(UTMP_FILENAME);
+- setutent();
+- strncpy(utmp.ut_id, ut_id, sizeof(utmp.ut_id));
+- utmp.ut_type = USER_PROCESS;
+- if (getutid(&utmp) == NULL) {
++ utmpxname(UTMP_FILENAME);
++ setutxent();
++ strncpy(utmpx.ut_id, ut_id, sizeof(utmpx.ut_id));
++ utmpx.ut_type = USER_PROCESS;
++ if (getutxid(&utmp) == NULL) {
+ return;
+ }
+- utmp.ut_type = DEAD_PROCESS;
++ utmpx.ut_type = DEAD_PROCESS;
+ utmp.ut_time = time(NULL);
+- pututline(&utmp);
++ pututxline(&utmpx);
+ getutmpx(&utmp, &utmpx);
+ update_wtmp(WTMP_FILENAME, &utmpx);
+- endutent();
++ endutxent();
- #else /* HAVE_UTMPX_H */
+ # else /* HAVE_UTMPX_H */
+ struct utmp *putmp;