[Gsrc-commit] /srv/bzr/gsrc/trunk r1162: clean up maverik, but build fails

[Brandon Invergo]

------------------------------------------------------------
revno: 1162
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-14 23:10:39 +0100
message:
  clean up maverik, but build fails
added:
  gnu/maverik/config.mk
modified:
  TODO
  gnu/maverik/Makefile

=== modified file 'TODO'
--- a/TODO      2012-11-11 21:35:39 +0000
+++ b/TODO      2012-11-14 22:10:39 +0000
@@ -131,3 +131,4 @@
 ** greg: requires ancient libtool
 ** ignuit: gnome hell?
 ** libxmi: old libtool problems
+** maverik: very inflexible Makefile should be replaced

=== modified file 'gnu/maverik/Makefile'
--- a/gnu/maverik/Makefile      2010-06-11 09:29:17 +0000
+++ b/gnu/maverik/Makefile      2012-11-14 22:10:39 +0000
@@ -1,16 +1,31 @@
 GARNAME = maverik
 GARVERSION = 6.4
+HOME_URL = http://www.gnu.org/software/maverik/
+DESCRIPTION = A virtual reality micro kernel
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = maverik/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/maverik/
-DESCRIPTION = Maverik
-
-include ../../gar.lib/auto.mk
+CONFIGURE_SCRIPTS = $(WORKSRC)/setup
+BUILD_SCRIPTS = $(WORKSRC)/src/Makefile
+
+BUILDDEPS = 
+LIBDEPS = 
+
+######################################################################
+
+include ../../gar.mk
+include config.mk
+
+CONFIGURE_ENV += CFLAG=$(CFLAGS)
+
+configure-%/setup:
+       cd $* && $(CONFIGURE_ENV) ./setup $(CONFIGURE_OPTS) 
+       $(MAKECOOKIE)
+
+build-%/Makefile:
+       $(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS) 
+       $(MAKECOOKIE)

=== added file 'gnu/maverik/config.mk'
--- a/gnu/maverik/config.mk     1970-01-01 00:00:00 +0000
+++ b/gnu/maverik/config.mk     2012-11-14 22:10:39 +0000
@@ -0,0 +1,4 @@
+## Configuration options for maverik ##
+
+CONFIGURE_OPTS ?= --GTK
+BUILD_OPTS ?=