[Gsrc-commit] /srv/bzr/gsrc/trunk r917: add scm at 5e7

[Brandon Invergo]

------------------------------------------------------------
revno: 917
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-01 21:58:53 +0200
message:
  add scm at 5e7
added:
  gnu/scm/
  gnu/scm/Makefile
  gnu/scm/files/
  gnu/scm/files/fix-wildcard.diff
  gnu/scm/sha256sums
modified:
  TODO
  gnu/termcap/Makefile

=== modified file 'TODO'
--- a/TODO      2012-09-01 15:10:40 +0000
+++ b/TODO      2012-09-01 19:58:53 +0000
@@ -107,7 +107,6 @@
 ** R
 ** reftex
 ** rpge
-** scm
 ** smarteiffel
 ** snakecharmer
 ** social

=== added directory 'gnu/scm'
=== added file 'gnu/scm/Makefile'
--- a/gnu/scm/Makefile  1970-01-01 00:00:00 +0000
+++ b/gnu/scm/Makefile  2012-09-01 19:58:53 +0000
@@ -0,0 +1,64 @@
+GARNAME = scm
+GARVERSION = 5e7
+
+MASTER_SITES = $(MASTER_GNU)
+MASTER_SUBDIR = scm/
+
+DISTFILES = $(DISTNAME).tar.gz
+SIGFILES = $(DISTNAME).tar.gz.sig
+
+PATCHFILES = fix-wildcard.diff
+PATCHOPTS = -p2
+
+WORKSRC = $(EXTRACTDIR)/scm/
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile 
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
+# BUILDDEPS = 
+LIBDEPS = slib termcap readline
+
+HOME_URL =  http://people.csail.mit.edu/jaffer/SCM
+DESCRIPTION = The SCM Scheme implementation
+
+include ../../gar.mk
+
+CONFIGURE_ARGS = --oldincludedir=$(prefix)/include
+
+configure-$(WORKSRC)/configure:
+       cd $(WORKSRC) && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS)
+       $(MAKECOOKIE)
+
+post-configure:
+#      fix destdir mess
+       sed -i -e 's|\(\$${exec_prefix}\)|\1/|' $(WORKSRC)config.status
+       $(MAKECOOKIE)
+
+
+pre-build:
+#      change the install-info command
+       sed -i -e 's|ginstall-info|install-info|g' $(WORKSRC)Makefile
+#      pass CFLAGS and LDFLAGS to the build script
+       sed -i -e 's|\(BUILD = ./build -hsystem\)|\1 
--linker-options=$(LDFLAGS) --compiler-options=$(CFLAGS)|' $(WORKSRC)Makefile 
+#      don't make dscm5 support since it requires root and makes changes to 
/proc. comment this out 
+#      if you want
+       sed -i -e 's|\(\$$(MAKE) dscm5\)|#\1|' $(WORKSRC)Makefile
+#      more destdir fixing, should be redundant but it doesn't seem to be
+       sed -i -e 's|\(\$$(DESTDIR)\)|\1/|g' $(WORKSRC)Makefile
+#      define location of SLIB
+       echo '(define (library-vicinity) "$(prefix)/lib/slib/")' > 
$(WORKSRC)require.scm
+#      build scmlit
+       cd $(WORKSRC) && $(BUILD_ENV) make scmlit $(BUILD_ARGS)
+       $(MAKECOOKIE)
+
+build-$(WORKSRC)/Makefile:
+#      the build instructions aren't clear but this seems to work
+#      bootstrap basic scm build
+       cd $(WORKSRC) && $(BUILD_ENV) make scm libscm.a $(BUILD_ARGS)
+#      build the real deal
+       cd $(WORKSRC) && $(BUILD_ENV) ./build 
--compiler-options=-L$(prefix)/lib --linker-options=-L$(prefix)/lib
+#      make the rest
+       cd $(WORKSRC) && $(BUILD_ENV) make all $(BUILD_ARGS)
+       $(MAKECOOKIE)
+

=== added directory 'gnu/scm/files'
=== added file 'gnu/scm/files/fix-wildcard.diff'
--- a/gnu/scm/files/fix-wildcard.diff   1970-01-01 00:00:00 +0000
+++ b/gnu/scm/files/fix-wildcard.diff   2012-09-01 19:58:53 +0000
@@ -0,0 +1,21 @@
+diff -x config.log -x config.status -ru tmp/scm/Makefile work/scm/Makefile
+--- work/scm/Makefile  2010-07-01 20:52:09.000000000 +0000
++++ work/scm/Makefile  2012-09-01 15:32:42.425018374 +0000
+@@ -114,7 +114,7 @@
+       $(turfiles) version.txi # $(wbfiles)
+ 
+ lsdfiles = $(ifiles) $(hobfiles) COPYING COPYING.LESSER r4rstest.scm  \
+-      build build.scm mkimpcat.scm patchlvl.h $(xafiles) *.so
++      build build.scm mkimpcat.scm patchlvl.h $(xafiles) $(wildcard *.so)
+ #*.sl
+ 
+ ctagfiles = $(hfiles) $(cfiles) $(xfiles)
+@@ -439,7 +439,7 @@
+       $(BUILD) -t dll -f dlls.opt -c unix.c
+       $(BUILD) -t dll -f dlls.opt -F curses
+       $(BUILD) -t dll -f dlls.opt -c rgx.c
+-      if [ -f /usr/lib/libreadline.so ]; \
++      if [ -f $(libdir)libreadline.so ]; \
+         then $(BUILD) -t dll -f dlls.opt -F edit-line; fi
+ 
+ rwb-isam.scm wbtab.scm: ../wb/rwb-isam.scm ../wb/wbtab.scm

=== added file 'gnu/scm/sha256sums'
--- a/gnu/scm/sha256sums        1970-01-01 00:00:00 +0000
+++ b/gnu/scm/sha256sums        2012-09-01 19:58:53 +0000
@@ -0,0 +1,3 @@
+12446ac8709de8205c1fd341b2e431b7a616a8c470e62517d15ee649a43cf3a9  
download/scm-5e7.tar.gz
+7aaf06b9eb9f9f7748a20038a05514603468d1602e1838f31862c5d173b936c8  
download/fix-wildcard.diff
+3356b5f0272fe055b08edf12a06fa9cda6f7461b6723448c547c4853a22e4596  
download/scm-5e7.tar.gz.sig

=== modified file 'gnu/termcap/Makefile'
--- a/gnu/termcap/Makefile      2010-06-15 12:48:11 +0000
+++ b/gnu/termcap/Makefile      2012-09-01 19:58:53 +0000
@@ -14,3 +14,6 @@
 # DESCRIPTION = 
 
 include ../../gar.lib/auto.mk
+
+CONFIGURE_OPTS = --disable-install-termcap
+INSTALL_ARGS += oldincludedir=""