From 87527537795c754c2919c88021550b31ce18cb3c Mon Sep 17 00:00:00 2001
From: merdely <merdely@openbsd.org>
Date: Tue, 22 Jan 2008 18:51:46 +0000
Subject: [PATCH] Update to 2.1

From Will Maier
ok okan@
---
 x11/awesome/Makefile                          | 29 ++++++-------------
 x11/awesome/distinfo                          | 10 +++----
 .../patches/patch-awesome-client-common_c     | 10 +++----
 x11/awesome/pkg/PLIST                         | 20 ++++++++++++-
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/x11/awesome/Makefile b/x11/awesome/Makefile
index caaffced89c..126a561a5fd 100644
--- a/x11/awesome/Makefile
+++ b/x11/awesome/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2007/12/16 21:27:14 pyr Exp $
+# $OpenBSD: Makefile,v 1.4 2008/01/22 18:51:46 merdely Exp $
 
 COMMENT=		fast, small, dynamic and awesome window manager
 
-V=2.0
+V=			2.1
 DISTNAME=		awesome-$V
 
 CATEGORIES=		x11
@@ -17,37 +17,26 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		X11 Xext Xinerama Xrandr Xft c
+WANTLIB=		X11 Xext Xinerama Xrandr Xft c Xau Xdmcp \
+			Xrender expat fontconfig freetype glitz iconv \
+			intl m png z
 
 MASTER_SITES=		${HOMEPAGE}/download/
 
 LIB_DEPENDS=		cairo.>=6::graphics/cairo	\
-			confuse::devel/libconfuse
+			confuse.>=1::devel/libconfuse
 BUILD_DEPENDS=		::textproc/asciidoc	\
 			::textproc/xmlto
 
-CFLAGS+=		-I. -I${X11BASE}/include \
-			-I${X11BASE}/include/freetype2 \
-			-I${LOCALBASE}/include \
-			$$(pkg-config --cflags libconfuse) \
-			$$(pkg-config --cflags cairo) \
-			-DVERSION=\\\"$V\\\" \
-			-DRELEASE=\\\"Fruit_Fly\\\"
+CONFIGURE_STYLE=	gnu
 
-LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib \
-			-lX11 -lXext -lXrandr -lXinerama -lXft \
-			$$(pkg-config --libs libconfuse) \
-			$$(pkg-config --libs cairo)
-
-MAKE_FLAGS=             CC=${CC} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-FAKE_FLAGS=             MANPREFIX=${PREFIX}/man \
-			PREFIX=${PREFIX}
+MAKE_FLAGS=		AWESOME_CFLAGS=""
 
 USE_X11=		Yes
 
 NO_REGRESS=		Yes
 
-post-patch:
+pre-install:
 	@perl -pi -e 's|Mod4|Mod1|g' ${WRKSRC}/awesomerc
 
 post-install:
diff --git a/x11/awesome/distinfo b/x11/awesome/distinfo
index afdd37cd46f..739e76ab4b6 100644
--- a/x11/awesome/distinfo
+++ b/x11/awesome/distinfo
@@ -1,5 +1,5 @@
-MD5 (awesome-2.0.tar.gz) = s+JFvZuMBbdZzArL7J9qKQ==
-RMD160 (awesome-2.0.tar.gz) = OjpwFKEZFfMWv86c5aKmBqBXNjo=
-SHA1 (awesome-2.0.tar.gz) = ejJX56dvnXe9WVWKqDk/K+1QBX8=
-SHA256 (awesome-2.0.tar.gz) = kzzn9fQzmWOl9iKcr4LJ8PuOtp5pKT9yJGc34T/6oHk=
-SIZE (awesome-2.0.tar.gz) = 48600
+MD5 (awesome-2.1.tar.gz) = WUIvBxpSOKUY3q8iSJ3zyg==
+RMD160 (awesome-2.1.tar.gz) = JlXSo3t1JRpho2B8QaYCX9yIdQg=
+SHA1 (awesome-2.1.tar.gz) = dteU+kIW21AQBJTfssdy0p7slzc=
+SHA256 (awesome-2.1.tar.gz) = moBOxK9S0FHR8kLO8y57d2hPnzd9dTbYXUdN/pELVBU=
+SIZE (awesome-2.1.tar.gz) = 164080
diff --git a/x11/awesome/patches/patch-awesome-client-common_c b/x11/awesome/patches/patch-awesome-client-common_c
index df406145d59..12fe037e73d 100644
--- a/x11/awesome/patches/patch-awesome-client-common_c
+++ b/x11/awesome/patches/patch-awesome-client-common_c
@@ -1,10 +1,10 @@
-$OpenBSD: patch-awesome-client-common_c,v 1.1 2007/12/16 21:27:14 pyr Exp $
---- awesome-client-common.c.orig	Sun Dec 16 15:48:35 2007
-+++ awesome-client-common.c	Sun Dec 16 15:47:36 2007
-@@ -20,6 +20,7 @@
-  *
+$OpenBSD: patch-awesome-client-common_c,v 1.2 2008/01/22 18:51:46 merdely Exp $
+--- awesome-client-common.c.orig	Wed Jan 16 06:41:31 2008
++++ awesome-client-common.c	Tue Jan 22 08:59:35 2008
+@@ -21,6 +21,7 @@
   */
  
+ #include <stdio.h>
 +#include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/un.h>
diff --git a/x11/awesome/pkg/PLIST b/x11/awesome/pkg/PLIST
index f68a8375530..59ea4ae3caa 100644
--- a/x11/awesome/pkg/PLIST
+++ b/x11/awesome/pkg/PLIST
@@ -1,9 +1,27 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/12/16 21:27:14 pyr Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/01/22 18:51:46 merdely Exp $
 bin/awesome
 bin/awesome-client
 @man man/man1/awesome-client.1
 @man man/man1/awesome.1
+@man man/man1/awesomerc.1
+share/awesome/
+share/awesome/icons/
+share/awesome/icons/layouts/
+share/awesome/icons/layouts/dwindle.png
+share/awesome/icons/layouts/dwindlew.png
+share/awesome/icons/layouts/floating.png
+share/awesome/icons/layouts/floatingw.png
+share/awesome/icons/layouts/max.png
+share/awesome/icons/layouts/maxw.png
+share/awesome/icons/layouts/spiral.png
+share/awesome/icons/layouts/spiralw.png
+share/awesome/icons/layouts/tile.png
+share/awesome/icons/layouts/tileleft.png
+share/awesome/icons/layouts/tileleftw.png
+share/awesome/icons/layouts/tilew.png
 share/doc/awesome/
 share/doc/awesome/README
+share/doc/awesome/STYLE
+share/doc/awesome/awesomerc
 share/examples/awesome/
 share/examples/awesome/awesomerc