Subject: pkg/12105: Update of x11/eterm to 0.8.10
To: None <gnats-bugs@gnats.netbsd.org>
From: Tomasz Luchowski <zuntum@eik.pl>
List: netbsd-bugs
Date: 02/01/2001 16:01:21
>Number: 12105
>Category: pkg
>Synopsis: Update of x11/eterm to 0.8.10
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Feb 01 16:04:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:
>Release: 1.5Q
>Organization:
/* [zuntum] zuntum@eik.pl , [WWW] http://zuntum.net */
>Environment:
System: NetBSD cappi 1.5.1_ALPHA NetBSD 1.5.1_ALPHA (CAPPI) #0: Sun Jan 28 13:07:55 CET 2001 root@cappi:/usr/src/sys/arch/i386/compile/CAPPI i386
>Description:
I updated x11/eterm from 0.8.9 to 0.8.10.
Changes in 0.8.10:
------------------
This release is simply a bugfix release of 0.8.9. The 0.8.x series has become the
"stable" branch of Eterm and will only involve bugfixes, no new features. All the
feature development is occuring in the 0.9 series.
I'm not sure why the new eterm installs its libraries
to ${X11BASE}/lib/libEterm-8.10.so, 0.8.9 used
${X11BASE}/lib/libEterm.so.8.9 (the same with libmej).
Please take a look at this, unfortunatelly I'm not libtool guru.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 2000/08/16 00:41:13 1.7
+++ Makefile 2001/02/02 00:00:27
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.7 2000/08/16 00:41:13 wiz Exp $
-DISTNAME= Eterm-0.8.9
-PKGNAME= eterm-0.8.9
+DISTNAME= Eterm-0.8.10
+PKGNAME= eterm-0.8.10
CATEGORIES= x11
MASTER_SITES= ftp://ftp.eterm.org/pub/Eterm/ \
ftp://alien.eterm.org/pub/Eterm/ \
@@ -26,7 +26,7 @@
.include "../../mk/bsd.prefs.mk"
pre-build:
- @if ${PKG_INFO} -qe 'eterm<0.8.9'; then \
+ @if ${PKG_INFO} -qe 'eterm<0.8.10'; then \
${ECHO} "**** An older version of Eterm is installed"; \
${ECHO} "**** ${PKGNAME} cannot be built with it installed."; \
${ECHO} "**** Please delete it before building"; \
Index: files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/files/md5,v
retrieving revision 1.2
diff -u -r1.2 md5
--- md5 1999/10/28 00:31:58 1.2
+++ md5 2001/02/02 00:00:27
@@ -1,6 +1,6 @@
-$NetBSD: md5,v 1.2 1999/10/28 00:31:58 jlam Exp $
+$NetBSD$
-MD5 (Eterm-0.8.9.tar.gz) = 9e4945a6920f7d10cf28516266307519
+MD5 (Eterm-0.8.10.tar.gz) = 44b0b498d8186205d0898b266643fbf1
MD5 (Eterm-bg-scale-1.tar.gz) = 8fe075c118acb7bf050a5b616bf764e0
MD5 (Eterm-bg-scale-2.tar.gz) = ba1b3ceec51bd4196df1b887c8396475
MD5 (Eterm-bg-tile.tar.gz) = 24a60f33a3611b4c7a6e8a2b65dc120d
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/files/patch-sum,v
retrieving revision 1.2
diff -u -r1.2 patch-sum
--- patch-sum 1999/10/28 00:31:58 1.2
+++ patch-sum 2001/02/02 00:00:27
@@ -1,6 +1,6 @@
$NetBSD: patch-sum,v 1.2 1999/10/28 00:31:58 jlam Exp $
MD5 (patch-aa) = c26caddd78ca90fbde3451e38139e5b6
-MD5 (patch-ab) = 66922deac5b0c8d51ac4d9489328938f
-MD5 (patch-ac) = a7d807c685e137e4d09c75230999a25a
-MD5 (patch-ad) = 159e6945de34e96764e7981f337685dd
+MD5 (patch-ab) = 8488943669e9c27c744196384fc8d353
+MD5 (patch-ac) = e1e9f69c9e6eb0f3f97e4fce7d87088d
+MD5 (patch-ad) = d54c043cd0a293822a99165e0d0cc94b
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patch-ab 1999/10/28 00:31:59 1.2
+++ patch-ab 2001/02/02 00:00:27
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 1999/10/28 00:31:59 jlam Exp $
+$NetBSD$
---- doc/Makefile.in.orig Mon Apr 26 10:54:04 1999
-+++ doc/Makefile.in Mon Oct 25 16:29:33 1999
+--- doc/Makefile.in.orig Fri Nov 5 20:03:56 1999
++++ doc/Makefile.in
@@ -253,7 +253,7 @@
- $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $@.in > $@
+ $(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 > $@
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/patches/patch-ac,v
retrieving revision 1.1
diff -u -r1.1 patch-ac
--- patch-ac 1999/10/28 00:33:09 1.1
+++ patch-ac 2001/02/02 00:00:27
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 1999/10/28 00:33:09 jlam Exp $
+$NetBSD$
---- themes/Makefile.in.orig Mon Apr 26 10:53:58 1999
-+++ themes/Makefile.in Mon Oct 25 18:10:44 1999
+--- themes/Makefile.in.orig Fri Nov 5 20:03:55 1999
++++ themes/Makefile.in
@@ -214,19 +214,13 @@
done
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes
@@ -9,7 +9,7 @@
- if test ! -d $(DESTDIR)$(pkgdatadir)/themes/$$i ; then \
echo "Installing $$i theme in $(DESTDIR)$(pkgdatadir)/themes" ; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
- $(CP) $$i/???* $(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 ; \
@@ -17,7 +17,7 @@
- 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) active.tags $(HOME)/.active.tags ; \
+- @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.
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/patches/patch-ad,v
retrieving revision 1.1
diff -u -r1.1 patch-ad
--- patch-ad 1999/10/28 00:33:10 1.1
+++ patch-ad 2001/02/02 00:00:27
@@ -1,28 +1,12 @@
-$NetBSD: patch-ad,v 1.1 1999/10/28 00:33:10 jlam Exp $
+$NetBSD$
---- utils/Etbg.c.orig Fri Mar 26 20:13:46 1999
-+++ utils/Etbg.c Mon Oct 25 17:50:41 1999
-@@ -26,12 +26,20 @@
- #include <stdio.h>
- #include <string.h>
+--- utils/Etbg.c.orig Thu Oct 28 02:18:26 1999
++++ utils/Etbg.c
+@@ -24,7 +24,6 @@
+ */
-+#ifdef FALSE
-+#undef FALSE
-+#endif
-+#define FALSE 0
-+
-+#ifdef TRUE
-+#undef TRUE
-+#endif
-+#define TRUE 1
-+
- int
- main(int argc, char **argv)
- {
-- enum {
-- FALSE, TRUE
-- } scale = FALSE, trans = FALSE;
-+ int scale = FALSE, trans = FALSE;
- unsigned int i, pic = 0, tint = 0, shade = 0;
+ #include <stdio.h>
+-#include <string.h>
- for (i = 1; i < argc; i++) {
+ #ifndef FALSE
+ # define FALSE (0)
Index: pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/eterm/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- PLIST 2001/01/04 15:10:59 1.5
+++ PLIST 2001/02/02 00:00:28
@@ -7,13 +7,11 @@
lib/libEterm.a
lib/libEterm.la
lib/libEterm.so
-lib/libEterm.so.8
-lib/libEterm.so.8.9
+lib/libEterm-0.8.10.so
lib/libmej.a
lib/libmej.la
lib/libmej.so
-lib/libmej.so.8
-lib/libmej.so.8.9
+lib/libmej-0.8.10.so
man/man1/Eterm.1
share/Eterm/pix/004.png
share/Eterm/pix/014.png
>Release-Note:
>Audit-Trail:
>Unformatted: