diff options
author | wiz <wiz> | 2002-12-26 04:58:44 +0000 |
---|---|---|
committer | wiz <wiz> | 2002-12-26 04:58:44 +0000 |
commit | 982d6c54165343295fdb83f8e4da1333246530fc (patch) | |
tree | 19d8989e44dc903ec0923792868c815265284b09 /x11/eterm/patches | |
parent | 7dd2abb1b103a2ef134366cb1d9a9894ec9062da (diff) | |
download | pkgsrc-982d6c54165343295fdb83f8e4da1333246530fc.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')
-rw-r--r-- | x11/eterm/patches/patch-aa | 20 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ac | 24 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ad | 13 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ah | 141 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ai | 12 |
6 files changed, 89 insertions, 134 deletions
diff --git a/x11/eterm/patches/patch-aa b/x11/eterm/patches/patch-aa deleted file mode 100644 index 54cf593990a..00000000000 --- a/x11/eterm/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/10/28 00:31:59 jlam Exp $ - ---- configure.orig Mon Apr 19 19:47:32 1999 -+++ configure Mon Oct 25 16:28:54 1999 -@@ -1858,6 +1858,7 @@ - fi - - -+if false; then - # Check for any special flags to pass to ltconfig. - libtool_flags="--cache-file=$cache_file" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -@@ -2158,6 +2159,7 @@ - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. - exec 5>>./config.log -+fi - - - echo $ac_n "checking for distribution root""... $ac_c" 1>&6 diff --git a/x11/eterm/patches/patch-ab b/x11/eterm/patches/patch-ab deleted file mode 100644 index 2ab11bb1d85..00000000000 --- a/x11/eterm/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2001/04/28 11:07:35 zuntum Exp $ - ---- doc/Makefile.in.orig Mon Apr 26 10:54:04 1999 -+++ doc/Makefile.in Mon Oct 25 16:29:33 1999 -@@ -253,7 +253,7 @@ - $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@ - - Eterm.1.html: Eterm.1 -- -nroff -man $< | man2html > $@ -+ -nroff -man Eterm.1 | man2html > $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11/eterm/patches/patch-ac b/x11/eterm/patches/patch-ac deleted file mode 100644 index 8aa4a3623b6..00000000000 --- a/x11/eterm/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2001/04/28 11:07:35 zuntum Exp $ - ---- themes/Makefile.in.orig Mon Apr 26 10:53:58 1999 -+++ themes/Makefile.in Mon Oct 25 18:10:44 1999 -@@ -214,19 +214,13 @@ - done - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes - -@for i in $(THEMES) ; do \ -- if test ! -d $(DESTDIR)$(pkgdatadir)/themes/$$i ; then \ - echo "Installing $$i theme in $(DESTDIR)$(pkgdatadir)/themes" ; \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ - $(CP) $(srcdir)/$$i/???* $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ - $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ - $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \ - rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/MAIN.in ; \ -- else \ -- echo "ALERT! Not overwriting theme $$i in $(DESTDIR)$(pkgdatadir)/themes. You will need to update this theme manually." ; \ -- fi ; \ - done -- @if test ! -f $(HOME)/.active.tags ; then $(CP) $(srcdir)/active.tags $(HOME)/.active.tags ; \ -- else echo "Not installing $(HOME)/.active.tags -- File exists." ; fi - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11/eterm/patches/patch-ad b/x11/eterm/patches/patch-ad index be263902851..ccd83d08413 100644 --- a/x11/eterm/patches/patch-ad +++ b/x11/eterm/patches/patch-ad @@ -1,12 +1,11 @@ -$NetBSD: patch-ad,v 1.2 2001/04/28 11:07:35 zuntum Exp $ - ---- utils/Etbg.c.orig Thu Oct 28 02:18:26 1999 -+++ utils/Etbg.c -@@ -24,7 +24,6 @@ - */ +$NetBSD: patch-ad,v 1.3 2002/12/26 04:58:45 wiz Exp $ +--- utils/Etbg.c.orig Sat Dec 14 12:42:36 2002 ++++ utils/Etbg.c Sat Dec 14 12:42:50 2002 +@@ -26,7 +26,6 @@ + #include <config.h> #include <stdio.h> -#include <string.h> #ifndef FALSE - # define FALSE (0) + # define FALSE (0) 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; diff --git a/x11/eterm/patches/patch-ai b/x11/eterm/patches/patch-ai new file mode 100644 index 00000000000..b3d70486af5 --- /dev/null +++ b/x11/eterm/patches/patch-ai @@ -0,0 +1,12 @@ +$NetBSD: patch-ai,v 1.1 2002/12/26 04:58:45 wiz Exp $ +--- doc/Makefile.in.orig Sun Dec 15 00:50:46 2002 ++++ doc/Makefile.in Sun Dec 15 00:51:30 2002 +@@ -267,7 +267,7 @@ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +-all: Makefile Eterm.1.html ++all: Makefile + + Eterm.1: $(top_srcdir)/doc/Eterm.1.in + $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@ |