aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/xview
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/xview')
-rw-r--r--x11-toolkits/xview/Makefile8
-rw-r--r--x11-toolkits/xview/files/patch-Imakefile31
-rw-r--r--x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c12
-rw-r--r--x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c16
-rw-r--r--x11-toolkits/xview/files/patch-lib+libxview+ttysw+termsw.c12
-rw-r--r--x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_modes.c26
-rw-r--r--x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c27
-rw-r--r--x11-toolkits/xview/pkg-plist2
8 files changed, 110 insertions, 24 deletions
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 67cc4d065152..3c7b0cbb81bb 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -30,8 +30,10 @@ MAN1= msgfmt.1 xgettext.1 xview.1
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Broken by changes to make(1) on FreeBSD >= 5.x"
+.if ${X_WINDOW_SYSTEM:L} == "xorg"
+PLIST_SUB+= XORG="@comment "
+.else
+PLIST_SUB+= XORG=""
.endif
post-patch:
@@ -52,7 +54,7 @@ pre-configure:
post-install:
.if !defined{NOPORTDOCS}
- @(cd ${WRKSRC}; ${MAKE} -k 'SUBDIRS=doc' install)
+ @(cd ${WRKSRC}/doc; ${MAKE} install)
.endif
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/xview/files/patch-Imakefile b/x11-toolkits/xview/files/patch-Imakefile
index d5252f4d73fc..ff53199f4a60 100644
--- a/x11-toolkits/xview/files/patch-Imakefile
+++ b/x11-toolkits/xview/files/patch-Imakefile
@@ -1,5 +1,5 @@
---- Imakefile.orig Mon Sep 29 00:02:44 2003
-+++ Imakefile Mon Sep 29 00:02:44 2003
+--- Imakefile.orig Sun Jun 26 03:47:22 1994
++++ Imakefile Sat Aug 6 23:14:35 2005
@@ -4,8 +4,8 @@
/**/# Top level Imakefile for ProductNameAndRelease
/**/# @(#)Imakefile 1.7 1/7/92 SMI
@@ -20,3 +20,30 @@
#if InstallOpenLookFonts
FONTSDIR = fonts
#else
+@@ -21,6 +21,9 @@
+ #endif
+ CLIENTSDIR = clients
+ SUBDIRS = $(COREDIRS) $(FONTSDIR)
++.ifdef WITHDOCSUBDIR
++SUBDIRS+= doc
++.endif
+ /**/# even if these subdirs are not included in the general rules, be sure to
+ /**/# do a make clean in them.
+ CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util
+@@ -59,11 +62,11 @@
+ @echo ""
+ @date
+ @echo ""
+- $(MAKE) $(MFLAGS) 'SUBDIRS=$(SUBDIRS) doc' Makefiles
+- $(MAKE) $(MFLAGS) 'CLEAN_SUBDIRS=$(SUBDIRS)' clean
+- $(MAKE) $(MFLAGS) 'SUBDIRS=$(SUBDIRS)' includes
+- $(MAKE) $(MFLAGS) 'SUBDIRS=$(SUBDIRS)' depend
+- $(MAKE) $(MFLAGS) 'SUBDIRS=$(SUBDIRS)' 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(WORLDOPTS)
++ $(MAKE) $(MFLAGS) -DWITHDOCSUBDIR Makefiles
++ $(MAKE) $(MFLAGS) clean
++ $(MAKE) $(MFLAGS) includes
++ $(MAKE) $(MFLAGS) depend
++ $(MAKE) $(MFLAGS) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(WORLDOPTS)
+ @echo ""
+ @date
+ @echo ""
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
index 0d720edd8b1a..72e052f51b25 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
@@ -1,7 +1,11 @@
---- lib/libxview/misc/gettext.c.orig Sun Jul 28 17:07:43 2002
-+++ lib/libxview/misc/gettext.c Sun Jul 28 17:08:14 2002
-@@ -13,7 +13,9 @@
- char * dgettext(), *bindtextdomain();
+--- lib/libxview/misc/gettext.c.orig Sat Aug 6 21:47:27 2005
++++ lib/libxview/misc/gettext.c Sat Aug 6 21:51:07 2005
+@@ -10,10 +10,12 @@
+ #include <xview_private/gettext.h>
+
+ char *strdup();
+-char * dgettext(), *bindtextdomain();
++char * dgettext(char* domain_nane, char* msg_id), *bindtextdomain();
char *_gettext();
char *fgets(), *getenv();
+#ifndef OS_HAS_MMAP
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c
index 7d658bc790ab..cab22dfc066e 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c
@@ -1,5 +1,5 @@
---- lib/libxview/ttysw/term_ntfy.c.orig Fri Oct 17 10:07:41 2003
-+++ lib/libxview/ttysw/term_ntfy.c Fri Oct 17 10:07:41 2003
+--- lib/libxview/ttysw/term_ntfy.c.orig Sat Aug 6 21:47:27 2005
++++ lib/libxview/ttysw/term_ntfy.c Sat Aug 6 22:03:25 2005
@@ -22,7 +22,8 @@
#include <stdio.h>
#include <ctype.h>
@@ -19,3 +19,15 @@
#define GETDTABLESIZE() \
(dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX)))
#else
+@@ -173,9 +174,11 @@
+ * again, this is the place to start looking.
+ */
+ if (ttysw->pending_remote != ttysw->remote) {
++#ifdef TIOCREMOTE
+ if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &ttysw->pending_remote) < 0)
+ perror("ioctl: TIOCREMOTE");
+ else
++#endif
+ ttysw->remote = ttysw->pending_remote;
+ }
+
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+termsw.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+termsw.c
new file mode 100644
index 000000000000..5bf01fec7575
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+termsw.c
@@ -0,0 +1,12 @@
+--- lib/libxview/ttysw/termsw.c.orig Sat Aug 6 21:47:27 2005
++++ lib/libxview/ttysw/termsw.c Sat Aug 6 22:04:10 2005
+@@ -413,7 +413,9 @@
+
+ /* Set the PTY to operate as a "remote terminal". */
+ fd = (int) xv_get(termsw_public, TTY_PTY_FD);
++#ifdef TIOCREMOTE
+ (void) ioctl(fd, TIOCREMOTE, &on);
++#endif /* TIOCREMOTE */
+ ttysw_folio->remote = ttysw_folio->pending_remote = on;
+
+ /*
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_modes.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_modes.c
new file mode 100644
index 000000000000..ae60a68cf0d5
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_modes.c
@@ -0,0 +1,26 @@
+--- lib/libxview/ttysw/tty_modes.c.orig Sat Aug 6 21:47:27 2005
++++ lib/libxview/ttysw/tty_modes.c Sat Aug 6 22:01:01 2005
+@@ -125,9 +125,11 @@
+ /*
+ * Switch the pty out of remote mode.
+ */
++# if defined(TIOCREMOTE)
+ if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &off) < 0)
+ perror("ioctl: TIOCREMOTE");
+ else
++# endif
+ ttysw->remote = ttysw->pending_remote = off;
+ }
+
+@@ -276,9 +278,11 @@
+ */
+ ttysw_getp((Ttysw_view_handle) ttysw_view);
+ ttysw->pending_remote = termsw->cooked_echo;
++# if defined(TIOCREMOTE)
+ if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &ttysw->pending_remote) < 0)
+ perror("ioctl: TIOCREMOTE");
+ else
++# endif /* TIOCREMOTE */
+ ttysw->remote = ttysw->pending_remote;
+
+ if (!ttysw_waiting_for_pty_input) {
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c b/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c
index d5d4d16bc8f7..b91940dfe543 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c
@@ -1,6 +1,6 @@
---- ./lib/libxview/win/win_input.c.orig Sat Apr 1 18:25:30 2000
-+++ ./lib/libxview/win/win_input.c Sat Apr 1 18:25:33 2000
-@@ -854,7 +854,9 @@ ContProcess:
+--- lib/libxview/win/win_input.c.orig Sat Aug 6 21:47:27 2005
++++ lib/libxview/win/win_input.c Sat Aug 6 22:12:06 2005
+@@ -853,7 +853,9 @@
#ifdef X11R6
/* lumpi@dobag.in-berlin.de */
int ksym_pcc;
@@ -11,7 +11,7 @@
for (index = 0; index < ksym_pcc; index++) {
#else
for (index = 0; index < display->keysyms_per_keycode; index++) {
-@@ -862,7 +864,7 @@ ContProcess:
+@@ -861,7 +863,7 @@
if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
if (IsKeypadKey(ksym)) {
/* See if key has been rebound. */
@@ -20,7 +20,16 @@
buffer, BUFFERSIZE)) {
(void)win_translate_KP_keysym(ksym, buffer);
}
-@@ -2721,8 +2723,10 @@ win_translate_KP_keysym(keysym, buffer)
+@@ -2311,7 +2313,7 @@
+ XButtonEvent *bEvent;
+ int timeout;
+ {
+- XEvent xevent;
++ XEvent *xevent;
+
+ /* XView does a passive grab on the SELECT button! */
+ window_x_allow_events(display);
+@@ -2720,8 +2722,10 @@
* Xlib's.
*/
@@ -33,7 +42,7 @@
static int
translate_key(dpy, symbol, modifiers, buffer, nbytes)
Display *dpy;
-@@ -2732,11 +2736,18 @@ translate_key(dpy, symbol, modifiers, bu
+@@ -2731,11 +2735,18 @@
int nbytes;
{
/* This is _very_ rude ! */
@@ -54,9 +63,3 @@
static int
translate_key(dpy, symbol, modifiers, buffer, nbytes)
Display *dpy;
-@@ -2762,4 +2773,4 @@ translate_key(dpy, symbol, modifiers, bu
- }
- return 0;
- }
--#endif
-+#endif
diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist
index 481436e10b27..a445358b2048 100644
--- a/x11-toolkits/xview/pkg-plist
+++ b/x11-toolkits/xview/pkg-plist
@@ -510,7 +510,7 @@ include/xview_private/xv_color.h
include/xview_private/xv_debug.h
include/xview_private/xv_list.h
include/xview_private/xv_path_util.h
-@unexec rmdir %D/include/bitmaps 2>/dev/null || true
+%%XORG%%@unexec rmdir %D/include/bitmaps 2>/dev/null || true
@dirrm include/images
@dirrm include/olgx
@dirrm include/olgx_private
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 20:08:55 +0000