summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/cwm')
-rw-r--r--x11-wm/cwm/ChangeLog8
-rw-r--r--x11-wm/cwm/cwm-20110323.ebuild38
-rw-r--r--x11-wm/cwm/files/cwm-20110323-Makefile.patch35
3 files changed, 80 insertions, 1 deletions
diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index f8412decd614..afc1953d272e 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-wm/cwm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.12 2011/04/26 11:15:08 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.13 2011/05/03 18:06:38 xmw Exp $
+
+*cwm-20110323 (03 May 2011)
+
+ 03 May 2011; Michael Weber <xmw@gentoo.org> +cwm-20110323.ebuild,
+ +files/cwm-20110323-Makefile.patch:
+ Version bump
26 Apr 2011; Thomas Kahle <tomka@gentoo.org> cwm-20110213.ebuild:
x86 stable per bug 361293
diff --git a/x11-wm/cwm/cwm-20110323.ebuild b/x11-wm/cwm/cwm-20110323.ebuild
new file mode 100644
index 000000000000..16805355cc14
--- /dev/null
+++ b/x11-wm/cwm/cwm-20110323.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110323.ebuild,v 1.1 2011/05/03 18:06:38 xmw Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+ https://github.com/chneukirchen/cwm.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXft
+ x11-libs/libXinerama
+ x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ sys-devel/bison"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+ export LDADD="${LDFLAGS}"
+ tc-export CC
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
diff --git a/x11-wm/cwm/files/cwm-20110323-Makefile.patch b/x11-wm/cwm/files/cwm-20110323-Makefile.patch
new file mode 100644
index 000000000000..688f2fff1c3b
--- /dev/null
+++ b/x11-wm/cwm/files/cwm-20110323-Makefile.patch
@@ -0,0 +1,35 @@
+--- cwm-20110323/Makefile.orig
++++ cwm-20110323/Makefile
+@@ -15,16 +15,14 @@
+ kbfunc.o mousefunc.o font.o strlcpy.o strlcat.o y.tab.o \
+ strtonum.o fgetln.o
+
+-X11BASE= /usr
++CPPFLAGS+= $(shell pkg-config --cflags-only-I xft)
+
+-CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I.
+-
+-CFLAGS+= -Wall -O2 -g
++CFLAGS+=
+
+ LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 -lxcb -lXau -lXdmcp \
+ -lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
+
+-MANDIR= ${X11BASE}/man/cat
++MANDIR= /usr/share/man
+ MAN= cwm.1 cwmrc.5
+
+ CLEANFILES= cwm.cat1 cwmrc.cat5
+@@ -46,9 +44,9 @@
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
+
+ install: ${PROG}
+- install -m 755 cwm /usr/local/bin/
+- install -m 644 cwm.1 /usr/local/man/man1
+- install -m 644 cwmrc.5 /usr/local/man/man5
++ install -D -m 755 cwm $(DESTDIR)$(BINDIR)/cwm
++ install -D -m 644 cwm.1 $(DESTDIR)$(MANDIR)/man1/cwm.1
++ install -D -m 644 cwmrc.5 $(DESTDIR)$(MANDIR)/man5/cwmrc.5
+
+ #.include <bsd.prog.mk>
+ #.include <bsd.xorg.mk>