summaryrefslogtreecommitdiff
path: root/wm/windowmaker
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-14 18:22:35 +0000
committerjlam <jlam@pkgsrc.org>2001-07-14 18:22:35 +0000
commitb1827af46e7ce7a09bce3ed3a4934072ca0e763e (patch)
treea268f7e2f761cd9364ed642c682f5858b7b7fb9d /wm/windowmaker
parent1cede7e4e0335f3c77558146fc684a1a2326140d (diff)
downloadpkgsrc-b1827af46e7ce7a09bce3ed3a4934072ca0e763e.tar.gz
Fix libwraster linking problem in a more buildlink-friendly way.
Diffstat (limited to 'wm/windowmaker')
-rw-r--r--wm/windowmaker/distinfo4
-rw-r--r--wm/windowmaker/patches/patch-ab22
2 files changed, 14 insertions, 12 deletions
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 4b56549498e..7eceb7356ce 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2001/07/07 23:05:21 tron Exp $
+$NetBSD: distinfo,v 1.8 2001/07/14 18:22:35 jlam Exp $
SHA1 (WindowMaker-0.65.0.tar.bz2) = acc08353dbdbd0af26b0fa653322f60347c5a6fe
Size (WindowMaker-0.65.0.tar.bz2) = 1876239 bytes
SHA1 (patch-aa) = 2c353985edb3f993235428b0124ae00ddd74e60b
-SHA1 (patch-ab) = a0a6c1ad212de64974ebfa3ad3135fa041d8d68b
+SHA1 (patch-ab) = cb1f893635746725dd4143fb74bf16ab61f56319
SHA1 (patch-ac) = 8e4b85dc9b8b3cf211b6c76dbca46f60308ac591
SHA1 (patch-ad) = cc41fd43ae1682bd0fe7129de4eafd8531b548c2
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index 0935e7aafef..94c73cd8080 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2001/07/07 23:05:21 tron Exp $
+$NetBSD: patch-ab,v 1.5 2001/07/14 18:22:35 jlam Exp $
---- configure.in.orig Sun Apr 29 23:21:39 2001
-+++ configure.in Sun Jul 8 00:06:42 2001
+--- configure.in.orig Sun Apr 29 17:21:39 2001
++++ configure.in
@@ -223,29 +223,11 @@
supported_locales="cs de es et fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu"
supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de bg hu sk"
@@ -37,12 +37,14 @@ $NetBSD: patch-ab,v 1.4 2001/07/07 23:05:21 tron Exp $
done
-@@ -864,7 +846,7 @@
- exec_prefix=\$prefix
+@@ -720,8 +702,8 @@
+ fi
+ fi
- WCFLAGS="-I\$prefix/include $inc_search_path"
--WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
-+WLFLAGS="-L\$exec_prefix/lib -L$LOCALBASE/lib $lib_search_path"
- WLIBS="-lwraster $GFXLIBS $XLIBS -lm"
+-LIBRARY_SEARCH_PATH="$lib_search_path"
+-HEADER_SEARCH_PATH="$inc_search_path"
++LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${X11BASE}/lib"
++HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${X11BASE}/include"
- usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"
+ AC_SUBST(LIBRARY_SEARCH_PATH)
+ AC_SUBST(HEADER_SEARCH_PATH)