diff options
author | tron <tron> | 1998-07-15 08:13:41 +0000 |
---|---|---|
committer | tron <tron> | 1998-07-15 08:13:41 +0000 |
commit | eb80ea628c50020af5afd59887f3ac6fc6d99c82 (patch) | |
tree | 0ee814ca71a05bf24673e3c485337f39a6b7613c /x11/xcolorsel | |
parent | 2ddbf28b2d5419e8630d2a7884b39cf0263589b7 (diff) | |
download | pkgsrc-eb80ea628c50020af5afd59887f3ac6fc6d99c82.tar.gz |
Use "Xaw3d" instead of "Xaw".
Diffstat (limited to 'x11/xcolorsel')
-rw-r--r-- | x11/xcolorsel/Makefile | 4 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-aa | 22 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-ab | 20 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-ac | 11 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-ad | 11 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-ae | 11 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-af | 11 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-ag | 11 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-ah | 11 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-ai | 29 |
10 files changed, 129 insertions, 12 deletions
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index 11e13c6e641..d8d8f1d10f6 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 1998/07/15 00:45:37 perry Exp $ +# $NetBSD: Makefile,v 1.2 1998/07/15 08:13:41 tron Exp $ # DISTNAME= xcolorsel-1.1a-src @@ -9,6 +9,8 @@ MASTER_SITE_SUBDIR= utilities MAINTAINER= perry@netbsd.org +DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d + WRKSRC= ${WRKDIR}/xcolorsel USE_IMAKE= yes diff --git a/x11/xcolorsel/patches/patch-aa b/x11/xcolorsel/patches/patch-aa index 29e89cf8132..dc5d1683804 100644 --- a/x11/xcolorsel/patches/patch-aa +++ b/x11/xcolorsel/patches/patch-aa @@ -1,11 +1,11 @@ ---- RgbText.c.orig Tue Jul 14 20:16:24 1998 -+++ RgbText.c Tue Jul 14 20:16:56 1998 -@@ -146,7 +146,7 @@ - { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns), - XtRString, (XtPointer) "30" }, - { XtNfile, XtCFile, XtRString, sizeof(String), offset(file), -- XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" }, -+ XtRString, (XtPointer) "/usr/X11R6/lib/X11/rgb.txt" }, - { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width), - XtRString, (XtPointer) "3" }, - { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red), +--- Imakefile.orig Tue Dec 13 21:31:19 1994 ++++ Imakefile Wed Jul 15 09:56:07 1998 +@@ -71,7 +71,7 @@ + all:: Xcolorsel.help + install:: Xcolorsel.help + +-NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,) ++NormalProgramTarget(xcolorsel,$(OBJS),,-lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB),) + + InstallProgram(xcolorsel,$(BINDIR)) + InstallManPage(xcolorsel,$(MANDIR)) diff --git a/x11/xcolorsel/patches/patch-ab b/x11/xcolorsel/patches/patch-ab new file mode 100644 index 00000000000..09c07110ddb --- /dev/null +++ b/x11/xcolorsel/patches/patch-ab @@ -0,0 +1,20 @@ +--- RgbText.c.orig Tue Dec 13 23:13:27 1994 ++++ RgbText.c Wed Jul 15 10:01:15 1998 +@@ -83,7 +83,7 @@ + #include <errno.h> + #include <X11/IntrinsicP.h> + #include <X11/StringDefs.h> +-#include <X11/Xaw/Paned.h> ++#include <X11/Xaw3d/Paned.h> + #include "RgbTextP.h" + #include "RgbSinkP.h" + #include "RgbSrc.h" +@@ -146,7 +146,7 @@ + { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns), + XtRString, (XtPointer) "30" }, + { XtNfile, XtCFile, XtRString, sizeof(String), offset(file), +- XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" }, ++ XtRString, (XtPointer) "/usr/X11R6/lib/X11/rgb.txt" }, + { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width), + XtRString, (XtPointer) "3" }, + { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red), diff --git a/x11/xcolorsel/patches/patch-ac b/x11/xcolorsel/patches/patch-ac new file mode 100644 index 00000000000..c1b84e36e94 --- /dev/null +++ b/x11/xcolorsel/patches/patch-ac @@ -0,0 +1,11 @@ +--- RgbSink.h.orig Sun Nov 13 23:14:23 1994 ++++ RgbSink.h Wed Jul 15 09:56:56 1998 +@@ -85,7 +85,7 @@ + /*The Parent:*/ + #include "RgbText.h" + /* The superclass: */ +-#include <X11/Xaw/AsciiSink.h> ++#include <X11/Xaw3d/AsciiSink.h> + + /**************************************************************** + * diff --git a/x11/xcolorsel/patches/patch-ad b/x11/xcolorsel/patches/patch-ad new file mode 100644 index 00000000000..3edf8cc4a1c --- /dev/null +++ b/x11/xcolorsel/patches/patch-ad @@ -0,0 +1,11 @@ +--- RgbSinkP.h.orig Sun Nov 13 23:14:27 1994 ++++ RgbSinkP.h Wed Jul 15 09:57:46 1998 +@@ -85,7 +85,7 @@ + #include "RgbSink.h" + #include "config.h" + /* include superclass private header file */ +-#include <X11/Xaw/AsciiSinkP.h> ++#include <X11/Xaw3d/AsciiSinkP.h> + /* This is closely related to and uses parts of: */ + #include "RgbTextP.h" + diff --git a/x11/xcolorsel/patches/patch-ae b/x11/xcolorsel/patches/patch-ae new file mode 100644 index 00000000000..2d6f6141dbe --- /dev/null +++ b/x11/xcolorsel/patches/patch-ae @@ -0,0 +1,11 @@ +--- RgbSrc.h.orig Sun Nov 13 23:14:35 1994 ++++ RgbSrc.h Wed Jul 15 09:58:37 1998 +@@ -84,7 +84,7 @@ + /*The Parent:*/ + #include "RgbText.h" + /* The superclass: */ +-#include <X11/Xaw/AsciiSrc.h> ++#include <X11/Xaw3d/AsciiSrc.h> + + /**************************************************************** + * diff --git a/x11/xcolorsel/patches/patch-af b/x11/xcolorsel/patches/patch-af new file mode 100644 index 00000000000..9901a3e12cd --- /dev/null +++ b/x11/xcolorsel/patches/patch-af @@ -0,0 +1,11 @@ +--- RgbSrcP.h.orig Sun Nov 13 23:14:42 1994 ++++ RgbSrcP.h Wed Jul 15 09:59:08 1998 +@@ -85,7 +85,7 @@ + #include "config.h" + + /* include superclass private header file */ +-#include <X11/Xaw/AsciiSrcP.h> ++#include <X11/Xaw3d/AsciiSrcP.h> + /* This is closely related to and uses parts of: */ + #include "RgbTextP.h" + diff --git a/x11/xcolorsel/patches/patch-ag b/x11/xcolorsel/patches/patch-ag new file mode 100644 index 00000000000..1b18eee15a1 --- /dev/null +++ b/x11/xcolorsel/patches/patch-ag @@ -0,0 +1,11 @@ +--- RgbText.h.orig Sun Nov 13 23:14:49 1994 ++++ RgbText.h Wed Jul 15 09:59:51 1998 +@@ -133,7 +133,7 @@ + #ifndef _RgbText_h + #define _RgbText_h + +-#include <X11/Xaw/AsciiText.h> ++#include <X11/Xaw3d/AsciiText.h> + + #define XtNmaxRows "maxRows" + #define XtNrows "rows" diff --git a/x11/xcolorsel/patches/patch-ah b/x11/xcolorsel/patches/patch-ah new file mode 100644 index 00000000000..cd4b4ccd9e8 --- /dev/null +++ b/x11/xcolorsel/patches/patch-ah @@ -0,0 +1,11 @@ +--- RgbTextP.h.orig Wed Nov 16 21:27:10 1994 ++++ RgbTextP.h Wed Jul 15 10:00:34 1998 +@@ -78,7 +78,7 @@ + #include "RgbText.h" + #include "config.h" + +-#include <X11/Xaw/TextP.h> ++#include <X11/Xaw3d/TextP.h> + #include <X11/Xcms.h> + + typedef struct _colordef { unsigned short red, green, blue; /*Theoretic RGB*/ diff --git a/x11/xcolorsel/patches/patch-ai b/x11/xcolorsel/patches/patch-ai new file mode 100644 index 00000000000..432f433f945 --- /dev/null +++ b/x11/xcolorsel/patches/patch-ai @@ -0,0 +1,29 @@ +--- xcolorsel.c.orig Sun Nov 13 23:16:59 1994 ++++ xcolorsel.c Wed Jul 15 10:02:50 1998 +@@ -60,16 +60,16 @@ + #include <X11/Intrinsic.h> + #include <X11/Shell.h> + #include <X11/StringDefs.h> +-#include <X11/Xaw/Box.h> +-#include <X11/Xaw/Paned.h> +-#include <X11/Xaw/Form.h> +-#include <X11/Xaw/Label.h> +-#include <X11/Xaw/Command.h> +-#include <X11/Xaw/MenuButton.h> +-#include <X11/Xaw/Toggle.h> +-#include <X11/Xaw/SimpleMenu.h> +-#include <X11/Xaw/SmeBSB.h> +-#include <X11/Xaw/AsciiText.h> ++#include <X11/Xaw3d/Box.h> ++#include <X11/Xaw3d/Paned.h> ++#include <X11/Xaw3d/Form.h> ++#include <X11/Xaw3d/Label.h> ++#include <X11/Xaw3d/Command.h> ++#include <X11/Xaw3d/MenuButton.h> ++#include <X11/Xaw3d/Toggle.h> ++#include <X11/Xaw3d/SimpleMenu.h> ++#include <X11/Xaw3d/SmeBSB.h> ++#include <X11/Xaw3d/AsciiText.h> + + #include "config.h" + #include "RgbText.h" |