summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2002-06-17 02:24:56 +0000
committerdmcmahill <dmcmahill>2002-06-17 02:24:56 +0000
commit4a6a4124c0051293fe6383c7058da94e3126df02 (patch)
tree6f03272f485f02c264cde33ce3d11166c50a12ed /x11
parent168d16c32b37fcb21ae86b006d5a201f4edfcaeb (diff)
downloadpkgsrc-4a6a4124c0051293fe6383c7058da94e3126df02.tar.gz
initial import of wx1Motif-1.68e
A Motif-based implementation of the wxWindows cross-platform GUI library. wxWindows is a set of libraries that allows C++ applications to compile and run on several different types of computer, with minimal source code changes. There is one library per supported GUI. pkg provided in PR pkg/14737 by collver@linuxfreemail.com with some fixes for alpha by me.
Diffstat (limited to 'x11')
-rw-r--r--x11/wx1Motif/DESCR5
-rw-r--r--x11/wx1Motif/Makefile31
-rw-r--r--x11/wx1Motif/PLIST115
-rw-r--r--x11/wx1Motif/buildlink.mk47
-rw-r--r--x11/wx1Motif/distinfo24
-rw-r--r--x11/wx1Motif/patches/patch-aa51
-rw-r--r--x11/wx1Motif/patches/patch-ab18
-rw-r--r--x11/wx1Motif/patches/patch-ac15
-rw-r--r--x11/wx1Motif/patches/patch-ad22
-rw-r--r--x11/wx1Motif/patches/patch-ae16
-rw-r--r--x11/wx1Motif/patches/patch-af13
-rw-r--r--x11/wx1Motif/patches/patch-ag13
-rw-r--r--x11/wx1Motif/patches/patch-ah13
-rw-r--r--x11/wx1Motif/patches/patch-ai25
-rw-r--r--x11/wx1Motif/patches/patch-aj13
15 files changed, 421 insertions, 0 deletions
diff --git a/x11/wx1Motif/DESCR b/x11/wx1Motif/DESCR
new file mode 100644
index 00000000000..7a739f5113b
--- /dev/null
+++ b/x11/wx1Motif/DESCR
@@ -0,0 +1,5 @@
+A Motif-based implementation of the wxWindows cross-platform GUI library.
+
+wxWindows is a set of libraries that allows C++ applications to compile
+and run on several different types of computer, with minimal source code
+changes. There is one library per supported GUI.
diff --git a/x11/wx1Motif/Makefile b/x11/wx1Motif/Makefile
new file mode 100644
index 00000000000..95087c080e2
--- /dev/null
+++ b/x11/wx1Motif/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/06/17 02:24:56 dmcmahill Exp $
+#
+
+DISTNAME= wx1Motif-1.68e
+CATEGORIES= x11
+MASTER_SITES= ftp://oracle.fastpicsystems.com/pub/wxwin/1.68E/unix/
+DISTFILES= wx168_1.tgz wx168_2.tgz
+
+MAINTAINER= collver@linuxfreemail.com
+HOMEPAGE= http://www.wxwindows.org
+COMMENT= Motif-based implementation of wxWindows 1
+
+WRKSRC= ${WRKDIR}
+USE_BUILDLINK_ONLY= # defined
+
+do-build:
+ cd ${WRKSRC}/src/x && ${MAKE_ENV} ${MAKE_PROGRAM} -f makefile.unx motif
+ cd ${WRKSRC}/utils/wxhelp/src && ${MAKE_ENV} ${MAKE_PROGRAM} -f makefile.unx motif
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/utils/wxhelp/src/wxhelp_motif \
+ ${PREFIX}/bin/wx1help_motif
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/wxwindows1
+ ${INSTALL_DATA} ${WRKSRC}/lib/libwx_motif.a ${PREFIX}/lib/wxwindows1/
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/wxwindows1
+ ${INSTALL_DATA} ${WRKSRC}/include/base/* ${WRKSRC}/include/x/* \
+ ${PREFIX}/include/wxwindows1
+
+.include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wx1Motif/PLIST b/x11/wx1Motif/PLIST
new file mode 100644
index 00000000000..734b8e72b8a
--- /dev/null
+++ b/x11/wx1Motif/PLIST
@@ -0,0 +1,115 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/17 02:24:56 dmcmahill Exp $
+bin/wx1help_motif
+include/wxwindows1/bdiag.xbm
+include/wxwindows1/cdiag.xbm
+include/wxwindows1/common.h
+include/wxwindows1/cross.xbm
+include/wxwindows1/fdiag.xbm
+include/wxwindows1/horiz.xbm
+include/wxwindows1/sb_impl.h
+include/wxwindows1/verti.xbm
+include/wxwindows1/wb_buttn.h
+include/wxwindows1/wb_canvs.h
+include/wxwindows1/wb_check.h
+include/wxwindows1/wb_choic.h
+include/wxwindows1/wb_cmdlg.h
+include/wxwindows1/wb_combo.h
+include/wxwindows1/wb_dc.h
+include/wxwindows1/wb_dccan.h
+include/wxwindows1/wb_dcmem.h
+include/wxwindows1/wb_dcpan.h
+include/wxwindows1/wb_dialg.h
+include/wxwindows1/wb_frame.h
+include/wxwindows1/wb_gauge.h
+include/wxwindows1/wb_gdi.h
+include/wxwindows1/wb_group.h
+include/wxwindows1/wb_ipc.h
+include/wxwindows1/wb_ipcob.h
+include/wxwindows1/wb_item.h
+include/wxwindows1/wb_lbox.h
+include/wxwindows1/wb_main.h
+include/wxwindows1/wb_menu.h
+include/wxwindows1/wb_messg.h
+include/wxwindows1/wb_mf.h
+include/wxwindows1/wb_mnuit.h
+include/wxwindows1/wb_mtxt.h
+include/wxwindows1/wb_panel.h
+include/wxwindows1/wb_rbox.h
+include/wxwindows1/wb_scrol.h
+include/wxwindows1/wb_slidr.h
+include/wxwindows1/wb_stat.h
+include/wxwindows1/wb_text.h
+include/wxwindows1/wb_timer.h
+include/wxwindows1/wb_txt.h
+include/wxwindows1/wb_vlbox.h
+include/wxwindows1/wb_win.h
+include/wxwindows1/wx.h
+include/wxwindows1/wx_bbar.h
+include/wxwindows1/wx_buttn.h
+include/wxwindows1/wx_canvs.h
+include/wxwindows1/wx_check.h
+include/wxwindows1/wx_choic.h
+include/wxwindows1/wx_clipb.h
+include/wxwindows1/wx_cmdlg.h
+include/wxwindows1/wx_combo.h
+include/wxwindows1/wx_date.h
+include/wxwindows1/wx_dc.h
+include/wxwindows1/wx_dccan.h
+include/wxwindows1/wx_dcmem.h
+include/wxwindows1/wx_dcpan.h
+include/wxwindows1/wx_dcps.h
+include/wxwindows1/wx_defs.h
+include/wxwindows1/wx_dialg.h
+include/wxwindows1/wx_doc.h
+include/wxwindows1/wx_enhdg.h
+include/wxwindows1/wx_form.h
+include/wxwindows1/wx_frac.h
+include/wxwindows1/wx_frame.h
+include/wxwindows1/wx_gauge.h
+include/wxwindows1/wx_gdi.h
+include/wxwindows1/wx_group.h
+include/wxwindows1/wx_hash.h
+include/wxwindows1/wx_help.h
+include/wxwindows1/wx_ipc.h
+include/wxwindows1/wx_ipcob.h
+include/wxwindows1/wx_item.h
+include/wxwindows1/wx_lay.h
+include/wxwindows1/wx_lbox.h
+include/wxwindows1/wx_list.h
+include/wxwindows1/wx_main.h
+include/wxwindows1/wx_mem.h
+include/wxwindows1/wx_menu.h
+include/wxwindows1/wx_messg.h
+include/wxwindows1/wx_mf.h
+include/wxwindows1/wx_mgstr.h
+include/wxwindows1/wx_mnuit.h
+include/wxwindows1/wx_mtxt.h
+include/wxwindows1/wx_obj.h
+include/wxwindows1/wx_panel.h
+include/wxwindows1/wx_prec.h
+include/wxwindows1/wx_print.h
+include/wxwindows1/wx_privt.h
+include/wxwindows1/wx_rbox.h
+include/wxwindows1/wx_res.h
+include/wxwindows1/wx_scrol.h
+include/wxwindows1/wx_setup.h
+include/wxwindows1/wx_setup.vms
+include/wxwindows1/wx_slidr.h
+include/wxwindows1/wx_split.h
+include/wxwindows1/wx_stat.h
+include/wxwindows1/wx_stdev.h
+include/wxwindows1/wx_sysev.h
+include/wxwindows1/wx_tbar.h
+include/wxwindows1/wx_text.h
+include/wxwindows1/wx_time.h
+include/wxwindows1/wx_timer.h
+include/wxwindows1/wx_txt.h
+include/wxwindows1/wx_types.h
+include/wxwindows1/wx_utils.h
+include/wxwindows1/wx_ver.h
+include/wxwindows1/wx_vlbox.h
+include/wxwindows1/wx_win.h
+include/wxwindows1/wxstring.h
+lib/wxwindows1/libwx_motif.a
+@dirrm include/wxwindows1
+@dirrm lib/wxwindows1
diff --git a/x11/wx1Motif/buildlink.mk b/x11/wx1Motif/buildlink.mk
new file mode 100644
index 00000000000..1cef5c2a44b
--- /dev/null
+++ b/x11/wx1Motif/buildlink.mk
@@ -0,0 +1,47 @@
+# $NetBSD: buildlink.mk,v 1.1.1.1 2002/06/17 02:24:56 dmcmahill Exp $
+#
+# This Makefile fragment is included by packages that use wx1Motif.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.wx1Motif to the dependency pattern
+# for the version of wx1Motif desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+# search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+# path.
+
+.if !defined(WX1MOTIF_BUILDLINK_MK)
+WX1MOTIF_BUILDLINK_MK= # defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.wx1Motif?= wx1Motif>=1.68e
+DEPENDS+= ${BUILDLINK_DEPENDS.wx1Motif}:../../x11/wx1Motif
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.wx1Motif=wx1Motif
+BUILDLINK_PREFIX.wx1Motif_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.wx1Motif= include/wxwindows1/*
+BUILDLINK_FILES.wx1Motif+= lib/wxwindows1/libwx_motif.a
+
+.if !defined(_BUILDLINK_WX1MOTIF_CPPFLAGS) || \
+ !defined(_BUILDLINK_WX1MOTIF_LDFLAGS)
+_BUILDLINK_WX1MOTIF_CPPFLAGS= -I${BUILDLINK_DIR}/include/wxwindows1
+_BUILDLINK_WX1MOTIF_LDFLAGS= -L${BUILDLINK_DIR}/lib/wxwindows1
+
+CFLAGS+= ${_BUILDLINK_WX1MOTIF_CPPFLAGS}
+CXXFLAGS+= ${_BUILDLINK_WX1MOTIF_CPPFLAGS}
+CPPFLAGS+= ${_BUILDLINK_WX1MOTIF_CPPFLAGS}
+LDFLAGS+= ${_BUILDLINK_WX1MOTIF_LDFLAGS}
+.endif
+
+.include "../../mk/motif.buildlink.mk"
+
+BUILDLINK_TARGETS.wx1Motif= wx1Motif-buildlink
+BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.wx1Motif}
+
+pre-configure: ${BUILDLINK_TARGETS.wx1Motif}
+wx1Motif-buildlink: _BUILDLINK_USE
+
+.endif # WX1MOTIF_BUILDLINK_MK
diff --git a/x11/wx1Motif/distinfo b/x11/wx1Motif/distinfo
new file mode 100644
index 00000000000..76e4e89c184
--- /dev/null
+++ b/x11/wx1Motif/distinfo
@@ -0,0 +1,24 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/06/17 02:24:56 dmcmahill Exp $
+
+SHA1 (wx168_1.tgz) = 771e5301d81560c4750c7b28f3ed843267232af3
+Size (wx168_1.tgz) = 3267398 bytes
+SHA1 (wx168_2.tgz) = 924bb64bdb19705b66cbd23c593c9599ba22c696
+Size (wx168_2.tgz) = 623525 bytes
+SHA1 (wx168htm.tgz) = 58791c32dc1f0d266a73899cd8f322d9d2f73920
+Size (wx168htm.tgz) = 557401 bytes
+SHA1 (wx168pdf.tgz) = e611fda0011ac778f782868f296740da9e3e978d
+Size (wx168pdf.tgz) = 2473830 bytes
+SHA1 (wx168ps.tgz) = 0a10dadd720f3d7f96091135222a043c948f0a69
+Size (wx168ps.tgz) = 1519359 bytes
+SHA1 (wxinstal) = 9eefd18ffe07d2698f981a2e8ae82af558308303
+Size (wxinstal) = 44632 bytes
+SHA1 (patch-aa) = e9d4e2569c4e515eba31f46792dbc864427369a7
+SHA1 (patch-ab) = 58e2fe8a8e915b5fdadfdc2472fa33ef1cb4f2e6
+SHA1 (patch-ac) = f16472aeaba36423664b67419befc8fbe256061b
+SHA1 (patch-ad) = f2a15184da2ea9a0a1095f796d939ba636c282f4
+SHA1 (patch-ae) = 450c95f374e44021b0a138320f47aa213fe738c2
+SHA1 (patch-af) = 450b3c43fee0b6dfebf9a2d0c1ef6d5ea0b9bb0d
+SHA1 (patch-ag) = b278a78ecda1b6b3622c47f5c5cf371776a8ed90
+SHA1 (patch-ah) = 8620ff95f1a690968b9f80fb84e46248d6ab3839
+SHA1 (patch-ai) = 4c92fe6684744985ca9cfb0bbf2a47769927b84d
+SHA1 (patch-aj) = 61f63aa81469648a0a4fcde5cd8478183a011e7b
diff --git a/x11/wx1Motif/patches/patch-aa b/x11/wx1Motif/patches/patch-aa
new file mode 100644
index 00000000000..21dbc8a5666
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-aa
@@ -0,0 +1,51 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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
new file mode 100644
index 00000000000..55410b18c3f
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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
new file mode 100644
index 00000000000..ae9e19c4245
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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
new file mode 100644
index 00000000000..d2b395d3538
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+
+--- src/x/wx_utils.cpp.orig Tue Oct 21 00:02:44 1997
++++ src/x/wx_utils.cpp
+@@ -70,7 +70,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 +81,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
new file mode 100644
index 00000000000..df98ede73c7
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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
new file mode 100644
index 00000000000..ab22f0a42cc
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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
new file mode 100644
index 00000000000..b795a77c196
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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
new file mode 100644
index 00000000000..d83805ba712
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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);
diff --git a/x11/wx1Motif/patches/patch-ai b/x11/wx1Motif/patches/patch-ai
new file mode 100644
index 00000000000..d19b609942e
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-ai
@@ -0,0 +1,25 @@
+$NetBSD: patch-ai,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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
new file mode 100644
index 00000000000..32dd22a904f
--- /dev/null
+++ b/x11/wx1Motif/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill 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;