From 8ee9046ae867244402601b98a5823a75a0249248 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 9 May 1999 18:47:22 +0000
Subject: Split two patches into seperate files.

---
 graphics/xpaint/Makefile         |  9 ++++++++-
 graphics/xpaint/patches/patch-ad | 22 ++--------------------
 graphics/xpaint/patches/patch-af | 21 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 graphics/xpaint/patches/patch-af

(limited to 'graphics/xpaint')

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index e5d4abccea9..896bb0df670 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1999/03/04 14:59:23 tron Exp $
+# $NetBSD: Makefile,v 1.16 1999/05/09 18:47:22 tron Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
 #
 
@@ -23,4 +23,11 @@ pre-configure:
 		< ${WRKSRC}/Local.config > ${WRKSRC}/Local.config.new && \
 	${MV} -f ${WRKSRC}/Local.config.new ${WRKSRC}/Local.config
 
+.if (${MACHINE_ARCH} == arm32)
+pre-build:
+	cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} CDEBUGFLAGS=-O0 \
+	${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} iprocess.o
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpaint/patches/patch-ad b/graphics/xpaint/patches/patch-ad
index 454cbb1669d..68d865369ec 100644
--- a/graphics/xpaint/patches/patch-ad
+++ b/graphics/xpaint/patches/patch-ad
@@ -1,4 +1,5 @@
-$NetBSD: patch-ad,v 1.4 1998/12/20 14:18:02 christos Exp $
+$NetBSD: patch-ad,v 1.5 1999/05/09 18:47:22 tron Exp $
+
 --- readRC.c	1998/02/04 16:36:16	1.1
 +++ readRC.c	1998/02/04 16:41:52
 @@ -64,6 +64,9 @@
@@ -32,22 +33,3 @@ $NetBSD: patch-ad,v 1.4 1998/12/20 14:18:02 christos Exp $
  }
  
  static void 
---- Local.config.orig	Wed Aug 13 19:36:11 1997
-+++ Local.config	Wed Feb  4 17:44:44 1998
-@@ -130,9 +130,11 @@
- #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) ||  \
-     defined(BSD386Architecture)
- ARCH_DEFINES = -DHAVE_PARAM_H
--TIFF_INCLUDE = -I/usr/local/include
--TIFF_LIB     = -L/usr/local/lib -ltiff
--JPEG_INCLUDE = -I/usr/local/include
--JPEG_LIB     = -L/usr/local/lib -ljpeg
--XPM_INCLUDE = -I/usr/X11R6/include/X11
-+TIFF_INCLUDE = -I${LOCALBASE}/include
-+TIFF_LIB     = -L${LOCALBASE}/lib -ltiff
-+JPEG_INCLUDE = -I${LOCALBASE}/include
-+JPEG_LIB     = -L${LOCALBASE}/lib -ljpeg
-+PNG_INCLUDE = -I${LOCALBASE}/include/png
-+PNG_LIB     = -L${LOCALBASE}/lib -lpng -lz
-+XPM_INCLUDE = -I${X11BASE}/include/X11
- #endif
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
new file mode 100644
index 00000000000..23bc3900554
--- /dev/null
+++ b/graphics/xpaint/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 1999/05/09 18:47:22 tron Exp $
+
+--- Local.config.orig	Wed Aug 13 19:36:11 1997
++++ Local.config	Wed Feb  4 17:44:44 1998
+@@ -130,9 +130,11 @@
+ #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) ||  \
+     defined(BSD386Architecture)
+ ARCH_DEFINES = -DHAVE_PARAM_H
+-TIFF_INCLUDE = -I/usr/local/include
+-TIFF_LIB     = -L/usr/local/lib -ltiff
+-JPEG_INCLUDE = -I/usr/local/include
+-JPEG_LIB     = -L/usr/local/lib -ljpeg
+-XPM_INCLUDE = -I/usr/X11R6/include/X11
++TIFF_INCLUDE = -I${LOCALBASE}/include
++TIFF_LIB     = -L${LOCALBASE}/lib -ltiff
++JPEG_INCLUDE = -I${LOCALBASE}/include
++JPEG_LIB     = -L${LOCALBASE}/lib -ljpeg
++PNG_INCLUDE = -I${LOCALBASE}/include/png
++PNG_LIB     = -L${LOCALBASE}/lib -lpng -lz
++XPM_INCLUDE = -I${X11BASE}/include/X11
+ #endif
-- 
cgit v1.2.3