From 2ee085704e429acdde1b2f63bf05b85f58a68ca6 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Thu, 30 Sep 2010 07:02:36 +0000
Subject: [PATCH] conquest: Fixed gid.

---
 conquest/.footprint | 14 +++++++-------
 conquest/Pkgfile    | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/conquest/.footprint b/conquest/.footprint
index 2a434a4..87bd6a7 100644
--- a/conquest/.footprint
+++ b/conquest/.footprint
@@ -1,18 +1,18 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/conqai
--rwxr-sr-x	root/root	usr/bin/conqdriv
+-rwxr-sr-x	root/users	usr/bin/conqdriv
 -rwxr-xr-x	root/root	usr/bin/conqinit
 -rwxr-xr-x	root/root	usr/bin/conqmetad
--rwxr-sr-x	root/root	usr/bin/conqoper
+-rwxr-sr-x	root/users	usr/bin/conqoper
 -rwxr-xr-x	root/root	usr/bin/conqstrat
 -rwxr-xr-x	root/root	usr/bin/conquest
--rwxr-sr-x	root/root	usr/bin/conquestd
+-rwxr-sr-x	root/users	usr/bin/conquestd
 drwxr-xr-x	root/root	usr/etc/
 -rw-r--r--	root/root	usr/etc/00_plantex.trc
--rw-rw-r--	root/root	usr/etc/conqinitrc
--rw-rw-r--	root/root	usr/etc/soundrc
--rw-rw-r--	root/root	usr/etc/texturesrc
+-rw-rw-r--	root/users	usr/etc/conqinitrc
+-rw-rw-r--	root/users	usr/etc/soundrc
+-rw-rw-r--	root/users	usr/etc/texturesrc
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libUi.a
 -rwxr-xr-x	root/root	usr/lib/libUi.la
@@ -179,4 +179,4 @@ drwxr-xr-x	root/root	usr/share/conquest/sound/
 -rw-r--r--	root/root	usr/share/conquest/sound/explosion.ogg
 -rw-r--r--	root/root	usr/share/conquest/sound/torpalert.ogg
 drwxr-xr-x	root/root	usr/var/
-drwxrwxr-x	root/root	usr/var/conquest/
+drwxrwxr-x	root/users	usr/var/conquest/
diff --git a/conquest/Pkgfile b/conquest/Pkgfile
index 72315b7..2fb3f5a 100644
--- a/conquest/Pkgfile
+++ b/conquest/Pkgfile
@@ -6,7 +6,7 @@
 
 name=conquest
 version=8.5
-release=1
+release=2
 source=(http://dl.sourceforge.net/conq/$name-$version.src.tar.gz)
 
 build() {
@@ -25,16 +25,16 @@ EOF
               --with-sdl-prefix=$CLFS/usr \
               --disable-gl \
               --mandir=/usr/man \
+              --with-conquest-group=users \
               --cache-file=config.cache 
 
-  find . -type f -name Makefile -exec \
-    sed -i {} \
-        -e "s|SDL_CFLAGS = .*|SDL_CFLAGS = $SDL_CFLAGS|" \
+  find . -type f -name Makefile \
+    -exec sed -e "s|SDL_CFLAGS = .*|SDL_CFLAGS = $SDL_CFLAGS|" \
         -e "s|SDL_CFLAGS = .*|SDL_CFLAGS = $SDL_CFLAGS|" \
         -e "s|-I/usr|-I$CLFS/usr|" \
-        -e "s|-L/usr|-L$CLFS/usr|" \;
+        -e "s|-L/usr|-L$CLFS/usr|" -i {} \;
 
   make
-  make DESTDIR=$PKG CONQDATADIR="/usr/share/$name" CONQGROUP=root libexecdir="/usr/bin/" install
+  make DESTDIR=$PKG CONQDATADIR="/usr/share/$name" libexecdir="/usr/bin/" install
   rm -r $PKG/usr/share/$name/doc/
 }
-- 
2.26.2