diff options
author | ben <ben@pkgsrc.org> | 2003-12-21 03:51:02 +0000 |
---|---|---|
committer | ben <ben@pkgsrc.org> | 2003-12-21 03:51:02 +0000 |
commit | 7f2053754e0e9f0c4409ec69e9dabb29c93fde88 (patch) | |
tree | ed3505b6296c8e02dfd38ef1db4c49daa58ac565 /x11/wx1Motif/patches | |
parent | 8b74d578faaa0873eba4960fd32d8cdb66437dc6 (diff) | |
download | pkgsrc-7f2053754e0e9f0c4409ec69e9dabb29c93fde88.tar.gz |
Remove wx1Motif as it is obsolete and will not build with GCC3.
Diffstat (limited to 'x11/wx1Motif/patches')
-rw-r--r-- | x11/wx1Motif/patches/patch-aa | 51 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-ab | 18 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-ac | 15 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-ad | 30 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-ae | 16 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-af | 13 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-ag | 13 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-ah | 24 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-ai | 25 | ||||
-rw-r--r-- | x11/wx1Motif/patches/patch-aj | 13 |
10 files changed, 0 insertions, 218 deletions
diff --git a/x11/wx1Motif/patches/patch-aa b/x11/wx1Motif/patches/patch-aa deleted file mode 100644 index 1dae94e0839..00000000000 --- a/x11/wx1Motif/patches/patch-aa +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- src/make.env.orig Wed Oct 22 09:13:30 1997 -+++ src/make.env -@@ -37,13 +37,13 @@ - - # Debug/trace mode. 1 or more for debugging. - DEBUG = 0 --GUI = -Dwx_xview --GUISUFFIX = _ol -+GUI = -Dwx_motif -+GUISUFFIX = _motif - - ########################## Compiler flags ############################# - - # Misc options --OPTIONS = -+OPTIONS = -fwritable-strings - COPTIONS = - DEBUGFLAGS = -ggdb - INCLUDE = -@@ -55,13 +55,12 @@ - - # Compiler or system-specific include paths - COMPPATHS = --XINCLUDE = -I/usr/openwin/include -I/usr/include/X11 -I/usr/include/Xm \ -- -I/usr/include/X11/Xm -I/usr/include --XLIB = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib -+XINCLUDE = -+XLIB = - - ############################ Libraries ################################ - --COMPLIBS = -lstdc++ -+COMPLIBS = -lstdc++ -lcompat - BASICMOTIFLDLIBS = -lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm - MOTIFLDLIBS = $(BASICMOTIFLDLIBS) - HPLDLIBS = -lwx_hp $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm -@@ -87,8 +86,8 @@ - # Directory for object files - OBJDIR = objects$(GUISUFFIX) - --CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) --CFLAGS = $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(CWARN) $(OPT) --LDFLAGS = $(XLIB) -L$(WXDIR)/lib --LDLIBS = $(XVIEWLDLIBS) -+CPPFLAGS += $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) -+CFLAGS += $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(CWARN) $(OPT) -+LDFLAGS += $(XLIB) -L$(WXDIR)/lib -+LDLIBS = $(MOTIFLDLIBS) - diff --git a/x11/wx1Motif/patches/patch-ab b/x11/wx1Motif/patches/patch-ab deleted file mode 100644 index bfa7d2f156f..00000000000 --- a/x11/wx1Motif/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- utils/prologio/src/makefile.unx.orig Wed Aug 20 16:07:48 1997 -+++ utils/prologio/src/makefile.unx -@@ -30,10 +30,9 @@ - EXTRALIBS=-lgauge_motif - - # Remove -DLEX_SCANNER if using FLEX instead of LEX --CPPFLAGS = -DLEX_SCANNER $(XINCLUDE) $(INC) -I$(PROLOGINC) $(GUI) $(DEBUGFLAGS) -DDEBUG=$(DEBUG) $(WARN) $(OPTIONS) $(HARDY_OPTIONS) $(OPT) --CFLAGS = -DLEX_SCANNER $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) \ -- -DDEBUG='$(DEBUG)' $(CWARN) $(OPT) --LDFLAGS = $(XLIB) -L$(WXDIR)/lib -L$(PROLOGDIR)/lib $(EXTRAFLAGS) -+CPPFLAGS += -DLEX_SCANNER $(XINCLUDE) $(INC) -I$(PROLOGINC) $(GUI) $(DEBUGFLAGS) -DDEBUG=$(DEBUG) $(WARN) $(OPTIONS) $(HARDY_OPTIONS) $(OPT) -+CFLAGS += -DLEX_SCANNER $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(CWARN) $(OPT) -+LDFLAGS += $(XLIB) -L$(WXDIR)/lib -L$(PROLOGDIR)/lib $(EXTRAFLAGS) - LDLIBS = -lproio_ol -lwx_ol -lxview -lolgx -lX11 -lm -lg++ - - XVIEWLDLIBS = -lproio_ol -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS) diff --git a/x11/wx1Motif/patches/patch-ac b/x11/wx1Motif/patches/patch-ac deleted file mode 100644 index bd64fe1d9e2..00000000000 --- a/x11/wx1Motif/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- contrib/wxxpm/makefile.unx.orig Thu Jul 24 20:41:32 1997 -+++ contrib/wxxpm/makefile.unx -@@ -33,8 +33,8 @@ - # Default - LDLIBS=$(XVIEWLDLIBS) - --CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(WARN) $(OPT) -L. --CFLAGS = $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(CWARN) -L. -+CPPFLAGS += $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(WARN) $(OPT) -L. -+CFLAGS += $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(CWARN) -L. - - SOURCES_LIB = libxpm.34b/lib/crbuffri.c libxpm.34b/lib/crbuffrp.c \ - libxpm.34b/lib/crdatfri.c libxpm.34b/lib/crdatfrp.c \ diff --git a/x11/wx1Motif/patches/patch-ad b/x11/wx1Motif/patches/patch-ad deleted file mode 100644 index ce69b997cba..00000000000 --- a/x11/wx1Motif/patches/patch-ad +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2002/08/25 19:24:00 jlam Exp $ - ---- src/x/wx_utils.cpp.orig Tue Oct 21 00:02:44 1997 -+++ src/x/wx_utils.cpp -@@ -41,6 +41,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <signal.h> - #include <errno.h> - - #include "wx_defs.h" -@@ -70,7 +71,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - --#if defined(__alpha) && !defined(VMS) -+#if defined(__alpha) && !defined(VMS) && !defined(__NetBSD__) - #ifdef __cplusplus - extern "C" { - #endif -@@ -81,7 +82,7 @@ - #endif - - #ifdef wx_motif --#if !(defined(VMS) || defined(linux) || defined(__sgi) || defined(__hpux) || defined(__ultrix)) || defined(__bsdi__) -+#if !(defined(__NetBSD__) || defined(VMS) || defined(linux) || defined(__sgi) || defined(__hpux) || defined(__ultrix)) || defined(__bsdi__) - #include <tiuser.h> - #endif - #endif diff --git a/x11/wx1Motif/patches/patch-ae b/x11/wx1Motif/patches/patch-ae deleted file mode 100644 index 5ed9872b2eb..00000000000 --- a/x11/wx1Motif/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- utils/wxhelp/src/makefile.unx.orig Sun Apr 21 16:56:48 1996 -+++ utils/wxhelp/src/makefile.unx -@@ -31,9 +31,9 @@ - - DOCUTILSDIR = $(WXDIR)/utils/tex2rtf/src - --CPPFLAGS = $(XINCLUDE) $(INC) -I$(HYINC) $(GUI) $(DEBUGFLAGS) -DDEBUG=$(DEBUG) $(WARN) $(OPTIONS) $(OPT) -+CPPFLAGS += $(XINCLUDE) $(INC) -I$(HYINC) $(GUI) $(DEBUGFLAGS) -DDEBUG=$(DEBUG) $(WARN) $(OPTIONS) $(OPT) - --LDFLAGS = $(XLIB) -L$(WXDIR)/lib -L$(HYDIR)/lib -L$(WXHELPDIR)/lib $(EXTRAFLAGS) -+LDFLAGS += $(XLIB) -L$(WXDIR)/lib -L$(HYDIR)/lib -L$(WXHELPDIR)/lib $(EXTRAFLAGS) - - XVIEWLDLIBS = -lhytext_ol -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS) - MOTIFLDLIBS = -lhytext_motif $(BASICMOTIFLDLIBS) $(COMPLIBS) diff --git a/x11/wx1Motif/patches/patch-af b/x11/wx1Motif/patches/patch-af deleted file mode 100644 index 1deff693b7c..00000000000 --- a/x11/wx1Motif/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- src/base/wb_utils.cpp.orig Fri Nov 20 11:57:58 1998 -+++ src/base/wb_utils.cpp -@@ -691,7 +691,7 @@ - #endif - { - register char *start = d; -- register braces = (*s == '{' || *s == '('); -+ register int braces = (*s == '{' || *s == '('); - register char *value; - while (*d++ = *s) - if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') ) diff --git a/x11/wx1Motif/patches/patch-ag b/x11/wx1Motif/patches/patch-ag deleted file mode 100644 index 2e716da8874..00000000000 --- a/x11/wx1Motif/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- src/x/wx_gdi.cpp.orig Sun Sep 20 21:50:02 1998 -+++ src/x/wx_gdi.cpp -@@ -43,7 +43,7 @@ - #endif - #endif - --const DISPLAY_DPI = 100; -+const int DISPLAY_DPI = 100; - - #ifdef wx_x - XFontPool *wxFontPool = NULL; diff --git a/x11/wx1Motif/patches/patch-ah b/x11/wx1Motif/patches/patch-ah deleted file mode 100644 index 1c7f6bdf42f..00000000000 --- a/x11/wx1Motif/patches/patch-ah +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2002/08/25 19:24:00 jlam Exp $ - ---- src/x/wx_ipc.cpp.orig Thu Mar 26 17:15:44 1998 -+++ src/x/wx_ipc.cpp -@@ -104,7 +104,7 @@ - #ifdef VMS - int errno=0; // there is no defined global variable - #else --extern errno; -+#include <errno.h> - #endif - - int wx_socket_create (int port); -@@ -426,7 +426,9 @@ - // Args and return value are the same as connect(2). - int accept(int fd, struct sockaddr * addr, int * addrLen) - { -- int rval = ::accept(fd, addr, addrLen); -+ socklen_t u = (socklen_t) *addrLen; -+ int rval = ::accept(fd, addr, &u); -+ *addrLen = (int) u; - if (rval > 0) - addSock(rval); - return rval; diff --git a/x11/wx1Motif/patches/patch-ai b/x11/wx1Motif/patches/patch-ai deleted file mode 100644 index 7b3fcd53655..00000000000 --- a/x11/wx1Motif/patches/patch-ai +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- utils/image/src/wx_imgx.h.orig Thu Jul 24 12:14:56 1997 -+++ utils/image/src/wx_imgx.h -@@ -48,10 +48,7 @@ - #include <math.h> - #include <ctype.h> - #include <string.h> --extern int errno; /* this SHOULD be in errno.h */ --#ifndef __FreeBSD__ --extern char *sys_errlist[]; /* this SHOULD be in errno.h */ --#endif -+#include <errno.h> - - #if !defined(__convexc__) && !defined(VMS) && !defined(__GNUG__) /* Convex doesn't have <memory.h> */ - #include <memory.h> /* for 'memset()' prototype */ -@@ -126,7 +123,7 @@ - - - #ifdef i386 --#define UNCOMPRESS "/usr/local/bin/uncompress" /* uncompress program */ -+#define UNCOMPRESS "/usr/bin/uncompress" /* uncompress program */ - #undef HOLD_SIG - #define HOLD_SIG /* don't know how to handle signals MWS 10/18/90 */ - #undef RELEASE_SIG diff --git a/x11/wx1Motif/patches/patch-aj b/x11/wx1Motif/patches/patch-aj deleted file mode 100644 index d7a18815d93..00000000000 --- a/x11/wx1Motif/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2002/08/25 19:24:00 jlam Exp $ - ---- src/base/wb_help.cpp.orig Mon Feb 24 17:29:08 1997 -+++ src/base/wb_help.cpp -@@ -307,7 +307,7 @@ - // Start help process in server modus - // char *argv[] = {"wxhelp", "-server", server, NULL}; // HP compiler complains - char *argv[4]; -- argv[0] = "wxhelp"; -+ argv[0] = "wx1help_motif"; - argv[1] = "-server"; - argv[2] = server; - argv[3] = NULL; |