From 7f899153be1ac9dd2526950cd9749f1050325712 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 10 Jul 2010 14:35:59 +0000
Subject: [PATCH] fix dependencies, honor X11BASE and LOCALBASE

---
 x11/wmii/Makefile                |  9 +++++----
 x11/wmii/patches/patch-config_mk | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/x11/wmii/Makefile b/x11/wmii/Makefile
index 5a5d8a2d889..7e47cc1004b 100644
--- a/x11/wmii/Makefile
+++ b/x11/wmii/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2009/05/31 16:24:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2010/07/10 14:35:59 naddy Exp $
 
 COMMENT=	dynamic window manager
 
 DISTNAME=	wmii-3.6
-PKGNAME=	${DISTNAME}p4
+REVISION=	5
 CATEGORIES=	x11
 
 HOMEPAGE=	http://wmii.suckless.org/
@@ -18,8 +18,9 @@ MASTER_SITES=	http://code.suckless.org/dl/wmii/
 
 WANTLIB += X11 Xext c m
 
-LIB_DEPENDS=	ixp.>=0.4::devel/libixp \
-		iconv.>=4.0::converters/libiconv
+MODULES=	converters/libiconv
+
+BUILD_DEPENDS=	::devel/libixp
 
 RUN_DEPENDS=	::x11/dmenu
 
diff --git a/x11/wmii/patches/patch-config_mk b/x11/wmii/patches/patch-config_mk
index 0802a24911e..d8c07a63c40 100644
--- a/x11/wmii/patches/patch-config_mk
+++ b/x11/wmii/patches/patch-config_mk
@@ -1,6 +1,6 @@
-$OpenBSD: patch-config_mk,v 1.4 2009/05/31 16:24:23 sthen Exp $
---- config.mk.orig	Fri Nov 16 13:59:15 2007
-+++ config.mk	Sun May 31 17:21:19 2009
+$OpenBSD: patch-config_mk,v 1.5 2010/07/10 14:35:59 naddy Exp $
+--- config.mk.orig	Fri Nov 16 06:59:15 2007
++++ config.mk	Sat Jul 10 08:33:20 2010
 @@ -1,10 +1,10 @@
  # Customize below to fit your system
  
@@ -28,15 +28,19 @@ $OpenBSD: patch-config_mk,v 1.4 2009/05/31 16:24:23 sthen Exp $
  STATIC = -static
  MKDEP = cpp -M
  
-@@ -31,9 +33,8 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/usr/local/plan9
+@@ -29,11 +31,10 @@ AR = ar crs
+ AWKPATH = $$(which awk)
+ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/usr/local/plan9:/usr/local/9:/opt/plan9:/opt/9:/usr/plan9:/usr/9
  
- INCX11 = -I/usr/X11R6/include
- LIBX11 = -L/usr/X11R6/lib -lX11
+-INCX11 = -I/usr/X11R6/include
+-LIBX11 = -L/usr/X11R6/lib -lX11
 -LIBICONV = # Leave blank if your libc includes iconv (glibc does)
 -LIBIXP = ${ROOT}/libixp/libixp.a
 -LIBIXP = ${LIBDIR}/libixp.a
-+LIBICONV = /usr/local/lib/libiconv.a
-+LIBIXP = /usr/local/lib/libixp.a
++INCX11 = -I${X11BASE}/include
++LIBX11 = -L${X11BASE}/lib -lX11
++LIBICONV = -L${LOCALBASE}/lib -liconv
++LIBIXP = ${LOCALBASE}/lib/libixp.a
  
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"