diff options
| author | jlam <jlam@pkgsrc.org> | 2001-12-11 15:37:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-12-11 15:37:05 +0000 |
| commit | 46c70af1fffb8d673576c1139363817119ac3b09 (patch) | |
| tree | eef1b8811741343dcf7b072ff90d8f53139955ee /graphics | |
| parent | 8c2ae96aaec2d78037e1968ac17a1b84488fa0a4 (diff) | |
| download | pkgsrc-46c70af1fffb8d673576c1139363817119ac3b09.tar.gz | |
Look for all of the pkgsrc-installed headers and libraries in
${BUILDLINK_DIR}. Fixes problem where xpm.h isn't found, noted in
pkg/14909 by Robert Elz <kre@munnari.OZ.AU>.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/xart/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xart/patches/patch-ac | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/graphics/xart/distinfo b/graphics/xart/distinfo index 62030fb3073..07cd3e7b186 100644 --- a/graphics/xart/distinfo +++ b/graphics/xart/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2001/08/03 09:43:18 wiz Exp $ +$NetBSD: distinfo,v 1.4 2001/12/11 15:37:05 jlam Exp $ SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c Size (xart19980415.tgz) = 343909 bytes SHA1 (patch-aa) = 7d8ae61d9a624cc537396f406b496f28376cf7b5 SHA1 (patch-ab) = b0f00e29560ce786e37a8ba62fef82dae80c4ee9 -SHA1 (patch-ac) = 28d32baa735b55a579a0e12a106621b95f60b2ba +SHA1 (patch-ac) = d2794c84766345aaea294785f7985b41c129f94a SHA1 (patch-ad) = 08059ca068d156be0e31283180c5deaebb99f7bd SHA1 (patch-ae) = 20d847bc9faa0e13bf161041d7fd7a44af73bad1 SHA1 (patch-af) = 6bf891c7532f257a18d3e2917353a36ca519221f diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac index f3f8d3262dc..34eaea6c358 100644 --- a/graphics/xart/patches/patch-ac +++ b/graphics/xart/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2000/09/24 03:28:34 hubertf Exp $ +$NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $ --- Local.config.orig Wed Apr 1 02:58:05 1998 +++ Local.config @@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.3 2000/09/24 03:28:34 hubertf Exp $ #ifdef HaveTIFF -TIFF_LIB = -L/usr/local/lib -ltiff -TIFF_INCLUDE = -I/usr/local/include/tiff -+TIFF_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -ltiff -+TIFF_INCLUDE = -I${LOCALBASE}/include ++TIFF_LIB = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -ltiff ++TIFF_INCLUDE = -I${BUILDLINK_DIR}/include #endif XCOMM If you have the JPEG library, make HaveJPEG defined @@ -19,8 +19,8 @@ $NetBSD: patch-ac,v 1.3 2000/09/24 03:28:34 hubertf Exp $ #ifdef HaveJPEG -JPEG_LIB = -L/usr/local/lib -ljpeg -JPEG_INCLUDE = -I/usr/local/include/jpeg -+JPEG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -ljpeg -+JPEG_INCLUDE = -I${LOCALBASE}/include ++JPEG_LIB = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -ljpeg ++JPEG_INCLUDE = -I${BUILDLINK_DIR}/include #endif XCOMM If you have the PNG library, make HavePNG defined @@ -30,8 +30,8 @@ $NetBSD: patch-ac,v 1.3 2000/09/24 03:28:34 hubertf Exp $ #ifdef HavePNG -PNG_LIB = -L/usr/local/lib -lpng -lz -PNG_INCLUDE = -I/usr/local/include/png -+PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz -+PNG_INCLUDE = -I${LOCALBASE}/include ++PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -lpng -lz ++PNG_INCLUDE = -I${BUILDLINK_DIR}/include #endif XCOMM If you are running SunOS and get an error with the following undefined @@ -40,12 +40,12 @@ $NetBSD: patch-ac,v 1.3 2000/09/24 03:28:34 hubertf Exp $ XCOMM Make sure the path name to the library is correct. -XPM_LIB = -L/usr/X11R6/lib -lXpm -+XPM_LIB = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXpm ++XPM_LIB = -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/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${X11BASE}/include/X11 ++XPM_INCLUDE = -I${BUILDLINK_DIR}/include/X11 DEPENDFLAGS = -I./bitmaps @@ -73,9 +73,9 @@ $NetBSD: patch-ac,v 1.3 2000/09/24 03:28:34 hubertf Exp $ -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 = -Wl,-R${LOCALBASE} -L${LOCALBASE}/lib -ltiff -+JPEG_INCLUDE = -I${LOCALBASE}/include -+JPEG_LIB = -Wl,-R${LOCALBASE} -L${LOCALBASE}/lib -ljpeg -+XPM_INCLUDE = -I${X11BASE}/include/X11 ++TIFF_INCLUDE = -I${BUILDLINK_DIR}/include ++TIFF_LIB = -Wl,-R${LOCALBASE} -L${BUILDLINK_DIR}/lib -ltiff ++JPEG_INCLUDE = -I${BUILDLINK_DIR}/include ++JPEG_LIB = -Wl,-R${LOCALBASE} -L${BUILDLINK_DIR}/lib -ljpeg ++XPM_INCLUDE = -I${BUILDLINK_DIR}/include/X11 #endif |