diff options
author | wiz <wiz> | 2015-10-14 20:17:24 +0000 |
---|---|---|
committer | wiz <wiz> | 2015-10-14 20:17:24 +0000 |
commit | ae5fec70709b7a7af16266a1772d775ad4c21eda (patch) | |
tree | b62ce193139a28ca45bd0bf8ee8790b2683f16db /x11/xcolorsel | |
parent | b0d179790d3c23ab8ed90e819c24ca83721a271b (diff) | |
download | pkgsrc-ae5fec70709b7a7af16266a1772d775ad4c21eda.tar.gz |
Switch from x11/Xaw3d to newer x11/libXaw3d.
Adapt some packages so they build with that.
Bump their PKGREVISIONs.
Diffstat (limited to 'x11/xcolorsel')
-rw-r--r-- | x11/xcolorsel/Makefile | 12 | ||||
-rw-r--r-- | x11/xcolorsel/distinfo | 6 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-RgbSink.c | 13 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-RgbSrc.c | 13 | ||||
-rw-r--r-- | x11/xcolorsel/patches/patch-RgbText.c | 4 |
5 files changed, 41 insertions, 7 deletions
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index 99145f4fe6d..3148fd9095a 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2013/01/15 16:21:36 morr Exp $ -# +# $NetBSD: Makefile,v 1.24 2015/10/14 20:17:28 wiz Exp $ DISTNAME= xcolorsel-1.1a-src PKGNAME= xcolorsel-1.1a -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} @@ -21,6 +20,13 @@ SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" #this requires Xaw3d XAW_TYPE= 3d +# does not directly support Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xcolorsel/distinfo b/x11/xcolorsel/distinfo index d84cc95d323..a6fd5d81240 100644 --- a/x11/xcolorsel/distinfo +++ b/x11/xcolorsel/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.6 2013/01/15 16:21:36 morr Exp $ +$NetBSD: distinfo,v 1.7 2015/10/14 20:17:28 wiz Exp $ SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes SHA1 (patch-Imakefile) = 39e087e56f752930a96bd8ae4e9a39bf4a0b0806 -SHA1 (patch-RgbText.c) = ea09371fd88c4a1068f069926097743fd25cfbdc +SHA1 (patch-RgbSink.c) = d39b2498c8015c7451dbc46727b14dc1293b7944 +SHA1 (patch-RgbSrc.c) = c3de7ce86a9eeecd716d0ca95574376a58b22c68 +SHA1 (patch-RgbText.c) = 060873da624cd93069ffcfaca08193b054116557 SHA1 (patch-xcolorsel.c) = a6667fff4372d242cc13c44d2a2fdf53ad5b065d diff --git a/x11/xcolorsel/patches/patch-RgbSink.c b/x11/xcolorsel/patches/patch-RgbSink.c new file mode 100644 index 00000000000..81e227560cc --- /dev/null +++ b/x11/xcolorsel/patches/patch-RgbSink.c @@ -0,0 +1,13 @@ +$NetBSD: patch-RgbSink.c,v 1.1 2015/10/14 20:17:28 wiz Exp $ + +--- RgbSink.c.orig 1994-12-13 21:32:37.000000000 +0000 ++++ RgbSink.c +@@ -147,7 +147,7 @@ RgbSinkClassRec rgbSinkClassRec = { + /* extension */ NULL + }, + { /* text_sink fields */ +- /* DisplayText */ (_XawSinkVoidFunc) mydisp, ++ /* DisplayText */ mydisp, + /* InsertCursor */ XtInheritInsertCursor, + /* ClearToBackground */ XtInheritClearToBackground, + /* FindPosition */ XtInheritFindPosition, diff --git a/x11/xcolorsel/patches/patch-RgbSrc.c b/x11/xcolorsel/patches/patch-RgbSrc.c new file mode 100644 index 00000000000..c9920d1411b --- /dev/null +++ b/x11/xcolorsel/patches/patch-RgbSrc.c @@ -0,0 +1,13 @@ +$NetBSD: patch-RgbSrc.c,v 1.1 2015/10/14 20:17:28 wiz Exp $ + +--- RgbSrc.c.orig 1994-11-13 22:14:31.000000000 +0000 ++++ RgbSrc.c +@@ -134,7 +134,7 @@ RgbSrcClassRec rgbSrcClassRec = { + { /* text_src fields */ + /* Read */ XtInheritRead, + /* Replace */ XtInheritReplace, +- /* Scan */ (_XawTextPositionFunc)myscan, ++ /* Scan */ myscan, + /* Search */ XtInheritSearch, + /* SetSelection */ XtInheritSetSelection, + /* ConvertSelection */ XtInheritConvertSelection, diff --git a/x11/xcolorsel/patches/patch-RgbText.c b/x11/xcolorsel/patches/patch-RgbText.c index 4f040f1e7ee..922563cdd8c 100644 --- a/x11/xcolorsel/patches/patch-RgbText.c +++ b/x11/xcolorsel/patches/patch-RgbText.c @@ -1,4 +1,4 @@ -$NetBSD: patch-RgbText.c,v 1.1 2013/01/15 16:21:36 morr Exp $ +$NetBSD: patch-RgbText.c,v 1.2 2015/10/14 20:17:28 wiz Exp $ --- RgbText.c.orig 1994-12-13 22:13:27.000000000 +0000 +++ RgbText.c @@ -15,7 +15,7 @@ $NetBSD: patch-RgbText.c,v 1.1 2013/01/15 16:21:36 morr Exp $ XtRString, (XtPointer) "30" }, { XtNfile, XtCFile, XtRString, sizeof(String), offset(file), - XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" }, -+ XtRString, (XtPointer) "@X11BASE@/X11/rgb.txt" }, ++ XtRString, (XtPointer) "/usr/pkg/X11/rgb.txt" }, { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width), XtRString, (XtPointer) "3" }, { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red), |