From f1d269b3761c5f1071a28eda23f33c4a273332fc Mon Sep 17 00:00:00 2001 From: rillig Date: Wed, 14 Nov 2007 20:52:49 +0000 Subject: Removed the gcc4-specific compiler flags from CFLAGS. Patch by Adam Hoka via tech-pkg. PKGREVISION++ Fixed MESSAGE, since there is no "install-user" target. It had been there in the original version of the package. I didn't find it likely that end-users would use pkgsrc for installing a single configuration file, so I removed that. --- wm/awesome/MESSAGE | 6 ++---- wm/awesome/Makefile | 9 +++++---- wm/awesome/distinfo | 4 ++-- wm/awesome/patches/patch-aa | 13 ++++++++----- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/wm/awesome/MESSAGE b/wm/awesome/MESSAGE index b7c89282495..66d7d9ca822 100644 --- a/wm/awesome/MESSAGE +++ b/wm/awesome/MESSAGE @@ -1,10 +1,8 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2007/11/03 17:27:55 rillig Exp $ +$NetBSD: MESSAGE,v 1.2 2007/11/14 20:52:49 rillig Exp $ -To use awsome, you need an ~/.awesomerc file. You can use the example: +To use awesome, you need an ~/.awesomerc file. You can use the example: ${EGDIR} -You can use the install-user target to install it for the current user. - =========================================================================== diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile index 3b8d7fd9713..6f7f7772203 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2007/11/07 21:52:34 jnemeth Exp $ +# $NetBSD: Makefile,v 1.3 2007/11/14 20:52:50 rillig Exp $ # DISTNAME= awesome-1.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -10,9 +10,10 @@ MAINTAINER= adam.hoka@gmail.com HOMEPAGE= http://awesome.naquadah.org/ COMMENT= Tiling window manager based on dwm -EGDIR= ${PREFIX}/share/examples/awesome/ -MESSAGE_SUBST+= EGDIR=${EGDIR:Q}awesomerc +EGDIR= ${PREFIX}/share/examples/awesome +MESSAGE_SUBST+= EGDIR=${EGDIR}/awesomerc +USE_LANGUAGES= c99 USE_TOOLS+= pkg-config post-install: diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo index 9b49d981b2f..c9e918d6c6d 100644 --- a/wm/awesome/distinfo +++ b/wm/awesome/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/11/03 17:27:55 rillig Exp $ +$NetBSD: distinfo,v 1.2 2007/11/14 20:52:50 rillig Exp $ 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 diff --git a/wm/awesome/patches/patch-aa b/wm/awesome/patches/patch-aa index 14a2488fb44..599cd27280f 100644 --- a/wm/awesome/patches/patch-aa +++ b/wm/awesome/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/11/03 17:27:55 rillig Exp $ +$NetBSD: patch-aa,v 1.2 2007/11/14 20:52:50 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 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/11/03 17:27:55 rillig Exp $ # 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 -- cgit v1.2.3