diff options
author | sketch <sketch> | 2006-11-25 14:01:18 +0000 |
---|---|---|
committer | sketch <sketch> | 2006-11-25 14:01:18 +0000 |
commit | ec84d8abbc4aa577682abded5ad9a40f288880ba (patch) | |
tree | c3ee19eafc24d5d5f407f697080487b7c2fb40b5 /x11/eterm | |
parent | 151352734b1ec26acf6ef88f4d8f7224cf0d65e3 (diff) | |
download | pkgsrc-ec84d8abbc4aa577682abded5ad9a40f288880ba.tar.gz |
Update Eterm to 0.9.4, lots of bugfixes (especially fixing colourmaps), and
some initial UTF-8 support.
Diffstat (limited to 'x11/eterm')
-rw-r--r-- | x11/eterm/Makefile | 5 | ||||
-rw-r--r-- | x11/eterm/distinfo | 18 | ||||
-rw-r--r-- | x11/eterm/patches/patch-aa | 10 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ab | 12 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ah | 51 | ||||
-rw-r--r-- | x11/eterm/patches/patch-ai | 10 | ||||
-rw-r--r-- | x11/eterm/patches/patch-aj | 13 |
7 files changed, 34 insertions, 85 deletions
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 4a17af629e3..96a9d885485 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2006/11/19 01:52:40 obache Exp $ +# $NetBSD: Makefile,v 1.50 2006/11/25 14:01:18 sketch Exp $ -DISTNAME= Eterm-0.9.3 +DISTNAME= Eterm-0.9.4 PKGNAME= ${DISTNAME:S/^E/e/} -PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/} \ ftp://ftp.dti.ad.jp/pub/X/Eterm/ diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo index e34fb217f23..bc85d9e758e 100644 --- a/x11/eterm/distinfo +++ b/x11/eterm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2006/08/08 10:49:01 wiz Exp $ +$NetBSD: distinfo,v 1.15 2006/11/25 14:01:18 sketch Exp $ -SHA1 (Eterm-0.9.3.tar.gz) = df12cb09676ca265d65b8b5ac61f1ec88d58c692 -RMD160 (Eterm-0.9.3.tar.gz) = 4e9f57807f1658cf8bea90219e296f4184f31452 -Size (Eterm-0.9.3.tar.gz) = 660767 bytes +SHA1 (Eterm-0.9.4.tar.gz) = d63628098b3aa08c8f2bc1bd756683e5fd227995 +RMD160 (Eterm-0.9.4.tar.gz) = ce5d7ba74b19e3c8992d104d00f10302c3e8150e +Size (Eterm-0.9.4.tar.gz) = 814823 bytes SHA1 (Eterm-bg-scale-1.tar.gz) = 39c6146740edf04ddb0aa40ed4e078e8317b0557 RMD160 (Eterm-bg-scale-1.tar.gz) = cafda0b5cb42803d4b573bb0595e6ef83b54bfe2 Size (Eterm-bg-scale-1.tar.gz) = 3420298 bytes @@ -12,10 +12,8 @@ Size (Eterm-bg-scale-2.tar.gz) = 3145775 bytes SHA1 (Eterm-bg-tile.tar.gz) = 2ccb31a8fd0e80e5dd92aebef6baf5554f66e361 RMD160 (Eterm-bg-tile.tar.gz) = 43761cc527730a0305fd857fad1316b8fd04eefe Size (Eterm-bg-tile.tar.gz) = 1568166 bytes -SHA1 (patch-aa) = e47c20515232098f660a166af4d4c52a2f044d73 -SHA1 (patch-ab) = ad802e27730e4d6451d4d64de09750811afcf7b7 -SHA1 (patch-ac) = 83dc10c1e026836e5487f77456a877fe723d5f5c +SHA1 (patch-aa) = 19da5e05392994a60fdf47e9d52c82fc41cefa4c +SHA1 (patch-ab) = d019a18bb32f890d6de7c5bb0cdb43e7715a7d4d SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8 -SHA1 (patch-ah) = 694d1348c05a392c193a6efa688c116c434c6e9e -SHA1 (patch-ai) = a8499316ec96198ca2deceaf1838d68f36ba100d -SHA1 (patch-aj) = b6782d1de8d8cd85a0e8a2fdd2a4f459bffdd8f7 +SHA1 (patch-ah) = e9a924abff857448a6d7c9281915bcf001b7451c +SHA1 (patch-ai) = 94d684a490752831de2fb2aba92c0b9f461ddb5a diff --git a/x11/eterm/patches/patch-aa b/x11/eterm/patches/patch-aa index a6bce37d67c..f84a2e501f3 100644 --- a/x11/eterm/patches/patch-aa +++ b/x11/eterm/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.5 2005/01/11 14:02:06 adam Exp $ +$NetBSD: patch-aa,v 1.6 2006/11/25 14:01:18 sketch Exp $ ---- bg/Makefile.in.orig 2004-12-14 18:46:52.000000000 +0000 -+++ bg/Makefile.in -@@ -250,7 +250,7 @@ install-data-hook: +--- bg/Makefile.in.orig 2006-11-25 09:47:08.000000000 +0000 ++++ bg/Makefile.in 2006-11-25 09:47:22.000000000 +0000 +@@ -369,7 +369,7 @@ $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir}/$$j/ ; \ done) ; \ done) - $(UPDATE_SCRIPT) $(DESTDIR)${pixmapdir} + $(SHELL) $(UPDATE_SCRIPT) $(DESTDIR)${pixmapdir} - # 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. + .NOEXPORT: diff --git a/x11/eterm/patches/patch-ab b/x11/eterm/patches/patch-ab index 4c5b367d297..3ce0a47edfa 100644 --- a/x11/eterm/patches/patch-ab +++ b/x11/eterm/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2005/01/11 14:02:06 adam Exp $ +$NetBSD: patch-ab,v 1.7 2006/11/25 14:01:18 sketch Exp $ ---- configure.orig 2004-12-14 18:46:33.000000000 +0000 -+++ configure -@@ -10486,8 +10486,8 @@ fi +--- configure.orig 2006-11-25 09:48:20.000000000 +0000 ++++ configure 2006-11-25 09:49:51.000000000 +0000 +@@ -26674,8 +26674,8 @@ fi @@ -10,6 +10,6 @@ $NetBSD: patch-ab,v 1.6 2005/01/11 14:02:06 adam Exp $ -CONFIG_SEARCH_PATH=`eval eval eval eval eval echo "$CONFIG_SEARCH_PATH:${sysconfdir}/$PACKAGE:/etc/$PACKAGE:${datadir}/$PACKAGE"` +CONFIG_SEARCH_PATH=`eval eval eval eval eval echo "${sysconfdir}/themes:${datadir}/$PACKAGE/themes"` +CONFIG_SEARCH_PATH=`eval eval eval eval eval echo "$CONFIG_SEARCH_PATH:${sysconfdir}:${datadir}/$PACKAGE"` - cat >> confdefs.h <<EOF + + cat >>confdefs.h <<_ACEOF #define CONFIG_SEARCH_PATH "~/.Eterm/themes:~/.Eterm:$CONFIG_SEARCH_PATH" - EOF diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah index fb0b7f2efdb..6decf6ec1c1 100644 --- a/x11/eterm/patches/patch-ah +++ b/x11/eterm/patches/patch-ah @@ -1,16 +1,8 @@ -$NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $ ---- src/utmp.c.orig Thu Jun 27 14:15:53 2002 -+++ src/utmp.c Sat Dec 14 21:44:17 2002 -@@ -38,7 +38,7 @@ - # endif - - /* don't go off end of ut_id & remember if an entry has been made */ --# if defined(USE_SYSV_UTMP) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) -+# if defined(USE_SYSV_UTMP) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) - static char ut_id[5]; /* remember if entry to utmp made */ - # else - static int utmp_pos; /* BSD position of utmp-stamp */ -@@ -47,8 +47,13 @@ static int utmp_pos; /* BSD p +$NetBSD: patch-ah,v 1.6 2006/11/25 14:01:18 sketch Exp $ + +--- src/utmp.c.orig 2006-05-11 04:33:40.000000000 +0100 ++++ src/utmp.c 2006-11-25 13:01:25.000000000 +0000 +@@ -47,8 +47,13 @@ # ifdef USE_SYSV_UTMP # ifdef HAVE_UTMPX_H @@ -25,7 +17,7 @@ $NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $ # define update_wtmp updwtmpx # else /* HAVE_UTMPX_H */ -@@ -128,9 +133,9 @@ add_utmp_entry(const char *pty, const ch +@@ -128,9 +133,9 @@ privileges(INVOKE); # ifdef HAVE_UTMPX_H getutmp(&utmp, &utmp2); @@ -37,7 +29,7 @@ $NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $ # endif /* set up the new entry */ -@@ -152,16 +157,15 @@ add_utmp_entry(const char *pty, const ch +@@ -152,16 +157,15 @@ /* * write a utmp entry to the utmp file */ @@ -56,7 +48,7 @@ $NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $ privileges(REVERT); return; fd = 0; -@@ -177,19 +181,19 @@ remove_utmp_entry(void) +@@ -177,19 +181,19 @@ if (!ut_id[0]) return; /* entry not made */ @@ -84,30 +76,3 @@ $NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $ # else /* HAVE_UTMPX_H */ struct utmp *putmp; -@@ -222,7 +226,7 @@ remove_utmp_entry(void) - # else /* USE_SYSV_UTMP */ - /* BSD utmp support */ - --# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__) - - /* used to hold the line we are using */ - static char ut_line[32]; -@@ -348,7 +352,7 @@ add_utmp_entry(const char *pty, const ch - return; - } - --# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__) - strncpy(ut_line, pty, 31); - - strncpy(utmp.ut_line, pty, UT_LINESIZE); -@@ -376,7 +380,7 @@ add_utmp_entry(const char *pty, const ch - void - remove_utmp_entry(void) - { --# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__) - logout(ut_line); - logwtmp(ut_line, "", ""); - # else /* __FreeBSD__ */ diff --git a/x11/eterm/patches/patch-ai b/x11/eterm/patches/patch-ai index c4d7212d2a4..1164585c84a 100644 --- a/x11/eterm/patches/patch-ai +++ b/x11/eterm/patches/patch-ai @@ -1,9 +1,9 @@ -$NetBSD: patch-ai,v 1.2 2005/01/11 14:02:06 adam Exp $ +$NetBSD: patch-ai,v 1.3 2006/11/25 14:01:18 sketch Exp $ ---- doc/Makefile.in.orig 2004-12-14 18:46:51.000000000 +0000 -+++ doc/Makefile.in -@@ -282,7 +282,7 @@ installdirs mostlyclean-generic distclea - maintainer-clean-generic clean mostlyclean distclean maintainer-clean +--- doc/Makefile.in.orig 2006-11-25 13:02:09.000000000 +0000 ++++ doc/Makefile.in 2006-11-25 13:02:41.000000000 +0000 +@@ -414,7 +414,7 @@ + uninstall-man1 -all: Makefile Eterm.1.html diff --git a/x11/eterm/patches/patch-aj b/x11/eterm/patches/patch-aj deleted file mode 100644 index 4b5a94c2d84..00000000000 --- a/x11/eterm/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2005/10/03 19:52:04 joerg Exp $ - ---- src/eterm_utmp.h.orig 2005-07-31 00:03:43.000000000 +0000 -+++ src/eterm_utmp.h -@@ -69,7 +69,7 @@ - # ifdef HAVE_LASTLOG_H - # include <lastlog.h> - # endif --# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__) - # include <ttyent.h> - # endif - |