pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/aterm Update to 1.0.0. Too many changes to list, p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3c8a4e7306db
branches: trunk
changeset: 505219:3c8a4e7306db
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Sun Jan 01 12:58:00 2006 +0000
description:
Update to 1.0.0. Too many changes to list, please see the Changelog
file.
diffstat:
x11/aterm/Makefile | 10 +++---
x11/aterm/distinfo | 12 ++-----
x11/aterm/patches/patch-aa | 34 ------------------------
x11/aterm/patches/patch-ab | 14 ----------
x11/aterm/patches/patch-ae | 64 ----------------------------------------------
x11/aterm/patches/patch-af | 43 ------------------------------
6 files changed, 9 insertions(+), 168 deletions(-)
diffs (218 lines):
diff -r 559df4d98e49 -r 3c8a4e7306db x11/aterm/Makefile
--- a/x11/aterm/Makefile Sun Jan 01 11:13:39 2006 +0000
+++ b/x11/aterm/Makefile Sun Jan 01 12:58:00 2006 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2005/12/29 06:22:25 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/01 12:58:00 xtraeme Exp $
#
-DISTNAME= aterm-0.4.2
-PKGREVISION= 7
+DISTNAME= aterm-1.0.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://aterm.sourceforge.net/
@@ -38,8 +38,8 @@
# Make aterm setuid root so that tty ownership setting and utmp logging
# function correctly.
#
-CONFIGURE_ARGS+=--enable-ttygid
-SPECIAL_PERMS= ${PREFIX}/bin/aterm ${SETUID_ROOT_PERMS}
+CONFIGURE_ARGS+= --enable-ttygid
+SPECIAL_PERMS= ${PREFIX}/bin/aterm ${SETUID_ROOT_PERMS}
.endif
.include "../../graphics/jpeg/buildlink3.mk"
diff -r 559df4d98e49 -r 3c8a4e7306db x11/aterm/distinfo
--- a/x11/aterm/distinfo Sun Jan 01 11:13:39 2006 +0000
+++ b/x11/aterm/distinfo Sun Jan 01 12:58:00 2006 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:09 wiz Exp $
+$NetBSD: distinfo,v 1.10 2006/01/01 12:58:00 xtraeme Exp $
-SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b
-RMD160 (aterm-0.4.2.tar.gz) = 7d9b8467ab994717d9b7d281c07152f25924872a
-Size (aterm-0.4.2.tar.gz) = 312730 bytes
-SHA1 (patch-aa) = 59cf8fe42bf4291b2a98c0d95170a02308197645
-SHA1 (patch-ab) = 9b4e6785912de338db958e9ad48c4cafcb344270
+SHA1 (aterm-1.0.0.tar.bz2) = 806fd20aec2851c5eea26d9e6a707985da3579a3
+RMD160 (aterm-1.0.0.tar.bz2) = b74f54b6aa6f1d4a094671507c30f627f074eb48
+Size (aterm-1.0.0.tar.bz2) = 248708 bytes
SHA1 (patch-ac) = 28c79343079680251a013ec3fe364b01f5a5ccac
SHA1 (patch-ad) = 0c87ee69672e98189afa2cfdcdd9691a1571f354
-SHA1 (patch-ae) = 469251f0ab9bd8db70700d742c7a161c705669c8
-SHA1 (patch-af) = e8e41fbc9837e87bc6bc495b4b698617bd1ea2ea
diff -r 559df4d98e49 -r 3c8a4e7306db x11/aterm/patches/patch-aa
--- a/x11/aterm/patches/patch-aa Sun Jan 01 11:13:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/12/11 16:02:08 wiz Exp $
-
---- configure.orig Thu Sep 6 18:38:07 2001
-+++ configure
-@@ -1822,7 +1822,7 @@
-
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
-- X_LIBS="$X_LIBS -L$x_libraries"
-+ X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
- case "`(uname -sr) 2>/dev/null`" in
-@@ -1850,9 +1850,9 @@
- rm -f conftest*
- if test $ac_R_nospace = yes; then
- echo "$ac_t""no" 1>&6
-- X_LIBS="$X_LIBS -R$x_libraries"
-+ X_LIBS="$X_LIBS -R$x_libraries -Wl,-R$x_libraries"
- else
-- LIBS="$ac_xsave_LIBS -R $x_libraries"
-+ LIBS="$ac_xsave_LIBS -R $x_libraries -Wl,-R$x_libraries"
- cat > conftest.$ac_ext <<EOF
- #line 1858 "configure"
- #include "confdefs.h"
-@@ -1873,7 +1873,7 @@
- rm -f conftest*
- if test $ac_R_space = yes; then
- echo "$ac_t""yes" 1>&6
-- X_LIBS="$X_LIBS -R $x_libraries"
-+ X_LIBS="$X_LIBS -R $x_libraries -Wl,-R$x_libraries"
- else
- echo "$ac_t""neither works" 1>&6
- fi
diff -r 559df4d98e49 -r 3c8a4e7306db x11/aterm/patches/patch-ab
--- a/x11/aterm/patches/patch-ab Sun Jan 01 11:13:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/12/11 16:02:09 wiz Exp $
-
---- doc/Makefile.in.orig Tue Dec 11 16:54:36 2001
-+++ doc/Makefile.in
-@@ -65,9 +65,6 @@
- aterm.pretbl: $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
- yodl2man -oaterm.pretbl yodl/aterm.yo
-
--aterm.1: aterm.pretbl
-- tbl aterm.pretbl > $@
--
- aterm.html: $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
- yodl2html -o$@ yodl/aterm.yo
-
diff -r 559df4d98e49 -r 3c8a4e7306db x11/aterm/patches/patch-ae
--- a/x11/aterm/patches/patch-ae Sun Jan 01 11:13:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2005/02/14 15:40:49 rillig Exp $
-
---- src/command.c.orig Thu Sep 6 18:38:07 2001
-+++ src/command.c Mon Feb 14 16:26:50 2005
-@@ -534,7 +534,11 @@
- ttydev = tty_name;
-
- # define PTYCHAR1 "pqrstuvwxyz"
-+#ifdef __NetBSD__
-+# define PTYCHAR2 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-+#else
- # define PTYCHAR2 "0123456789abcdef"
-+#endif
- for (c1 = PTYCHAR1; *c1; c1++) {
- ptydev[len - 2] = ttydev[len - 2] = *c1;
- for (c2 = PTYCHAR2; *c2; c2++) {
-@@ -1146,6 +1150,11 @@ init_command(char *argv[])
- num_fds = getdtablesize();
- #endif
-
-+#if defined(__NetBSD__)
-+ if (num_fds > FD_SETSIZE)
-+ num_fds = FD_SETSIZE;
-+#endif
-+
- #ifdef META8_OPTION
- meta_char = (Options & Opt_meta8 ? 0x80 : 033);
- if (rs_modifier
-@@ -1763,16 +1772,21 @@
- }
- break;
-
-+ case XK_F1: /* "\033OP" */
-+ case XK_F2: /* "\033OQ" */
-+ case XK_F3: /* "\033OR" */
-+ case XK_F4: /* "\033OS" */
-+ len = 3;
-+ STRCPY(kbuf, "\033OP");
-+ kbuf[2] += (keysym - XK_F1);
-+ break;
-+
- #define FKEY(n, fkey) \
- len = 5; \
- sprintf((char *) kbuf,"\033[%02d~", (int)((n) + (keysym - fkey)))
-
-- case XK_F1: /* "\033[11~" */
-- case XK_F2: /* "\033[12~" */
-- case XK_F3: /* "\033[13~" */
-- case XK_F4: /* "\033[14~" */
- case XK_F5: /* "\033[15~" */
-- FKEY(11, XK_F1);
-+ FKEY(15, XK_F5);
- break;
-
- case XK_F6: /* "\033[17~" */
-@@ -2024,7 +2038,7 @@
- #endif
-
- /* See if we can read from the application */
-- if (FD_ISSET(cmd_fd, &readfds)) {
-+ if (retval > 0 && FD_ISSET(cmd_fd, &readfds)) {
- unsigned int count = BUFSIZ;
-
- cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
diff -r 559df4d98e49 -r 3c8a4e7306db x11/aterm/patches/patch-af
--- a/x11/aterm/patches/patch-af Sun Jan 01 11:13:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/06/02 20:07:59 recht Exp $
-
---- src/screen.c.orig 2001-09-06 18:38:07.000000000 +0200
-+++ src/screen.c 2004-05-30 12:43:05.000000000 +0200
-@@ -3313,14 +3313,6 @@
-
- /* ------------------------------------------------------------------------- */
- /*
-- * On some systems, the Atom typedef is 64 bits wide. We need to have a type
-- * that is exactly 32 bits wide, because a format of 64 is not allowed by
-- * the X11 protocol.
-- */
--typedef CARD32 Atom32;
--
--/* ------------------------------------------------------------------------- */
--/*
- * Respond to a request for our current selection
- * EXT: SelectionRequest
- */
-@@ -3329,7 +3321,7 @@
- selection_send(XSelectionRequestEvent * rq)
- {
- XEvent ev;
-- Atom32 target_list[2];
-+ Atom target_list[2];
- static Atom xa_targets = None;
-
- if (xa_targets == None)
-@@ -3344,10 +3336,10 @@
- ev.xselection.time = rq->time;
-
- if (rq->target == xa_targets) {
-- target_list[0] = (Atom32) xa_targets;
-- target_list[1] = (Atom32) XA_STRING;
-- XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
-- (8 * sizeof(target_list[0])), PropModeReplace,
-+ target_list[0] = xa_targets;
-+ target_list[1] = XA_STRING;
-+ XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM,
-+ 32, PropModeReplace,
- (unsigned char *)target_list,
- (sizeof(target_list) / sizeof(target_list[0])));
- ev.xselection.property = rq->property;
Home |
Main Index |
Thread Index |
Old Index