New commits:
commit dde8f6c2661cecd71de9c9b3941812eef34aef52
Author: Donald Johnson <minozake AT codemages.net>
Commit: Donald Johnson <minozake AT codemages.net>
editors/sc: Fixed to run correctly and confrom to the FHS.
commit 287080db5e4b2fc190141e428042a8c4059f0b24
Author: Donald Johnson <minozake AT codemages.net>
Commit: Donald Johnson <minozake AT codemages.net>
Revert "sc: Patched logic problems and worked around staged install
issues"
This reverts commit 39c25becab140b145f54cebd6ccafc3a3f1a684f.
Messed up spell. Redoing.
commit b2dc28c6d30fe6af12258b4eeabb199b7d6e24cb
Author: Donald Johnson <minozake AT codemages.net>
Commit: Donald Johnson <minozake AT codemages.net>
qemu: Fixed source download
diff --git a/editors/sc/BUILD b/editors/sc/BUILD
index 6c546e6..8f58e6d 100755
--- a/editors/sc/BUILD
+++ b/editors/sc/BUILD
@@ -1,3 +1 @@
-sedit 's/extern char/extern void/' xmalloc.c &&
-sedit '10i#include <stdlib.h>' help.c &&
make
diff --git a/editors/sc/HISTORY b/editors/sc/HISTORY
index fa0e06d..212f6c5 100644
--- a/editors/sc/HISTORY
+++ b/editors/sc/HISTORY
@@ -1,3 +1,13 @@
+2010-06-14 Donald Johnson <minozake AT codemages.net>
+ * INSTALL: Made directories beforehand to fix a staged install, since
the
+ Makefile doesn't check and make those automatically.
+ * PRE_BUILD: Patched source with patch based on Debian's patch. This
fixes
+ false syntax errors on all in-editor commands that rendered it
useless.
+ * BUILD: Moved sedit commands to PRE_BUILD.
+ sc_7.16-2.diff: Patch based on Debian's megapatch to fix lex.c's
syntax
+ error problem, and to patch the Makefile with the correct directories
for
+ the FHS.
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/editors/sc/INSTALL b/editors/sc/INSTALL
index 678a569..7b0aca9 100755
--- a/editors/sc/INSTALL
+++ b/editors/sc/INSTALL
@@ -1,5 +1,7 @@
-mkdir -p ${INSTALL_PREFIX}/usr/man/man1 \
- ${INSTALL_PREFIX}/usr/lib \
- ${INSTALL_PREFIX}/usr/bin &&
+# The Makefile fails if these directories do not exist beforehand.
+echo "INSTALL_ROOT: ${INSTALL_ROOT}"
+mkdir -p ${INSTALL_ROOT}/usr/share/man/man1 \
+ ${INSTALL_ROOT}/usr/lib \
+ ${INSTALL_ROOT}/usr/bin &&
# This is where the library file (tutorial) goes.
#LIBDIR=/usr/local/share/$(name) # reno
-LIBDIR=${prefix}/lib/$(name)
-+LIBDIR=${prefix}/share/doc/$(name)
++LIBDIR=${prefix}/share/$(name)
LIBRARY=-DLIBDIR=\"${LIBDIR}\"
# Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up
---- sc-7.16.orig/color.c
-+++ sc-7.16/color.c
-@@ -19,6 +19,7 @@
-
- #include <curses.h>
- #include <ctype.h>
-+#include <unistd.h>
- #include "sc.h"
-
- /* a linked list of free [struct ent]'s, uses .next as the pointer */
---- sc-7.16.orig/debian/sc.dirs
-+++ sc-7.16/debian/sc.dirs
-@@ -0,0 +1,3 @@
-+usr/bin
-+usr/share/doc/sc
-+usr/share/man/man1
---- sc-7.16.orig/debian/control
-+++ sc-7.16/debian/control
-@@ -0,0 +1,20 @@
-+Source: sc
-+Section: math
-+Priority: optional
-+Build-Depends: libncurses5-dev, bison, debhelper (>=4)
-+Maintainer: Adam Majer <adamm AT galacticasoftware.com>
-+Standards-Version: 3.6.1
-+
-+Package: sc
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Description: Text-based spreadsheet with VI-like keybindings
-+ "Spreadsheet Calculator" is a much modified version of the public-
-+ domain spread sheet sc, which was posted to Usenet several years ago
-+ by Mark Weiser as vc, originally by James Gosling. It is based on
-+ rectangular table much like a financial spreadsheet.
-+ .
-+ Its keybindings are familiar to users of 'vi', and it has most
-+ features that a pure spreadsheet would, but lacks things like
-+ graphing and saving in foreign formats. It's very stable and quite
-+ easy to use once you've put a little effort into learning it.
---- sc-7.16.orig/debian/compat
-+++ sc-7.16/debian/compat
-@@ -0,0 +1 @@
-+4
---- sc-7.16.orig/debian/changelog
-+++ sc-7.16/debian/changelog
-@@ -0,0 +1,117 @@
-+sc (7.16-2) unstable; urgency=low
-+
-+ * New maintainer (closes: #260000)
-+ * Fixed the code to remove most of the warnings during compile.
-+ * No longer tries to "redefine" malloc (closes: #259840)
-+ * debian/rules now uses debhelper
-+
-+ -- Adam Majer <adamm AT galacticasoftware.com> Mon, 19 Jul 2004 14:24:48
-0500
-+
-+sc (7.16-1) unstable; urgency=low
-+
-+ * New upstream version. (closes: Bug#131782, Bug#169590)
-+ * Doesn't use '#' as backup character. (closes: Bug#127612)
-+ * Help page index fixed. (closes: Bug#115456)
-+ * Tutorial file location corrected in man page. (closes: Bug#115454)
-+
-+ -- Chad Miller <cmiller AT debian.org> Tue, 19 Nov 2002 14:11:52 -0500
-+
-+sc (7.13-2) unstable; urgency=low
-+
-+ * Fixed spelling error in package description.
-+
-+ -- Chad Miller <cmiller AT debian.org> Tue, 18 Dec 2001 14:22:47 +0000
-+
-+sc (7.13-1) unstable; urgency=low
-+
-+ * New upstream version; many bugfixes. (closes: Bug#114473)
-+
-+ -- Chad Miller <cmiller AT debian.org> Thu, 4 Oct 2001 19:54:46 +0000
-+
-+sc (6.21-12) unstable; urgency=low
-+
-+ * Installed 'tutorial.sc' in doc directory. (closes: Bug:85546)
-+
-+ -- Chad Miller <cmiller AT debian.org> Sat, 17 Mar 2001 15:03:21 -0500
-+
-+sc (6.21-11) unstable; urgency=low
-+
-+ * Maintainer change. (closes: Bug#68149)
-+ * Put manpages under /usr/share/man, as recent policy says.
-+ * Added to CFLAGS, to prevent ``still changing'' bug on some
architectures.
-+ (closes: Bug#50986)
-+
-+ -- Chad Miller <cmiller AT debian.org> Mon, 8 Jan 2001 15:20:02 -0500
-+
-+sc (6.21-10) unstable; urgency=low
-+
-+ * Added support for cursor keys, thanks to D. J. Raymond
-+ <raymond AT kestrel.nmt.edu>
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Sun, 2 Jan 2000
17:35:34 +0100
-+
-+sc (6.21-9) unstable; urgency=low, closes=48133
-+
-+ * Corrected manpage creation (closes: Bug#48133)
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Fri, 29 Oct 1999
00:32:30 +0200
-+
-+sc (6.21-8) frozen unstable; urgency=low, closes=29540
-+
-+ * Removed external declaration for strcpy() and strcat() from format.c
-+ and included <string.h> instead. (closes: Bug#29540)
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Tue, 17 Nov 1998
11:19:50 +0100
-+
-+sc (6.21-7) unstable; urgency=low
-+
-+ * Re-compiled against ncurses4
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Fri, 30 Oct 1998
11:14:48 +0100
-+
-+sc (6.21-6) unstable; urgency=low
-+
-+ * Applied y2k patch from L J Bayuk <lbayuk AT mindspring.com>. Thanks to
-+ Ray for forwarding.
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Fri, 23 Oct 1998
19:21:05 +0200
-+
-+sc (6.21-5) unstable; urgency=low, closes=25513 23241
-+
-+ * Undebhelpering it
-+ * Recompiled against ncurses3.4 to make it work with that lib (closes:
-+ Bug#25513, Bug#23241)
-+ * This works together with the current ncurses package
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Sun, 6 Sep 1998
22:22:47 +0000
-+
-+sc (6.21-4) unstable; urgency=high, closes=22616
-+
-+ * Recompiled against ncurses3.4 to make it work with that lib (closes:
-+ Bug#22616)
-+ * Added Conflicts: ncurses3.4 (<<1.9.9g-8.2)
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Tue, 19 May 1998
10:30:44 +0200
-+
-+sc (6.21-3) frozen unstable; urgency=low, closes=20915
-+
-+ * Corrected sc.1 manpage (closes: Bug#20915)
-+ * Removed dh_du
-+ * Added scqref.1 undocumented manpage link
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Sat, 11 Apr 1998
04:45:23 +0200
-+
-+sc (6.21-2) unstable; urgency=low, closes=20079
-+
-+ * Removed dependency to regex (closes: Bug#20079)
-+ * Little code clean ups in pvmtbl.c
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Mon, 23 Mar 1998
01:56:31 +0100
-+
-+sc (6.21-1) unstable; urgency=low
-+
-+ * First release
-+ * Removed references to initkbd(), resetkbd() and kbd_again()
-+ * Changed nmgetch() to getch()
-+
-+ -- Martin Schulze <joey AT finlandia.infodrom.north.de> Thu, 12 Mar 1998
02:58:48 +0100
---- sc-7.16.orig/debian/copyright
-+++ sc-7.16/debian/copyright
-@@ -0,0 +1,15 @@
-+This is the Debian GNU/Linux prepackaged version of the public domain
-+spread sheet sc, posted several years ago by Mark Weiser as vc,
-+originally by James Gosling.
-+
-+This package was originally put together by
-+Martin Schulze <joey AT infodrom.north.de>, and later adopted by
-+Chad Miller <cmiller AT debian.org>. Source was obtained from:
-+ http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/sc-7.13.tar.gz
-+
-+Sc is not a product of ProsLink, Inc. It is supplied as is with no
-+warranty, express or implied, as a service to Usenet readers. It is
-+not copyrighted, either. Have at it.
-+
-+Some of the files were originally written by Robert Bond, James
-+Gosling, Bradley Williams or Mark Nagel.
---- sc-7.16.orig/debian/rules
-+++ sc-7.16/debian/rules
-@@ -0,0 +1,95 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+ CFLAGS += -O0
-+else
-+ CFLAGS += -O2
-+endif
-+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-+ INSTALL_PROGRAM += -s
-+endif
-+
-+configure: configure-stamp
-+configure-stamp:
-+ dh_testdir
-+ # Add here commands to configure the package.
-+ touch configure-stamp
-+
-+
-+build: build-stamp
-+
-+build-stamp: configure-stamp
-+ dh_testdir
-+
-+ # Add here commands to compile the package.
-+ $(MAKE) all sc.1 psc.1 CC=gcc CFLAGS="-O2 -Wall -DSYSV3 -ffloat-store"
-+ #/usr/bin/docbook-to-man debian/sc.sgml > sc.1
-+
-+ touch build-stamp
-+
-+clean:
-+ dh_testdir
-+ dh_testroot
-+ rm -f build-stamp configure-stamp
-+
-+ # Add here commands to clean up after the build process.
-+ -test -f Makefile && $(MAKE) clean
-+ rm -f sc psc scqref
-+ find . -name '*~' -exec rm {} \;
-+ rm -rf stamp-build *~
-+
-+ dh_clean
-+
-+install: build
-+ dh_testdir
-+ dh_testroot
-+ dh_clean -k
-+ dh_installdirs
-+
-+ # Add here commands to install the package into debian/sc.
-+ # $(MAKE) install DESTDIR=$(CURDIR)/debian/sc
-+
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+ dh_testdir
-+ dh_testroot
-+ dh_installchangelogs CHANGES
-+ dh_installdocs
-+# dh_installexamples
-+ dh_install
-+# dh_installmenu
-+# dh_installdebconf
-+# dh_installlogrotate
-+# dh_installemacsen
-+# dh_installpam
-+# dh_installmime
-+# dh_installinit
-+# dh_installcron
-+# dh_installinfo
-+ dh_installman
-+# dh_link
-+ dh_strip
-+ dh_compress
-+ dh_fixperms
-+# dh_perl
-+# dh_python
-+# dh_makeshlibs
-+ dh_installdeb
-+ dh_shlibdeps
-+ dh_gencontrol
-+ dh_md5sums
-+ dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install configure
---- sc-7.16.orig/debian/sc.docs
-+++ sc-7.16/debian/sc.docs
-@@ -0,0 +1,2 @@
-+README
-+tutorial.sc
---- sc-7.16.orig/debian/sc.install
-+++ sc-7.16/debian/sc.install
-@@ -0,0 +1,3 @@
-+sc usr/bin
-+psc usr/bin
-+scqref usr/bin
---- sc-7.16.orig/debian/sc.manpages
-+++ sc-7.16/debian/sc.manpages
-@@ -0,0 +1,2 @@
-+psc.1
-+sc.1
---- sc-7.16.orig/frame.c
-+++ sc-7.16/frame.c
-@@ -18,6 +18,9 @@
-
- #include <stdio.h>
- #include <ctype.h>
-+#include <stdlib.h>
-+#include <curses.h>
-+#include <unistd.h>
- #include "sc.h"
-
- static struct frange *frame_base;
---- sc-7.16.orig/sc.c
-+++ sc-7.16/sc.c
-@@ -212,7 +212,7 @@
-
- if (dbidx < 0)
- return;
-- if (p = delbuf[dbidx]) {
-+ if ((p = delbuf[dbidx])) {
- scxfree(delbuffmt[dbidx]);
- delbuffmt[dbidx] = NULL;
- }
-@@ -845,7 +845,7 @@
- break;
- case 'C':
- color = !color;
-- if (has_colors())
-+ if (has_colors()){
- if (color) {
- attron(COLOR_PAIR(1));
- bkgd(COLOR_PAIR(1) | ' ');
-@@ -853,6 +853,7 @@
- attron(COLOR_PAIR(0));
- bkgd(COLOR_PAIR(0) | ' ');
- }
-+ }
- error("Color %sabled.", color ? "en" : "dis");
- break;
- case 'N':
---- sc-7.16.orig/sort.c
-+++ sc-7.16/sort.c
-@@ -19,6 +19,8 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <stdlib.h>
-+#include <unistd.h>
-+#include <curses.h>
- #include "sc.h"
-
- int compare(const void *row1, const void *row2);
---- sc-7.16.orig/xmalloc.c
-+++ sc-7.16/xmalloc.c
-@@ -4,11 +4,12 @@
- */
-
- #include <curses.h>
-+#include <stdlib.h>
- #include "sc.h"
-
--extern char *malloc();
-+/* extern char *malloc();
- extern char *realloc();
--extern void free();
-+extern void free(); */
- void fatal();
-
- #ifdef SYSV3
---- sc-7.16.orig/screen.c
-+++ sc-7.16/screen.c
-@@ -234,11 +234,12 @@
- i = stcol;
- lcols = 0;
- col = rescol + frcols;
-- if (fr && stcol >= fr->or_left->col)
-+ if (fr && stcol >= fr->or_left->col){
- if (stcol < fr->ir_left->col)
- i = fr->or_left->col;
- else
- col += flcols;
-+ }
- for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol)
&&
- i < maxcols; i++) {
- lcols++;
-@@ -328,11 +329,12 @@
- i = stcol;
- lcols = 0;
- col = rescol + frcols;
-- if (fr && stcol >= fr->or_left->col)
-+ if (fr && stcol >= fr->or_left->col){
- if (stcol < fr->ir_left->col)
- i = fr->or_left->col;
- else
- col += flcols;
-+ }
- for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol)
&&
- i < maxcols; i++) {
- lcols++;
-@@ -377,11 +379,12 @@
- i = strow;
- rows = 0;
- row = RESROW + fbrows;
-- if (fr && strow >= fr->or_left->row)
-+ if (fr && strow >= fr->or_left->row){
- if (strow < fr->ir_left->row)
- i = fr->or_left->row;
- else
- row += ftrows;
-+ }
- for (; (row < lines || row_hidden[i] || i < currow) && i <
maxrows;
- i++) {
- rows++;
-@@ -460,11 +463,12 @@
- i = strow;
- rows = 0;
- row = RESROW + fbrows;
-- if (fr && strow >= fr->or_left->row)
-+ if (fr && strow >= fr->or_left->row){
- if (strow < fr->ir_left->row)
- i = fr->or_left->row;
- else
- row += ftrows;
-+ }
- for (; (row < lines || row_hidden[i] || i < currow) && i <
maxrows;
- i++) {
- rows++;
---- sc-7.16.orig/lex.c
-+++ sc-7.16/lex.c
+--- lex.c.orig
++++ lex.c
@@ -34,6 +34,8 @@
#include <signal.h>
#include <setjmp.h>
@@ -708,75 +54,3 @@
fclose(fp);
return 1;
}
---- sc-7.16.orig/interp.c
-+++ sc-7.16/interp.c
-@@ -1572,12 +1572,12 @@
- copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2)
- {
- struct ent *p;
-- struct ent *n;
-+/* struct ent *n;*/
- static int minsr = -1, minsc = -1;
- static int maxsr = -1, maxsc = -1;
- int mindr, mindc;
- int maxdr, maxdc;
-- int vr, vc;
-+/* int vr, vc;*/
- int r, c;
- int deltar, deltac;
-
-@@ -2066,7 +2066,7 @@
- *line = '\0';
- }
- }
-- if (!col_hidden[c])
-+ if (!col_hidden[c]){
- if (gs.g_type == G_STR) {
- if (p && p->label
- #if defined(REGCOMP)
-@@ -2099,6 +2099,7 @@
- #endif
- #endif
- break;
-+ }
- if (r == endr && c == endc) {
- error("String not found");
- #if defined(REGCOMP)
-@@ -2471,13 +2472,11 @@
- int
- constant(register struct enode *e)
- {
-- return (
-- e == NULL
-+ return e == NULL
- || e->op == O_CONST
- || e->op == O_SCONST
-- || e->op == 'm' && constant(e->e.o.left)
-- || (
-- e->op != O_VAR
-+ || (e->op == 'm' && constant(e->e.o.left))
-+ || (e->op != O_VAR
- && !(e->op & REDUCE)
- && constant(e->e.o.left)
- && constant(e->e.o.right)
-@@ -2491,9 +2490,7 @@
- && e->op != LASTCOL
- && e->op != NUMITER
- && e->op != FILENAME
-- && optimize
-- )
-- );
-+ && optimize );
- }
-
- void
---- sc-7.16.orig/help.c
-+++ sc-7.16/help.c
-@@ -11,6 +11,7 @@
- char *revision = "$Revision: 7.16 $";
- #else
- #include <curses.h>
-+#include <unistd.h>
- #include "sc.h"
- #endif /* QREF */
-
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 5a17c35..fde8101 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -17,7 +17,7 @@ case ${QEMU_VER:0:4} in
esac
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://mirror.its.uidaho.edu/pub/savannah/$SPELL/$SOURCE
if [[ $QEMU_VER == "0.10" ]]; then
SOURCE2=$SOURCE.sig
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index ec5b82c..85f98e7 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,7 @@
+2010-06-13 Donald Johnson <minozake AT codemages.net>
+ * DETAILS: Changed to mirror of qemu's sources, since all downloads
seem to
+ have moved.
+
2010-06-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated 0.12 branch to 0.12.4; killed dead source url
[SM-Commit] GIT changes to master grimoire by Donald Johnson (2dc06c209621f939de18743ca930b30efadffb7f),
Donald Johnson, 06/14/2010