Subject: another wm/awesome patch
To: tech-pkg@NetBSD.org <tech-pkg@NetBSD.org>
From: Adam Hoka <adam.hoka@gmail.com>
List: tech-pkg
Date: 11/14/2007 20:12:50
Hello again!

I have an other patch for wm/awesome.
It enables it to compile with gcc3, since I have removed a lot of gcc4 specific warnings and also some debug options from the compile.

Could somone commit that for me, please?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/awesome/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	7 Nov 2007 21:52:34 -0000	1.2
+++ Makefile	14 Nov 2007 19:08:26 -0000
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=		awesome-1.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		wm
 MASTER_SITES=		http://awesome.naquadah.org/download/
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/awesome/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	3 Nov 2007 17:27:55 -0000	1.1.1.1
+++ distinfo	14 Nov 2007 19:08:26 -0000
@@ -3,4 +3,4 @@
 SHA1 (awesome-1.3.tar.gz) = c8656fda08652cec20217fb369e4a6c7cce0528d
 RMD160 (awesome-1.3.tar.gz) = b640b33a138d57009cdf755e32ea974f52f6d308
 Size (awesome-1.3.tar.gz) = 40012 bytes
-SHA1 (patch-aa) = 78ab8dfa062dea897a4cd2203f829964afc76060
+SHA1 (patch-ab) = 2de17279f911f0cc705e9cc47228d872cc067991
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- patches/patch-aa	3 Nov 2007 17:27:55 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/03 17:27:55 rillig Exp $
-
---- config.mk.orig	2007-10-05 17:07:18.000000000 +0200
-+++ config.mk
-@@ -7,18 +7,17 @@ VERSION = 1.3
- LAYOUTS = layouts/tile.c layouts/floating.c layouts/max.c
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+MANPREFIX = ${PREFIX}/${PKGMANDIR}
- 
--X11INC = /usr/include/X11
--X11LIB = /usr/lib/X11
-+X11INC = $(X11BASE)/include/X11
-+X11LIB = $(X11BASE)/lib/X11
- 
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags libconfig xft`
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs libconfig xft` -lXext -lXrandr -lXinerama
- 
- # flags
--CFLAGS = -fgnu89-inline -std=gnu99 -ggdb3 -pipe -Wall -Wextra -W -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare -Wunused -Wuninitialized -Winit-self -Wpointer-arith -Wredundant-decls -Wno-format-zero-length -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn -O3 ${INCS} -DVERSION=\"${VERSION}\"
-+CFLAGS += -std=gnu99 -ggdb3 -pipe -Wall -Wextra -W -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare -Wunused -Wuninitialized -Winit-self -Wpointer-arith -Wredundant-decls -Wno-format-zero-length -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn ${INCS} -DVERSION=\"${VERSION}\"
- LDFLAGS = -ggdb3 ${LIBS}
- 
- # compiler and linker
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab	14 Nov 2007 19:08:26 -0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/11/03 17:27:55 rillig Exp $
+
+--- config.mk.orig	2007-11-13 16:45:43.000000000 +0100
++++ config.mk
+@@ -7,19 +7,18 @@ VERSION = 1.3
+ LAYOUTS = layouts/tile.c layouts/floating.c layouts/max.c
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++MANPREFIX = ${PREFIX}/${PKGMANDIR}
+ 
+-X11INC = /usr/include/X11
+-X11LIB = /usr/lib/X11
++X11INC = $(X11BASE)/include/X11
++X11LIB = $(X11BASE)/lib/X11
+ 
+ # includes and libs
+ INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags libconfig xft`
+ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs libconfig xft` -lXext -lXrandr -lXinerama
+ 
+ # flags
+-CFLAGS = -fgnu89-inline -std=gnu99 -ggdb3 -pipe -Wall -Wextra -W -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare -Wunused -Wuninitialized -Winit-self -Wpointer-arith -Wredundant-decls -Wno-format-zero-length -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn -O3 ${INCS} -DVERSION=\"${VERSION}\"
+-LDFLAGS = -ggdb3 ${LIBS}
++CFLAGS += -std=gnu99 -Wall ${INCS} -DVERSION=\"${VERSION}\"
++LDFLAGS = ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++#CC = cc