From 6191031d261efad28adffde3908d3f19c2cb453b Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Fri, 6 Jan 2006 22:36:19 +0000
Subject: Changes 2.7.8.1: * minor bugfixes (zoomed windows are now correctly
 initialized)

Pkgsrc:
* now installs correctly (not to /usr/X11R6)
---
 graphics/xpaint/Makefile         |  8 +++++---
 graphics/xpaint/distinfo         | 12 ++++++------
 graphics/xpaint/patches/patch-ad |  4 ++--
 graphics/xpaint/patches/patch-af |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'graphics/xpaint')

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 56408cf4b21..f483ef7dedc 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:23 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2006/01/06 22:36:19 adam Exp $
 
-DISTNAME=       xpaint-2.7.8
+DISTNAME=       xpaint-2.7.8.1
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,6 @@ COMMENT=	Simple paint program
 USE_IMAKE=      	yes
 USE_TOOLS+=		gmake
 MAKE_ENV+=		XMKMF=${XMKMF:Q}
-BUILD_TARGET=		xaw3dg
 
 SUBST_CLASSES+=		foo
 SUBST_STAGE.foo=	pre-configure
@@ -22,6 +21,9 @@ SUBST_SED.foo=		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
 			-e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \
 			-e "s|@XPMDIR@|${BUILDLINK_PREFIX.xpm}|g"
 
+pre-configure:
+	cd ${WRKSRC} && ./configure xaw3dg
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index f3cabc059ea..febe3a270ff 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.17 2005/12/05 20:50:23 rillig Exp $
+$NetBSD: distinfo,v 1.18 2006/01/06 22:36:19 adam Exp $
 
-SHA1 (xpaint-2.7.8.tar.bz2) = 5573996f293838abd892faaa73a31239c03f9b9a
-RMD160 (xpaint-2.7.8.tar.bz2) = edf4cdd5ee3f2af1d49eb4bb6618fc2dc3c138ff
-Size (xpaint-2.7.8.tar.bz2) = 415855 bytes
+SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa
+RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf
+Size (xpaint-2.7.8.1.tar.bz2) = 459429 bytes
 SHA1 (patch-aa) = c0f7d49081c3440b836754966527e39ee1bcabec
 SHA1 (patch-ab) = 653a8873434093b4fc27e57a26e850ca23ec3556
 SHA1 (patch-ac) = 78ba5e1c2b0bb5e9abfd12783454d5b30499d5f0
-SHA1 (patch-ad) = dc12b553353bb5f8e70251ace8bf874c13aaa24f
+SHA1 (patch-ad) = a9223ef202e8fb00186be09d2ae6ae8d5d9968cc
 SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263
-SHA1 (patch-af) = 3ad4c245351ff63f1a8c989fcc77cbb51af9b275
+SHA1 (patch-af) = 73f1289ca104f4c53e8d184251d5a84c5c1ec7ab
 SHA1 (patch-ag) = 5191cb57084a746fec33dec105a8fe1750c6d8ae
diff --git a/graphics/xpaint/patches/patch-ad b/graphics/xpaint/patches/patch-ad
index cf7b8f39f5b..2dd83b4c12b 100644
--- a/graphics/xpaint/patches/patch-ad
+++ b/graphics/xpaint/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.8 2005/09/06 14:54:05 adam Exp $
+$NetBSD: patch-ad,v 1.9 2006/01/06 22:36:19 adam Exp $
 
 --- configure.orig	2005-06-03 12:26:11.000000000 +0000
 +++ configure
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.8 2005/09/06 14:54:05 adam Exp $
  
  if test "$WIDGETS" = "XAW3DG" ; then
 -   ln -sf /usr/include/X11/Xaw3d xaw_incdir
-+   ln -sf /usr/pkg/include/X11/Xaw3d xaw_incdir
++   ln -sf @XAWDIR@/include/X11/Xaw3d xaw_incdir
     echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG"   
     echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG" > Local.xawdefs
     echo "SYS_LIBRARIES = -lXaw3d -L."
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index d17b3401049..4f9a6df10ec 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.12 2005/12/05 20:50:23 rillig Exp $
+$NetBSD: patch-af,v 1.13 2006/01/06 22:36:19 adam Exp $
 
---- Local.config.orig	2005-04-30 21:33:14.000000000 +0000
+--- Local.config.orig	2005-04-30 23:33:14.000000000 +0200
 +++ Local.config
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2
  XCOMM Local customization
  
  DESTDIR = 
-- 
cgit v1.2.3