summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-09-01 13:43:37 +0000
committerhubertf <hubertf>2000-09-01 13:43:37 +0000
commitda4dcf216a91af966148ca2dfc2fd53688bc732d (patch)
treea9946d2a404934a2bb48bd1676537266811658b1 /graphics
parentd7533d1ad8e137474ae2e963008fef375635dd91 (diff)
downloadpkgsrc-da4dcf216a91af966148ca2dfc2fd53688bc732d.tar.gz
Fix for xpkgwedge
Code by Alistair Crooks <agc@netbsd.org>
Diffstat (limited to 'graphics')
-rw-r--r--graphics/xpaint/Makefile13
-rw-r--r--graphics/xpaint/files/patch-sum4
-rw-r--r--graphics/xpaint/patches/patch-af22
3 files changed, 28 insertions, 11 deletions
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 852c803255d..70d08479399 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/08/23 23:14:28 tron Exp $
+# $NetBSD: Makefile,v 1.24 2000/09/01 13:43:37 hubertf Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
#
@@ -17,10 +17,13 @@ DEPENDS+= png>=1.0.6:../../graphics/png
USE_IMAKE= YES
USE_XPM= YES
+EVAL_PREFIX= XPMDIR=xpm
+
pre-configure:
- @${SED} -e 's|\$${LOCALBASE}|'${LOCALBASE}'|g' \
- -e 's|\$${X11BASE}|'${X11BASE}'|g' \
- < ${WRKSRC}/Local.config > ${WRKSRC}/Local.config.new && \
- ${MV} -f ${WRKSRC}/Local.config.new ${WRKSRC}/Local.config
+ ${MV} -f ${WRKSRC}/Local.config ${WRKSRC}/Local.config.save
+ @${SED} -e 's|\$${LOCALBASE}|${LOCALBASE}|g' \
+ -e 's|\$${X11BASE}|${X11BASE}|g' \
+ -e 's|\$${XPMDIR}|${XPMDIR}|g' \
+ ${WRKSRC}/Local.config.save > ${WRKSRC}/Local.config
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpaint/files/patch-sum b/graphics/xpaint/files/patch-sum
index 94ae6fee5e8..6741807ff13 100644
--- a/graphics/xpaint/files/patch-sum
+++ b/graphics/xpaint/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:14 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/01 13:43:38 hubertf Exp $
MD5 (patch-aa) = aac47e67f9668ea348afea7e20f9d18f
MD5 (patch-ab) = 57e7f41c130e66f0a63eb36477a2a788
MD5 (patch-ac) = d70d9cc79f2e481009dc3787408c894a
MD5 (patch-ad) = fe6b8273bc7c97f4373fcf02538d497f
MD5 (patch-ae) = 2c09ab74ab156c6b34db36c773119b38
-MD5 (patch-af) = 51f19b58a21686ea6beb703ce761370f
+MD5 (patch-af) = 66a033aa38d2881b49e96ca3c098a979
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index 8965039fa99..92ce5e94212 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 1999/05/25 20:43:27 tron Exp $
+$NetBSD: patch-af,v 1.4 2000/09/01 13:43:38 hubertf Exp $
---- Local.config.orig Sat Jun 27 20:43:56 1998
-+++ Local.config Sun May 9 20:55:21 1999
+--- Local.config.orig Sat Jun 27 19:43:56 1998
++++ Local.config Fri Sep 1 11:32:05 2000
@@ -39,6 +39,9 @@
#ifdef NetBSDArchitecture
@@ -12,6 +12,20 @@ $NetBSD: patch-af,v 1.3 1999/05/25 20:43:27 tron Exp $
#endif
#ifdef OS2Architecture
+@@ -101,11 +104,11 @@
+ XCOMM You must have the XPM library.
+ XCOMM Make sure the path name to the library is correct.
+
+-XPM_LIB = -L/usr/X11R6/lib -lXpm
++XPM_LIB = -L${XPMDIR}/lib -Wl,-R${XPMDIR}/lib -lXpm
+
+ XCOMM Make sure this points to the location of the 'xpm.h' file.
+
+-XPM_INCLUDE = -I/usr/X11R6/include/X11
++XPM_INCLUDE = -I${XPMDIR}/include/X11
+
+
+ DEPENDFLAGS = -I./bitmaps
@@ -133,11 +136,13 @@
#if defined(NetBSDArchitecture) || defined(BSD386Architecture)
@@ -27,7 +41,7 @@ $NetBSD: patch-af,v 1.3 1999/05/25 20:43:27 tron Exp $
+JPEG_LIB = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg
+PNG_INCLUDE = -I${LOCALBASE}/include/png
+PNG_LIB = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpng -lz
-+XPM_INCLUDE = -I${X11BASE}/include/X11
++XPM_INCLUDE = -I${XPMDIR}/include/X11
#endif
#if defined(FreeBSDArchitecture)