pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xview-lib Make this crap build again. Don't use si...
details: https://anonhg.NetBSD.org/pkgsrc/rev/75d29fae0659
branches: trunk
changeset: 546389:75d29fae0659
user: dholland <dholland%pkgsrc.org@localhost>
date: Sat Aug 30 20:01:28 2008 +0000
description:
Make this crap build again. Don't use sigvec(); it's no longer supported
on NetBSD and probably elsewhere.
Because the build wasn't stopping on error, prior builds of this package
"succeeded" and generated a shared library missing some code. For this
reason, bump both PKGREVISION and BUILDLINK_ABI_DEPENDS.
diffstat:
x11/xview-lib/Makefile | 4 +-
x11/xview-lib/buildlink3.mk | 4 +-
x11/xview-lib/distinfo | 13 +-
x11/xview-lib/patches/patch-af | 13 ++-
x11/xview-lib/patches/patch-cj | 79 +++++++++++++++++++--
x11/xview-lib/patches/patch-ck | 80 ++++++++++++++++++++-
x11/xview-lib/patches/patch-cn | 17 +++-
x11/xview-lib/patches/patch-dm | 148 +++++++++++++++++++++++++++++++++++++++-
x11/xview-lib/patches/patch-em | 13 +++
9 files changed, 334 insertions(+), 37 deletions(-)
diffs (truncated from 553 to 300 lines):
diff -r 3086a7959bb6 -r 75d29fae0659 x11/xview-lib/Makefile
--- a/x11/xview-lib/Makefile Sat Aug 30 19:52:50 2008 +0000
+++ b/x11/xview-lib/Makefile Sat Aug 30 20:01:28 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2007/02/22 19:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2008/08/30 20:01:28 dholland Exp $
DISTNAME= xview3.2p1-X11R6
PKGNAME= xview-lib-3.2.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff -r 3086a7959bb6 -r 75d29fae0659 x11/xview-lib/buildlink3.mk
--- a/x11/xview-lib/buildlink3.mk Sat Aug 30 19:52:50 2008 +0000
+++ b/x11/xview-lib/buildlink3.mk Sat Aug 30 20:01:28 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/12/27 13:37:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/08/30 20:01:28 dholland Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XVIEW_LIB_BUILDLINK3_MK:= ${XVIEW_LIB_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@
.if !empty(XVIEW_LIB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.xview-lib+= xview-lib>=3.2.1
-BUILDLINK_ABI_DEPENDS.xview-lib?= xview-lib>=3.2.1nb6
+BUILDLINK_ABI_DEPENDS.xview-lib?= xview-lib>=3.2.1nb7
BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib
.endif # XVIEW_LIB_BUILDLINK3_MK
diff -r 3086a7959bb6 -r 75d29fae0659 x11/xview-lib/distinfo
--- a/x11/xview-lib/distinfo Sat Aug 30 19:52:50 2008 +0000
+++ b/x11/xview-lib/distinfo Sat Aug 30 20:01:28 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2007/06/12 23:10:24 tnn Exp $
+$NetBSD: distinfo,v 1.13 2008/08/30 20:01:28 dholland Exp $
SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -8,7 +8,7 @@
SHA1 (patch-ac) = 56484fc24a4ad8ccbe8067bb703179b3e74582ca
SHA1 (patch-ad) = 7260078b17bb0cc905c626965572b3510259cc42
SHA1 (patch-ae) = 7cc93ff7a26d1b01518b244c7fb0a0e79d7b4b7c
-SHA1 (patch-af) = 87e21efc3f3fe59889136b6ee836fdc49c9edad4
+SHA1 (patch-af) = 71b4935279f8d00af2a1c2b1682cd72e5d7c5bc0
SHA1 (patch-ag) = 2329e9cb1290f7704e547b328d0e852c7ff56a18
SHA1 (patch-ah) = 7331c4107005cfc98c6507f62b567f765d56aaff
SHA1 (patch-ai) = 8f1dfe2f952db58f1ce2ddad80efcddc337199b6
@@ -64,11 +64,11 @@
SHA1 (patch-cg) = 9c3643e0507a62226447712b1f1173973f6ebd5f
SHA1 (patch-ch) = 4ca1610b5ede24852dec3b3087e48680e3ec1aa2
SHA1 (patch-ci) = 645b94302a5d6ba09f29bd5e06f321ac388b592a
-SHA1 (patch-cj) = 4d95e94699fda4a1ed26dcd63a7acece2ce7623d
-SHA1 (patch-ck) = 59b8c342a8bcd32bea0db9003e7da5b7da3d1376
+SHA1 (patch-cj) = d193c1688bef88c5c89bb41da62b9989138e6582
+SHA1 (patch-ck) = fd3045b5ebafa95cf5a963ef6921d14407b55afe
SHA1 (patch-cl) = 6ada5a7257c2495781c805f55e38d4b2b8bcc323
SHA1 (patch-cm) = e743e951a0a4b34a60f091df0e37850bc6dde99e
-SHA1 (patch-cn) = 86bede62bc40d3213b5e4801f84707bc2088f747
+SHA1 (patch-cn) = 8ad590cc4aa6e74dc0e4793cb291b634591372bc
SHA1 (patch-co) = 8983ff1dbd11907d9399b2cf497d74378291a4df
SHA1 (patch-cp) = d989a4a195622b2aba899d70f1700b602eeb771f
SHA1 (patch-cq) = 3d9022971b371500bdf14f800a7e392beefefee0
@@ -93,7 +93,7 @@
SHA1 (patch-dj) = cfc6a0706c67c15e81ff7a5285624cae30a78cc1
SHA1 (patch-dk) = 9ba00db63023e0863901d017b54c05903fb19da4
SHA1 (patch-dl) = 0aef1fe619dc5ff228d813d816f5e974d49bf829
-SHA1 (patch-dm) = 205ac73da2105f82d497279507f93a6ec703a5d0
+SHA1 (patch-dm) = dcc65f8233dc3478b47eee980587c271ebee1c97
SHA1 (patch-dn) = b0ccb6467097b3b1937810d9f1fc6a2b21fbabc2
SHA1 (patch-do) = 14d0e4cb02758b457b2c78ae1ee5d0899b0faa65
SHA1 (patch-dp) = 94c78bf81c6125d14df071eb0d2738eef95b5f17
@@ -119,6 +119,7 @@
SHA1 (patch-ej) = 8eb2a61821f1ebf778ae1fa7a828de3a0b8e2ae6
SHA1 (patch-ek) = 49c51048cb416e53279d9f319466f5eaf5c28ae0
SHA1 (patch-el) = 51e1d47e1f42e1cc62d53b1e4c3426b9dbf4a798
+SHA1 (patch-em) = f475e6d905c8ccaf15074ce6ce27f4dceca2a041
SHA1 (patch-fa) = b17b18509017d19e52c1c54416bec24d67ce2b4d
SHA1 (patch-fb) = 3f6906fe91374c3bfdd77549ec784643887ceee2
SHA1 (patch-fc) = 3b4bd2940d0482ae8280b0cd7935b9368388b703
diff -r 3086a7959bb6 -r 75d29fae0659 x11/xview-lib/patches/patch-af
--- a/x11/xview-lib/patches/patch-af Sat Aug 30 19:52:50 2008 +0000
+++ b/x11/xview-lib/patches/patch-af Sat Aug 30 20:01:28 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2001/12/20 09:19:55 tron Exp $
+$NetBSD: patch-af,v 1.4 2008/08/30 20:01:28 dholland Exp $
---- lib/libxview/base/base.h.orig Tue Jun 29 07:14:42 1993
-+++ lib/libxview/base/base.h Thu Dec 20 10:09:16 2001
+--- lib/libxview/base/base.h.orig 1993-06-29 01:14:42.000000000 -0400
++++ lib/libxview/base/base.h 2008-08-30 14:37:00.000000000 -0400
@@ -6,10 +6,15 @@
* file for terms of the license.
*/
@@ -18,7 +18,7 @@
#include <xview/xv_c_types.h>
-@@ -54,10 +59,12 @@
+@@ -54,12 +59,14 @@
* non-SVR4 systems.
*/
#ifndef SUNOS41
@@ -26,9 +26,12 @@
#define XV_OS_SVR4
-#define XV_USE_TTCOMPAT
#define SYSV_WAIT
- #define SYSV_UCONTEXT
+-#define SYSV_UCONTEXT
+#endif
+#define XV_USE_TTCOMPAT
#define XV_USE_XVFCNTL
#endif
++#define SYSV_UCONTEXT
+ /*
+ * These alloc macros should be functions someday with an error call out
diff -r 3086a7959bb6 -r 75d29fae0659 x11/xview-lib/patches/patch-cj
--- a/x11/xview-lib/patches/patch-cj Sat Aug 30 19:52:50 2008 +0000
+++ b/x11/xview-lib/patches/patch-cj Sat Aug 30 20:01:28 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-cj,v 1.1 2001/12/20 09:20:03 tron Exp $
+$NetBSD: patch-cj,v 1.2 2008/08/30 20:01:28 dholland Exp $
---- lib/libxview/ttysw/tty_init.c.orig Tue Jun 29 07:17:19 1993
-+++ lib/libxview/ttysw/tty_init.c Thu Dec 20 10:09:17 2001
-@@ -14,6 +14,7 @@
+--- lib/libxview/ttysw/tty_init.c.orig 1993-06-29 01:17:19.000000000 -0400
++++ lib/libxview/ttysw/tty_init.c 2008-08-30 14:57:05.000000000 -0400
+@@ -14,6 +14,7 @@ static char sccsid[] = "@(#)tty_init
* Ttysw initialization, destruction and error procedures
*/
@@ -10,7 +10,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
-@@ -82,7 +83,11 @@
+@@ -82,7 +83,11 @@ static char sccsid[] = "@(#)tty_init
extern char *strncpy();
extern char *strcpy();
@@ -22,7 +22,7 @@
char *textsw_checkpoint_undo();
/* static */ void ttysw_parseargs();
-@@ -106,6 +111,7 @@
+@@ -106,6 +111,7 @@ Xv_private char *xv_font_monospace();
extern int ttysel_use_seln_service;
@@ -30,7 +30,68 @@
struct ttysw_createoptions {
int becomeconsole; /* be the console */
-@@ -518,6 +524,9 @@
+@@ -432,10 +438,8 @@ ttysw_fork_it(ttysw0, argv, wfd)
+ char appname[20];
+ char *p;
+ unsigned ttysw_error_sleep = 1;
+-#ifndef SVR4
+- struct sigvec vec, ovec;
+-#else
+ struct sigaction vec, ovec;
++#ifdef SVR4
+ extern char *ptsname();
+
+ #define BSD_TTY_COMPAT /* yank this if csh ever gets ported properly */
+@@ -461,27 +465,6 @@ ttysw_fork_it(ttysw0, argv, wfd)
+ }
+
+ /* Set up the child characteristics */
+-#ifndef SVR4 /* SunOS4.x code */
+- vec.sv_handler = SIG_DFL;
+- vec.sv_mask = vec.sv_onstack = 0;
+- sigvec(SIGWINCH, &vec, 0);
+- /*
+- * Become session leader, change process group of child
+- * process (me at this point in code) so
+- * its signal stuff doesn't affect the terminal emulator.
+- */
+- setsid();
+- vec.sv_handler = SIG_IGN;
+- vec.sv_mask = vec.sv_onstack = 0;
+- sigvec(SIGTTOU, &vec, &ovec);
+-
+- close(ttysw->ttysw_tty);
+-
+- /* Make the following file descriptor be my controlling terminal */
+- ttysw->ttysw_tty = open("/dev/tty", O_RDWR, 0); /* open master tty* */
+- sigvec(SIGTTOU, &ovec, 0);
+-
+-#else /* SVR4 code */
+ vec.sa_handler = SIG_DFL;
+ sigemptyset(&vec.sa_mask);
+ vec.sa_flags = SA_RESTART;
+@@ -497,13 +480,19 @@ ttysw_fork_it(ttysw0, argv, wfd)
+ vec.sa_flags = SA_RESTART;
+ sigaction(SIGTTOU, &vec, &ovec);
+
++#ifndef SVR4 /* SunOS4.x code */
++ close(ttysw->ttysw_tty);
++
++ /* Make the following file descriptor be my controlling terminal */
++ ttysw->ttysw_tty = open("/dev/tty", O_RDWR, 0); /* open master tty* */
++#else /* SVR4 code */
+ if (unlockpt(ttysw->ttysw_pty) == -1)
+ perror("unlockpt (2)");
+ if ((ttysw->ttysw_tty = open(ptsname(ttysw->ttysw_pty),O_RDWR))<0)
+ return -1;
++#endif /* SVR4 */
+
+ sigaction(SIGTTOU, &ovec, (struct sigaction *) 0);
+-#endif /* SVR4 */
+
+ /*
+ * Initialize file descriptors. Connections to servers are marked as
+@@ -518,6 +507,9 @@ ttysw_fork_it(ttysw0, argv, wfd)
(void) dup2(ttysw->ttysw_tty, 2);
(void) close(ttysw->ttysw_tty);
@@ -40,7 +101,7 @@
if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) {
/* Process arg list */
int argc;
-@@ -955,7 +964,11 @@
+@@ -955,7 +947,11 @@ updateutmp(username, ttyslotuse, ttyfd)
struct utmpx utmp;
#endif
struct passwd *passwdent;
@@ -52,7 +113,7 @@
int f;
char *ttyn;
extern char *ttyname();
-@@ -1007,13 +1020,22 @@
+@@ -1007,13 +1003,22 @@ updateutmp(username, ttyslotuse, ttyfd)
XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n"));
return (0);
}
diff -r 3086a7959bb6 -r 75d29fae0659 x11/xview-lib/patches/patch-ck
--- a/x11/xview-lib/patches/patch-ck Sat Aug 30 19:52:50 2008 +0000
+++ b/x11/xview-lib/patches/patch-ck Sat Aug 30 20:01:28 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ck,v 1.1 2001/12/20 09:20:03 tron Exp $
+$NetBSD: patch-ck,v 1.2 2008/08/30 20:01:28 dholland Exp $
---- lib/libxview/ttysw/tty_main.c.orig Tue Jun 29 07:17:22 1993
-+++ lib/libxview/ttysw/tty_main.c Thu Dec 20 10:09:17 2001
-@@ -75,6 +75,11 @@
+--- lib/libxview/ttysw/tty_main.c.orig 1993-06-29 01:17:22.000000000 -0400
++++ lib/libxview/ttysw/tty_main.c 2008-08-30 15:06:22.000000000 -0400
+@@ -75,6 +75,11 @@ static char sccsid[] = "@(#)tty_main
int committed_left = 0;
#endif
@@ -14,7 +14,7 @@
extern Textsw_index textsw_insert();
#ifdef OW_I18N
extern Textsw_index textsw_insert_wcs();
-@@ -906,8 +911,12 @@
+@@ -906,8 +911,12 @@ ttysw_pty_input(ttysw, pty)
if (int_ucntl == (tiocsti & 0xff))
ttysw_process_STI(ttysw, owbp, cc - 1);
@@ -27,3 +27,73 @@
ttysw_getp(TTY_VIEW_HANDLE_FROM_TTY_FOLIO(ttysw)); /* jcb for nng */
} else
#ifdef OW_I18N
+@@ -1491,11 +1500,12 @@ xv_tty_new_size(ttysw, cols, lines)
+
+ struct ttysize ts;
+ #ifndef SVR4
+- struct sigvec vec, ovec;
++ struct sigaction vec, ovec;
+
++ (void) sigaction(SIGTTOU, NULL, &ovec);
++ vec = ovec;
++ vec.sa_handler = SIG_IGN;
+- vec.sv_handler = SIG_IGN;
+- vec.sv_mask = vec.sv_onstack = 0;
+- (void) sigvec(SIGTTOU, &vec, &ovec);
++ (void) sigaction(SIGTTOU, &vec, NULL);
+ #endif
+
+ ts.ts_lines = lines;
+@@ -1504,7 +1514,7 @@ xv_tty_new_size(ttysw, cols, lines)
+ perror(XV_MSG("ttysw-TIOCSSIZE"));
+
+ #ifndef SVR4
+- (void) sigvec(SIGTTOU, &ovec, 0);
++ (void) sigaction(SIGTTOU, &ovec, NULL);
+ #endif
+ #else /* sun */
+ /*
+@@ -1512,11 +1522,12 @@ xv_tty_new_size(ttysw, cols, lines)
+ */
+ struct winsize ws;
+ #ifndef SVR4
Home |
Main Index |
Thread Index |
Old Index