Pierre-Yves Ritschard <[EMAIL PROTECTED]> wrote:
> This is an update to the new 2.0 release of awesome.
>
Updated diff after feedback from wcmaier & merderly
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 27 Oct 2007 12:34:55 -0000 1.2
+++ Makefile 16 Dec 2007 20:37:09 -0000
@@ -2,8 +2,8 @@
COMMENT= fast, small, dynamic and awesome window manager
-V=1.3
-DISTNAME= awesome-${V}
+V=2.0
+DISTNAME= awesome-$V
CATEGORIES= x11
@@ -21,14 +21,22 @@ WANTLIB= X11 Xext Xinerama Xrandr Xft c
MASTER_SITES= ${HOMEPAGE}/download/
-LIB_DEPENDS= config::devel/libconfig
+LIB_DEPENDS= cairo.>=6::graphics/cairo confuse::devel/libconfuse
+BUILD_DEPENDS= ::textproc/asciidoc ::textproc/xmlto
-CFLAGS+= -I. -I${X11BASE}/include
-I${X11BASE}/include/freetype2 \
- -I${LOCALBASE}/include -DVERSION=\\\"$V\\\" \
- $$(pkg-config --cflags libconfig)
-LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib \
+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\\\"
+
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib \
-lX11 -lXext -lXrandr -lXinerama -lXft \
- $$(pkg-config --libs libconfig)
+ $$(pkg-config --libs libconfuse) \
+ $$(pkg-config --libs cairo)
+
MAKE_FLAGS= CC=${CC} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
FAKE_FLAGS= MANPREFIX=${PREFIX}/man \
PREFIX=${PREFIX}
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/awesome/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 27 Oct 2007 12:34:55 -0000 1.2
+++ distinfo 16 Dec 2007 20:37:09 -0000
@@ -1,5 +1,5 @@
-MD5 (awesome-1.3.tar.gz) = xWJYU+X3ntfN5hi4cpKFJw==
-RMD160 (awesome-1.3.tar.gz) = tkCzOhONVwCc33VeMuqXT1L20wg=
-SHA1 (awesome-1.3.tar.gz) = yGVv2ghlLOwgIX+zaeSmx8zgUo0=
-SHA256 (awesome-1.3.tar.gz) = cvi22RB+jE1V7q2LE7cfRFmw1BXNZ/KVjIDtMoePljU=
-SIZE (awesome-1.3.tar.gz) = 40012
+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
Index: patches/patch-awesome-client-common_c
===================================================================
RCS file: patches/patch-awesome-client-common_c
diff -N patches/patch-awesome-client-common_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-awesome-client-common_c 16 Dec 2007 20:37:09 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- 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 @@
+ *
+ */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/awesome/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 26 Sep 2007 19:13:35 -0000 1.1.1.1
+++ pkg/PLIST 16 Dec 2007 20:37:09 -0000
@@ -1,5 +1,7 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.1.1.1 2007/09/26 19:13:35 merdely Exp $
[EMAIL PROTECTED] $OpenBSD$
bin/awesome
+bin/awesome-client
[EMAIL PROTECTED] man/man1/awesome-client.1
@man man/man1/awesome.1
share/doc/awesome/
share/doc/awesome/README
