From af342694926209ae901cb9b6a295316cb49aa481 Mon Sep 17 00:00:00 2001 From: wcmaier Date: Fri, 16 May 2008 20:06:12 +0000 Subject: [PATCH] Update to 2.3. Tweaks from D. Adam Karim , who also takes maintainership. Thanks! ok merdely@ --- x11/awesome/Makefile | 24 ++++++++++++++++-------- x11/awesome/distinfo | 10 +++++----- x11/awesome/patches/patch-Makefile_in | 11 +++++++++++ x11/awesome/pkg/PLIST | 8 +++++++- 4 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 x11/awesome/patches/patch-Makefile_in diff --git a/x11/awesome/Makefile b/x11/awesome/Makefile index faa7d5e9695..15b4519f9f6 100644 --- a/x11/awesome/Makefile +++ b/x11/awesome/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.5 2008/04/04 18:58:17 wcmaier Exp $ +# $OpenBSD: Makefile,v 1.6 2008/05/16 20:06:12 wcmaier Exp $ COMMENT= fast, small, dynamic and awesome window manager -DISTNAME= awesome-2.2 +DISTNAME= awesome-2.3 CATEGORIES= x11 HOMEPAGE= http://awesome.naquadah.org/ -MAINTAINER= Will Maier +MAINTAINER= D. Adam Karim # BSD PERMIT_PACKAGE_CDROM= Yes @@ -16,23 +16,31 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext Xinerama Xrandr Xft c Xau Xdmcp \ +WANTLIB= X11 Xext Xinerama Xrandr c Xau Xdmcp \ Xrender expat fontconfig freetype glitz iconv \ intl m png z MASTER_SITES= ${HOMEPAGE}/download/ -LIB_DEPENDS= cairo.>=6::graphics/cairo \ - confuse.>=1::devel/libconfuse -BUILD_DEPENDS= ::textproc/asciidoc \ - ::textproc/xmlto +LIB_DEPENDS= cairo.>=6::graphics/cairo \ + confuse.>=1::devel/libconfuse \ + Imlib2.>=2::graphics/imlib2 \ + pango-1.0,pangocairo-1.0,pangoft2-1.0::devel/pango \ + gmodule-2.0,glib-2.0,gobject-2.0::devel/glib2 +BUILD_DEPENDS= ::devel/doxygen \ + ::textproc/xmlto \ + ::textproc/asciidoc CONFIGURE_STYLE= gnu +CONFIGURE_ENV= PYTHON=${MODPY_BIN} MAKE_FLAGS= AWESOME_CFLAGS="" USE_X11= Yes +MODULES= lang/python + + NO_REGRESS= Yes pre-install: diff --git a/x11/awesome/distinfo b/x11/awesome/distinfo index bb33e925fe9..16ac190d02a 100644 --- a/x11/awesome/distinfo +++ b/x11/awesome/distinfo @@ -1,5 +1,5 @@ -MD5 (awesome-2.2.tar.gz) = WV2lcvwt0DRhCEsynnS12w== -RMD160 (awesome-2.2.tar.gz) = yHPGvIuYNTjSQn9M2Dg4eX32v+g= -SHA1 (awesome-2.2.tar.gz) = 2W9Ke1G8e0qXZd4ynZXUkEyDFTI= -SHA256 (awesome-2.2.tar.gz) = OIh48Xw83QN5R0OWuV8m6zrxDsKV6Jqbgzhl2eChKu0= -SIZE (awesome-2.2.tar.gz) = 208012 +MD5 (awesome-2.3.tar.gz) = aKToANqP//9HA7Or5m9G+A== +RMD160 (awesome-2.3.tar.gz) = DqbZNaCvw5QtkhGAzwx5P9Gybl8= +SHA1 (awesome-2.3.tar.gz) = B8Jnm7h3eh2yn30CeeNecQKP/ME= +SHA256 (awesome-2.3.tar.gz) = Yg/WFjECCE9hUJG6sRxP1yE5EbAxpJEHF01+spV/noQ= +SIZE (awesome-2.3.tar.gz) = 230809 diff --git a/x11/awesome/patches/patch-Makefile_in b/x11/awesome/patches/patch-Makefile_in new file mode 100644 index 00000000000..e3f0413e179 --- /dev/null +++ b/x11/awesome/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Thu May 15 20:59:29 2008 ++++ Makefile.in Thu May 15 20:59:42 2008 +@@ -200,7 +200,7 @@ + VERSION = @VERSION@ + WHOAMI = @WHOAMI@ + XMKMF = @XMKMF@ +-XMLTO = @XMLTO@ ++XMLTO = @XMLTO@ --skip-validation + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ diff --git a/x11/awesome/pkg/PLIST b/x11/awesome/pkg/PLIST index 8016bc12141..b2b6f451de4 100644 --- a/x11/awesome/pkg/PLIST +++ b/x11/awesome/pkg/PLIST @@ -1,13 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.4 2008/04/04 18:58:17 wcmaier Exp $ +@comment $OpenBSD: PLIST,v 1.5 2008/05/16 20:06:12 wcmaier Exp $ bin/awesome bin/awesome-client +bin/awesome-menu bin/awesome-message @man man/man1/awesome-client.1 +@man man/man1/awesome-menu.1 @man man/man1/awesome-message.1 @man man/man1/awesome.1 @man man/man5/awesomerc.5 share/awesome/ share/awesome/icons/ +share/awesome/icons/awesome16.png +share/awesome/icons/awesome32.png +share/awesome/icons/awesome48.png +share/awesome/icons/awesome64.png share/awesome/icons/layouts/ share/awesome/icons/layouts/dwindle.png share/awesome/icons/layouts/dwindlew.png