diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-01-29 01:49:55 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-01-29 01:49:55 +0000 |
| commit | 7232f304099a3690192ebeeff7bfaf50a2da1960 (patch) | |
| tree | 68fb1b6ea9689a41fedbb8a499e63cddf32ab243 /x11-wm/cwm/files | |
| parent | Remove old. (diff) | |
| download | gentoo-2-7232f304099a3690192ebeeff7bfaf50a2da1960.tar.gz gentoo-2-7232f304099a3690192ebeeff7bfaf50a2da1960.tar.bz2 gentoo-2-7232f304099a3690192ebeeff7bfaf50a2da1960.zip | |
Version bump to new tarball, remove old version, EAPI-4
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/cwm/files')
| -rw-r--r-- | x11-wm/cwm/files/cwm-20110213-Makefile.patch | 35 | ||||
| -rw-r--r-- | x11-wm/cwm/files/cwm-20111229-Makefile.patch | 11 |
2 files changed, 11 insertions, 35 deletions
diff --git a/x11-wm/cwm/files/cwm-20110213-Makefile.patch b/x11-wm/cwm/files/cwm-20110213-Makefile.patch deleted file mode 100644 index c47ecd4225e2..000000000000 --- a/x11-wm/cwm/files/cwm-20110213-Makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- cwm-20110213/Makefile.orig -+++ cwm-20110213/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+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I. -+CPPFLAGS+= $(shell pkg-config --cflags-only-I xft) - --CFLAGS+= -Wall -O2 -g -+CFLAGS+= - - LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 ${LIBXCB} -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 +45,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> diff --git a/x11-wm/cwm/files/cwm-20111229-Makefile.patch b/x11-wm/cwm/files/cwm-20111229-Makefile.patch new file mode 100644 index 000000000000..bb00c017112a --- /dev/null +++ b/x11-wm/cwm/files/cwm-20111229-Makefile.patch @@ -0,0 +1,11 @@ +--- cwm-20111229/Makefile ++++ cwm-20111229/Makefile +@@ -16,7 +16,7 @@ + + CPPFLAGS+= `pkg-config --cflags fontconfig x11 xft xinerama xrandr` + +-CFLAGS= -Wall -O2 -g ++CFLAGS?= -Wall -O2 -g + + LDFLAGS+= `pkg-config --libs fontconfig x11 xft xinerama xrandr` + |