[Gsrc-commit] trunk r4337: scm at new location, doc bug fixed

[Carl Hansen]

------------------------------------------------------------
revno: 4337
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sat 2017-03-11 16:48:22 -0800
message:
  scm at new location, doc bug fixed
removed:
  pkg/gnu/scm/files/             files-20160617014725-uokjfnggs70iry9h-1697
  pkg/gnu/scm/files/scm-5f1-fix-install.diff 
scm5f1fixinstall.dif-20160617014725-uokjfnggs70iry9h-2228
  pkg/gnu/scm/files/scm-5f1-link-lm.diff 
scm5f1linklm.diff-20160617014725-uokjfnggs70iry9h-2229
  pkg/gnu/scm/files/scm-5f1-no-info.diff 
scm5f1noinfo.diff-20160617014725-uokjfnggs70iry9h-2230
modified:
  pkg/gnu/scm/Makefile           makefile-20160617014725-uokjfnggs70iry9h-1693
  pkg/gnu/scm/gpg-keyring        gpgkeyring-20160617014725-uokjfnggs70iry9h-1698
  pkg/gnu/scm/sha256sums         sha256sums-20160617014725-uokjfnggs70iry9h-1699

=== modified file 'pkg/gnu/scm/Makefile'
--- a/pkg/gnu/scm/Makefile      2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/scm/Makefile      2017-03-12 00:48:22 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013, 2014, 2015 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014, 2015, 2017 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -29,14 +29,16 @@
 
 ######################################################################
 
-MASTER_SITES = http://groups.csail.mit.edu/
-MASTER_SUBDIR = mac/ftpdir/$(GARNAME)/
-DISTFILES = $(DISTNAME).zip
-SIGFILES =
-PATCHFILES = # $(DISTNAME)-link-lm.diff $(DISTNAME)-no-info.diff \
-                        # $(DISTNAME)-fix-install.diff
+# old MASTER_SITES = http://groups.csail.mit.edu/
+# old MASTER_SUBDIR = mac/ftpdir/$(GARNAME)/
+
+MASTER_SITES = $(MASTER_GNU)
+MASTER_SUBDIR = $(GARNAME)/
+DISTFILES = $(DISTNAME).tar.gz
+SIGFILES = $(DISTNAME).tar.gz.sig
+
+
 INFO_FILES = $(GARNAME).info hobbit.info Xlibscm.info
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile info
 
 BUILDDEPS =
 LIBDEPS =  slib readline
@@ -46,14 +48,11 @@
 include ../../../gar/gar.lib/auto.mk
 include ../../../gar/gar.lib/info.mk
 include config.mk
-
+ 
 PATCHOPTS = -p2
 CONFIGURE_ARGS += --oldincludedir=$(prefix)/include
 BUILD_ARGS += SCHEME_LIBRARY_PATH=$(prefix)/lib/slib/
 
-post-extract:
-       mv $(WORKDIR)/$(GARNAME) $(WORKDIR)/$(DISTNAME)
-       $(MAKECOOKIE)
 
 post-configure:
 #      fix destdir mess
@@ -63,7 +62,7 @@
 pre-build:
 #      build scmlit
        sed -i '/$$(DESTDIR)$$(bindir)scm -br new-catalog/d' \
-               $(WORKSRC)/Makefile
+       $(WORKSRC)/Makefile
        cd $(WORKSRC) && $(BUILD_ENV) make scmlit $(BUILD_ARGS)
        $(MAKECOOKIE)
 
@@ -72,13 +71,9 @@
        cd $(WORKSRC) && $(BUILD_ENV) make all $(BUILD_ARGS)
        $(MAKECOOKIE)
 
-install-info:
-       @printf "[$(OK)install$(OFF)] $(MSG)Installing info files\n$(OFF)"
-       for f in $(addprefix $(WORKSRC)/,$(INFO_FILES)); do \
-               $(INSTALL_INFO) $$f; \
-       done
-       $(MAKECOOKIE)
 
 custom-post-install:
        $(prefix)/bin/scm -br new-catalog
        $(MAKECOOKIE)
+
+

=== removed directory 'pkg/gnu/scm/files'
=== removed file 'pkg/gnu/scm/files/scm-5f1-fix-install.diff'
--- a/pkg/gnu/scm/files/scm-5f1-fix-install.diff        2016-06-17 19:08:15 
+0000
+++ b/pkg/gnu/scm/files/scm-5f1-fix-install.diff        1970-01-01 00:00:00 
+0000
@@ -1,11 +0,0 @@
-diff -x config.log -x config.status -ru work/scm-5f1/Makefile 
work/scm-5f1/Makefile
---- work/scm-5f1/Makefile      2013-03-10 04:29:54.000000000 +0100
-+++ work/scm-5f1/Makefile      2013-08-17 15:05:52.325646581 +0200
-@@ -621,7 +621,6 @@
-       $(INSTALL_PROGRAM) scm scmlit $(DESTDIR)$(bindir)
-       -strip $(DESTDIR)$(bindir)scmlit
-       $(INSTALL_DATA) scm.h scmfig.h scmflags.h $(DESTDIR)$(includedir)
--      $(DESTDIR)$(bindir)scm -br new-catalog
- 
- uninstall:
-       $(PRE_UNINSTALL)     # Pre-uninstall commands follow.

=== removed file 'pkg/gnu/scm/files/scm-5f1-link-lm.diff'
--- a/pkg/gnu/scm/files/scm-5f1-link-lm.diff    2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/scm/files/scm-5f1-link-lm.diff    1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-diff -x config.log -x config.status -ru tmp/scm-5f1/Makefile 
work/scm-5f1/Makefile
---- tmp/scm-5f1/Makefile       2013-03-10 04:29:54.000000000 +0100
-+++ work/scm-5f1/Makefile      2013-08-17 14:15:52.507784399 +0200
-@@ -49,7 +49,7 @@
- 
- #CC = gcc
- #CFLAGS = -g
--#LIBS =
-+LIBS = -lm
- #LD = $(CC) -g
- LD = $(CC)
- 

=== removed file 'pkg/gnu/scm/files/scm-5f1-no-info.diff'
--- a/pkg/gnu/scm/files/scm-5f1-no-info.diff    2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/scm/files/scm-5f1-no-info.diff    1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Building the info documentation with makeinfo 5.x fails.  Lamentably, 
-skip building it.
-diff -x config.log -x config.status -ru work/scm-5f1/Makefile 
work/scm-5f1/Makefile
---- work/scm-5f1/Makefile      2013-03-10 04:29:54.000000000 +0100
-+++ work/scm-5f1/Makefile      2013-08-17 14:57:40.532669216 +0200
-@@ -617,7 +617,7 @@
-       if [ -f libscm.a ]; \
-               then $(INSTALL_DATA) libscm.a $(DESTDIR)$(libdir)libscm.a; fi
- 
--install: install-man install-lib install-infoz installdirs
-+install: install-man install-lib installdirs
-       $(INSTALL_PROGRAM) scm scmlit $(DESTDIR)$(bindir)
-       -strip $(DESTDIR)$(bindir)scmlit
-       $(INSTALL_DATA) scm.h scmfig.h scmflags.h $(DESTDIR)$(includedir)

=== modified file 'pkg/gnu/scm/gpg-keyring'
Binary files a/pkg/gnu/scm/gpg-keyring  2016-06-17 19:08:15 +0000 and 
b/pkg/gnu/scm/gpg-keyring 2017-03-12 00:48:22 +0000 differ
=== modified file 'pkg/gnu/scm/sha256sums'
--- a/pkg/gnu/scm/sha256sums    2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/scm/sha256sums    2017-03-12 00:48:22 +0000
@@ -1,1 +1,2 @@
-29f182bb5e675d4dcffac897b5e08c59739513fd09e5f1928c2c5419ca921114  
download/scm-5f2.zip
+4058412a20b45b11c1c0a8ed50135fa12424d49e3e3fdd9cb2ba4625f443027e  
download/scm-5f2.tar.gz
+4451af8186adc5454cd5ca643e466924def1e262090a6dd12c826ca618ad138f  
download/scm-5f2.tar.gz.sig