Subject: Re: 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 21:10:58
Hello!

> Please don't use -std=gnu99 and add c99 to USE_LANGUAGES. Also please
> don't move patches around, the diff of the patch would be a lot easier
> to follow...

Thanks much for the hints, I have updated the diff.

-Adam

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:57:58 -0000
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=		awesome-1.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		wm
 MASTER_SITES=		http://awesome.naquadah.org/download/
 
@@ -13,6 +13,7 @@
 EGDIR=			${PREFIX}/share/examples/awesome/
 MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}awesomerc
 
+USE_LANGUAGES+=	c99
 USE_TOOLS+=		pkg-config
 
 post-install:
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:57:58 -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-aa) = dfe079ae2bf616e556f6a1dfb5f725160f676782
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/awesome/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa	3 Nov 2007 17:27:55 -0000	1.1.1.1
+++ patches/patch-aa	14 Nov 2007 19:57:58 -0000
@@ -1,8 +1,8 @@
 $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.orig	2007-11-13 16:45:43.000000000 +0100
 +++ config.mk
-@@ -7,18 +7,17 @@ VERSION = 1.3
+@@ -7,19 +7,18 @@ VERSION = 1.3
  LAYOUTS = layouts/tile.c layouts/floating.c layouts/max.c
  
  # paths
@@ -21,7 +21,10 @@
  
  # 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}
+-LDFLAGS = -ggdb3 ${LIBS}
++CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\"
++LDFLAGS = ${LIBS}
  
  # compiler and linker
+-CC = cc
++#CC = cc