diff options
| author | wiz <wiz> | 2015-10-14 20:17:24 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-10-14 20:17:24 +0000 |
| commit | 7b80d1b56af25e2326b66e1248368b329b266ec0 (patch) | |
| tree | b62ce193139a28ca45bd0bf8ee8790b2683f16db /graphics/xpaint | |
| parent | 601c7483a0f038bc0f6003af0450ce95e270a1ca (diff) | |
| download | pkgsrc-7b80d1b56af25e2326b66e1248368b329b266ec0.tar.gz | |
Switch from x11/Xaw3d to newer x11/libXaw3d.
Adapt some packages so they build with that.
Bump their PKGREVISIONs.
Diffstat (limited to 'graphics/xpaint')
| -rw-r--r-- | graphics/xpaint/Makefile | 8 | ||||
| -rw-r--r-- | graphics/xpaint/distinfo | 3 | ||||
| -rw-r--r-- | graphics/xpaint/patches/patch-misc.c | 13 |
3 files changed, 19 insertions, 5 deletions
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index e24fdfe0aea..da2a232b9bb 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.75 2013/08/14 23:51:08 gsutre Exp $ +# $NetBSD: Makefile,v 1.76 2015/10/14 20:17:27 wiz Exp $ DISTNAME= xpaint-2.7.8.1 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/} EXTRACT_SUFX= .tar.bz2 @@ -19,7 +19,7 @@ SUBST_STAGE.foo= pre-configure SUBST_FILES.foo= Local.config configure SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" SUBST_SED.foo+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" +SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.libXaw3d}|g" SUBST_SED.foo+= -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g" INSTALLATION_DIRS+= bin lib/X11/app-defaults ${PKGMANDIR}/cat1 @@ -43,5 +43,5 @@ pre-configure: .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/Xaw3d/buildlink3.mk" +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo index 105d677e81e..c425d22e09d 100644 --- a/graphics/xpaint/distinfo +++ b/graphics/xpaint/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2013/08/15 00:05:44 gsutre Exp $ +$NetBSD: distinfo,v 1.25 2015/10/14 20:17:27 wiz Exp $ SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf @@ -13,4 +13,5 @@ SHA1 (patch-ag) = a8eba89d7389a3e0b0973bf3a3c25a76ae7e0d84 SHA1 (patch-ai) = 38f3532befe2c58cc11d0e055765b6098bbdd9f5 SHA1 (patch-bitmaps_Imakefile) = c9d566999b13b10e3f7d7d7a60c34ef520597117 SHA1 (patch-image_h) = 5e8afa76bdd58cd747c13662e0a37fcf5a62256e +SHA1 (patch-misc.c) = b4ff0e25621312e7ed4dede9df5f99cca3359e2e SHA1 (patch-rw_readWritePS.c) = f56b512e888821134d2f7548741a33f0f8b886fd diff --git a/graphics/xpaint/patches/patch-misc.c b/graphics/xpaint/patches/patch-misc.c new file mode 100644 index 00000000000..f4826feb70e --- /dev/null +++ b/graphics/xpaint/patches/patch-misc.c @@ -0,0 +1,13 @@ +$NetBSD: patch-misc.c,v 1.1 2015/10/14 20:17:27 wiz Exp $ + +--- misc.c.orig 2005-04-24 11:57:52.000000000 +0000 ++++ misc.c +@@ -671,7 +671,7 @@ mousewheelScroll(Widget w, void * l, XEv + } + else return; + if (sb == None) return; +-#ifdef XAW3DG ++#if defined(XAW3DG) && defined(XAW_ARROW_SCROLLBARS) + if (((ScrollbarWidget)sb)->scrollbar.scroll_mode == 2 /* if scroll continuous */ + || LookAhead (sb, event)) + return; |