[Gsrc-commit] /srv/bzr/gsrc/trunk r999: clean up ferret and make the build script actually do something

[Brandon Invergo]

------------------------------------------------------------
revno: 999
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 16:06:36 +0100
message:
  clean up ferret and make the build script actually do something
added:
  deps/tcl/
  deps/tcl/Makefile
  deps/tcl/sha256sums
  deps/tk/
  deps/tk/Makefile
  deps/tk/sha256sums
  gnu/ferret/config.mk
modified:
  gnu/ferret/Makefile

=== added directory 'deps/tcl'
=== added file 'deps/tcl/Makefile'
--- a/deps/tcl/Makefile 1970-01-01 00:00:00 +0000
+++ b/deps/tcl/Makefile 2012-10-28 15:06:36 +0000
@@ -0,0 +1,20 @@
+GARNAME = tcl
+GARVERSION = 8.5.12
+HOME_URL = http://tcl.tk
+DESCRIPTION = The Tcl scripting language
+
+######################################################################
+
+MASTER_SITES = http://prdownloads.sourceforge.net/
+MASTER_SUBDIR = $(GARNAME)/
+DISTFILES = $(GARNAME)$(GARVERSION)-src.tar.gz
+SIGFILES = 
+WORKSRC = $(WORKDIR)/$(GARNAME)$(GARVERSION)/unix
+
+BUILDDEPS =
+LIBDEPS =
+
+######################################################################
+
+include ../../gar.lib/auto.mk
+include config.mk

=== added file 'deps/tcl/sha256sums'
--- a/deps/tcl/sha256sums       1970-01-01 00:00:00 +0000
+++ b/deps/tcl/sha256sums       2012-10-28 15:06:36 +0000
@@ -0,0 +1,1 @@
+20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2  
download/tcl8.5.12-src.tar.gz

=== added directory 'deps/tk'
=== added file 'deps/tk/Makefile'
--- a/deps/tk/Makefile  1970-01-01 00:00:00 +0000
+++ b/deps/tk/Makefile  2012-10-28 15:06:36 +0000
@@ -0,0 +1,27 @@
+GARNAME = tk
+MAJORVERSION = 8.5
+GARVERSION = $(MAJORVERSION).12
+HOME_URL = http://tcl.tk
+DESCRIPTION = The Tk GUI toolkit
+
+######################################################################
+
+MASTER_SITES = http://prdownloads.sourceforge.net/
+MASTER_SUBDIR = tcl/
+DISTFILES = $(GARNAME)$(GARVERSION)-src.tar.gz
+SIGFILES = 
+WORKSRC = $(WORKDIR)/$(GARNAME)$(GARVERSION)/unix
+
+BUILDDEPS =
+LIBDEPS = tcl
+
+######################################################################
+
+include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_OPTS += --with-tcl=$(prefix)/lib
+
+post-install:
+       ln -s $(prefix)/bin/wish$(MAJORVERSION) $(prefix)/bin/wish
+       $(MAKECOOKIE)

=== added file 'deps/tk/sha256sums'
--- a/deps/tk/sha256sums        1970-01-01 00:00:00 +0000
+++ b/deps/tk/sha256sums        2012-10-28 15:06:36 +0000
@@ -0,0 +1,1 @@
+c453d820925bf526bbe8a0d1c17ab3168b076fcb9844bea797ad75e3b9ad9291  
download/tk8.5.12-src.tar.gz

=== modified file 'gnu/ferret/Makefile'
--- a/gnu/ferret/Makefile       2010-06-10 20:16:29 +0000
+++ b/gnu/ferret/Makefile       2012-10-28 15:06:36 +0000
@@ -1,16 +1,72 @@
 GARNAME = ferret
 GARVERSION = 0.7
+HOME_URL = http://www.gnu.org/software/ferret/
+DESCRIPTION = A graphical data modeler
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = ferret/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/ferret/
-DESCRIPTION = GNU Ferret
-
-include ../../gar.lib/auto.mk
+INSTALL_SCRIPTS = libs dtd widgets binary
+
+BUILDDEPS = 
+LIBDEPS = tcl tk
+
+######################################################################
+
+include ../../gar.mk
+include config.mk
+
+pre-install:
+       exec sed -i -e 's|/usr/bin/wish|$(WISH)|' $(WORKSRC)/ferret
+       exec sed -i -e '1 a\cd $(prefix)/share/$(GARNAME)/' $(WORKSRC)/ferret
+       $(MAKECOOKIE)
+
+install-libs:
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/src
+       @install -m644 -t $(packageprefix)/share/$(GARNAME)/src 
$(WORKSRC)/src/*.tcl
+       $(MAKECOOKIE)
+
+install-dtd:
+       @install -m644 -D $(WORKSRC)/gerwinml/gerwinml.dtd \
+               $(packageprefix)/share/$(GARNAME)/gerwinml/gerwinml.dtd
+       $(MAKECOOKIE)
+
+install-widgets:
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/bwidget/
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/bwidget/BWman/
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/bwidget/images/
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/bwidget/lang/
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/bwidget/tests/
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/icons/
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/tablelist/
+       @mkdir -p $(packageprefix)/share/$(GARNAME)/widgets/tablelist/scripts/
+       @install -m644 -t $(packageprefix)/share/$(GARNAME)/widgets/bwidget/ \
+               $(WORKSRC)/widgets/bwidget/*.tcl
+       @install -m644 -t 
$(packageprefix)/share/$(GARNAME)/widgets/bwidget/BWman \
+               $(WORKSRC)/widgets/bwidget/BWman/*.html
+       @install -m644 -t 
$(packageprefix)/share/$(GARNAME)/widgets/bwidget/images \
+               $(WORKSRC)/widgets/bwidget/images/*.gif
+       @install -m644 -t 
$(packageprefix)/share/$(GARNAME)/widgets/bwidget/images \
+               $(WORKSRC)/widgets/bwidget/images/*.xbm
+       @install -m644 -t 
$(packageprefix)/share/$(GARNAME)/widgets/bwidget/lang \
+               $(WORKSRC)/widgets/bwidget/lang/*.rc
+       @install -m644 -t 
$(packageprefix)/share/$(GARNAME)/widgets/bwidget/tests \
+               $(WORKSRC)/widgets/bwidget/tests/entry.test
+       @install -m644 -t $(packageprefix)/share/$(GARNAME)/widgets/icons \
+               $(WORKSRC)/widgets/icons/*.tcl
+       @install -m644 -t $(packageprefix)/share/$(GARNAME)/widgets/icons \
+               $(WORKSRC)/widgets/icons/tkIcons*
+       @install -m644 -t $(packageprefix)/share/$(GARNAME)/widgets/tablelist \
+               $(WORKSRC)/widgets/tablelist/*.tcl
+       @install -m644 -t 
$(packageprefix)/share/$(GARNAME)/widgets/tablelist/scripts \
+               $(WORKSRC)/widgets/tablelist/scripts/*.tcl
+       @install -m644 -t 
$(packageprefix)/share/$(GARNAME)/widgets/tablelist/scripts \
+               $(WORKSRC)/widgets/tablelist/scripts/tclIndex
+       $(MAKECOOKIE)
+
+install-binary:
+       @install -m755 -D $(WORKSRC)/ferret $(packageprefix)/bin/ferret
+       $(MAKECOOKIE)

=== added file 'gnu/ferret/config.mk'
--- a/gnu/ferret/config.mk      1970-01-01 00:00:00 +0000
+++ b/gnu/ferret/config.mk      2012-10-28 15:06:36 +0000
@@ -0,0 +1,8 @@
+## Configuration options for ferret ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=
+
+# Which tcl/tk wish program to use to launch Ferret. The default is 
+# the one installed by GSRC
+WISH = $(prefix)/bin/wish