[Gsrc-commit] trunk r4336: jacal, new download location, bug fix, version 1c4

[Carl Hansen]

------------------------------------------------------------
revno: 4336
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sat 2017-03-11 15:49:00 -0800
message:
  jacal, new download location, bug fix, version 1c4
removed:
  pkg/gnu/jacal/files/           files-20160617014725-uokjfnggs70iry9h-1102
  pkg/gnu/jacal/files/jacal-1c4-no-info.diff 
jacal1c4noinfo.diff-20160617014725-uokjfnggs70iry9h-2177
modified:
  pkg/gnu/jacal/Makefile         makefile-20160617014725-uokjfnggs70iry9h-1098
  pkg/gnu/jacal/gpg-keyring      gpgkeyring-20160617014725-uokjfnggs70iry9h-1103
  pkg/gnu/jacal/sha256sums       sha256sums-20160617014725-uokjfnggs70iry9h-1104

=== modified file 'pkg/gnu/jacal/Makefile'
--- a/pkg/gnu/jacal/Makefile    2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/jacal/Makefile    2017-03-11 23:49:00 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013, 2015 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2015, 2017 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -28,40 +28,41 @@
 
 ######################################################################
 
-MASTER_SITES = http://groups.csail.mit.edu/
-MASTER_SUBDIR = mac/ftpdir/scm/
-DISTFILES = $(DISTNAME).zip
-SIGFILES =
-# info files don't build correctly currently
-PATCHFILES = $(DISTNAME)-no-info.diff
-CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+# old MASTER_SITES = http://groups.csail.mit.edu/
+# old MASTER_SUBDIR = mac/ftpdir/scm/
+# old DISTFILES = $(DISTNAME).zip
+
+MASTER_SITES = $(MASTER_GNU)
+MASTER_SUBDIR = $(GARNAME)/
+DISTFILES = $(DISTNAME).tar.gz
+SIGFILES = $(DISTNAME).tar.gz.sig
+
 
 BUILDDEPS = scm
 LIBDEPS = slib
 
 ######################################################################
 
-# include ../../../gar/gar.lib/info.mk
-include ../../../gar/gar.mk
+include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/info.mk
 include config.mk
 
-post-extract:
-       mv $(WORKDIR)/$(GARNAME) $(WORKDIR)/$(DISTNAME)
-       $(MAKECOOKIE)
-
-post-configure:
-       sed -i -e 's|\(\$${prefix}\)|\1/|' $(WORKSRC)/config.status
-       sed -i -e 's|\(\$${exec_prefix}\)|\1/|' $(WORKSRC)/config.status
-       $(MAKECOOKIE)
-
-pre-build:
-       sed -i -e 's|ginstall-info|install-info|g' $(WORKSRC)/Makefile
-       sed -i -e 's|\(\$$(DESTDIR)\)|\1/|g' $(WORKSRC)/Makefile
-       $(MAKECOOKIE)
-
-pre-install:
-       sed -i -e 's|$$(jacallibdir)|$(prefix)/lib/jacal/|' $(WORKSRC)/Makefile
-       sed -i -e 's|JACALDIR=$$(DESTDIR)/|JACALDIR=|' $(WORKSRC)/Makefile
-       $(MAKECOOKIE)
+# for the old website, relics saved for sanity purposes
+#post-extract:
+#      mv $(WORKDIR)/$(GARNAME) $(WORKDIR)/$(DISTNAME)
+#      $(MAKECOOKIE)
+#
+#post-configure:
+#      sed -i -e 's|\(\$${prefix}\)|\1/|' $(WORKSRC)/config.status
+#      sed -i -e 's|\(\$${exec_prefix}\)|\1/|' $(WORKSRC)/config.status
+#      $(MAKECOOKIE)
+#
+#pre-build:
+#      sed -i -e 's|ginstall-info|install-info|g' $(WORKSRC)/Makefile
+#      sed -i -e 's|\(\$$(DESTDIR)\)|\1/|g' $(WORKSRC)/Makefile
+#      $(MAKECOOKIE)
+#
+#pre-install:
+#      sed -i -e 's|$$(jacallibdir)|$(prefix)/lib/jacal/|' $(WORKSRC)/Makefile
+#      sed -i -e 's|JACALDIR=$$(DESTDIR)/|JACALDIR=|' $(WORKSRC)/Makefile
+#      $(MAKECOOKIE)

=== removed directory 'pkg/gnu/jacal/files'
=== removed file 'pkg/gnu/jacal/files/jacal-1c4-no-info.diff'
--- a/pkg/gnu/jacal/files/jacal-1c4-no-info.diff        2016-06-17 19:08:15 
+0000
+++ b/pkg/gnu/jacal/files/jacal-1c4-no-info.diff        1970-01-01 00:00:00 
+0000
@@ -1,13 +0,0 @@
-The info documentation fails to build with makeinfo 5.x. Don't build it.
-diff -x config.log -x config.status -ru work/jacal-1c3/Makefile 
work/jacal-1c3/Makefile
---- work/jacal-1c3/Makefile    2013-05-15 04:45:37.000000000 +0200
-+++ work/jacal-1c3/Makefile    2013-08-17 15:15:59.696001802 +0200
-@@ -203,7 +203,7 @@
-       $(INSTALL_PROGRAM) jacal-script $(DESTDIR)$(bindir)jacal
-       rm jacal-script
- 
--install: install-script install-lib install-infoz install-man
-+install: install-script install-lib install-man
- 
- uninstall: unjacal48
-       $(PRE_UNINSTALL)     # Pre-uninstall commands follow.

=== modified file 'pkg/gnu/jacal/gpg-keyring'
Binary files a/pkg/gnu/jacal/gpg-keyring        2016-06-17 19:08:15 +0000 and 
b/pkg/gnu/jacal/gpg-keyring       2017-03-11 23:49:00 +0000 differ
=== modified file 'pkg/gnu/jacal/sha256sums'
--- a/pkg/gnu/jacal/sha256sums  2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/jacal/sha256sums  2017-03-11 23:49:00 +0000
@@ -1,2 +1,2 @@
-78a8710a7a6b577299a2c06e93a31f0f2e3addc033f3891bf0b5052582cdbf14  
download/jacal-1c4.zip
-7892a90032930ab5b8387ca3dd238bed7668676f4dca0837282f809d6d611e4a  
download/jacal-1c4-no-info.diff
+bfad219381f67767f04692df910e5202b32216015416bdfd75eca70c1916870a  
download/jacal-1c4.tar.gz
+9f3f62ae59c52743f92011cb3696bb833d6a75a1432842dcd89200898a506562  
download/jacal-1c4.tar.gz.sig