From d0801ed3e72828981b048144d3cb9fdb33e2dea0 Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Fri, 16 Dec 2011 05:14:27 +0000
Subject: Yet another package that thinks it's a good idea to conditionalize on
 X headers' include guards, which changed at some point. Hack it to recognize
 what's there nowadays as well as the old symbol.

While here, deploy INSTALLATION_DIRS to work around apparent dir
permission problems in the package's own install logic.
---
 graphics/xpaint/Makefile              | 15 ++++++++++++++-
 graphics/xpaint/distinfo              |  3 ++-
 graphics/xpaint/patches/patch-image_h | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 graphics/xpaint/patches/patch-image_h

(limited to 'graphics/xpaint')

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 368a142cdcf..8359f4fa807 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2011/07/14 09:52:59 shattered Exp $
+# $NetBSD: Makefile,v 1.68 2011/12/16 05:14:27 dholland Exp $
 
 DISTNAME=	xpaint-2.7.8.1
 PKGREVISION=	7
@@ -25,6 +25,19 @@ SUBST_SED.foo=		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
 			-e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \
 			-e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
 
+INSTALLATION_DIRS+=	bin lib/X11/app-defaults ${PKGMANDIR}/cat1
+INSTALLATION_DIRS+=	share/xpaint
+INSTALLATION_DIRS+=	share/xpaint/include
+INSTALLATION_DIRS+=	share/xpaint/c_scripts
+INSTALLATION_DIRS+=	share/xpaint/c_scripts/3d_surfaces
+INSTALLATION_DIRS+=	share/xpaint/c_scripts/filters
+INSTALLATION_DIRS+=	share/xpaint/c_scripts/images
+INSTALLATION_DIRS+=	share/xpaint/c_scripts/layers
+INSTALLATION_DIRS+=	share/xpaint/c_scripts/procedures
+INSTALLATION_DIRS+=	share/xpaint/c_scripts/3d_curves
+INSTALLATION_DIRS+=	share/xpaint/help
+INSTALLATION_DIRS+=	share/xpaint/messages
+
 pre-configure:
 	cd ${WRKSRC} && ./configure xaw3dg
 
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index ca5d38fef9d..f9a17b850de 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2011/12/15 18:49:53 marino Exp $
+$NetBSD: distinfo,v 1.22 2011/12/16 05:14:27 dholland Exp $
 
 SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa
 RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263
 SHA1 (patch-af) = 73f1289ca104f4c53e8d184251d5a84c5c1ec7ab
 SHA1 (patch-ag) = a8eba89d7389a3e0b0973bf3a3c25a76ae7e0d84
 SHA1 (patch-ai) = 38f3532befe2c58cc11d0e055765b6098bbdd9f5
+SHA1 (patch-image_h) = 5e8afa76bdd58cd747c13662e0a37fcf5a62256e
diff --git a/graphics/xpaint/patches/patch-image_h b/graphics/xpaint/patches/patch-image_h
new file mode 100644
index 00000000000..e57c750988c
--- /dev/null
+++ b/graphics/xpaint/patches/patch-image_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-image_h,v 1.1 2011/12/16 05:14:27 dholland Exp $
+
+Yet another package that thinks it's a good idea to conditionalize on
+someone else's include guards beyond its control...
+
+--- image.h~	2005-03-20 20:15:32.000000000 +0000
++++ image.h
+@@ -63,7 +63,7 @@ typedef struct {
+     unsigned long sourceMask;
+ } Image;
+ 
+-#ifdef _XLIB_H_
++#if defined(_XLIB_H_) || defined(_X11_XLIB_H_)
+ /* Used to transfer information to routines in iprocess.c */
+ struct imageprocessinfo {
+     int oilArea;
-- 
cgit v1.2.3