pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
glkgit: re-add wip/glkgit and update to glkgit-1.3.5 using new upstream
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Mon May 28 07:11:48 2018 +0200
Changeset: 33c1a5d46664b4d4b9ab71cc4054cb1f72bf41fe
Modified Files:
Makefile
Added Files:
glkgit/DESCR
glkgit/Makefile
glkgit/PLIST
glkgit/TODO
glkgit/distinfo
glkgit/patches/patch-aa
Log Message:
glkgit: re-add wip/glkgit and update to glkgit-1.3.5 using new upstream
Changes since 1.1:
* Version History
1.3.5 2016-11-19 Fixed a bug when the streamnum opcode is called with the
smallest possible negative number.
1.3.4 2015-06-13 Performance improvements from Peter De Wachter, which give
approximately a 15% speed increase.
1.3.3 2014-03-15 Added acceleration functions 8 through 13, which work
correctly when the Inform 6 compiler setting NUM_ATTR_BYTES
is changed, contributed by Andrew Plotkin.
1.3.2 2013-03-26 A further fix to glkop.c, following the similar fix added to
Glulxe 0.5.1.
Increased the default undo buffer size in all ports to 2Mb.
1.3.1 2012-11-09 Further fixes to glkop.c, following similar fixes added to
Glulxe 0.5.0.
1.3.0 2011-12-16 Fixed a bug in glkop.c dispatching, to do with arrays
of opaque objects, following a similar fix in Glulxe.
Fixed a problem with the memory heap not being sorted
correctly on restore, contributed by Brady Garvin.
1.2.9 2011-08-28 Fixed a bug in glkop.c dispatching, to do with optional
array arguments, following a similar fix in Glulxe.
Glk array and string operations are now checked for memory
overflows (though not for ROM writing), following a similar
fix in Glulxe.
1.2.8 2010-08-25 Fixed a problem with 'undo' when compiled as 64 bit,
contributed by Ben Cressey.
Fixed a sign problem for the @fceil opcode, following a
similar fix in Glulxe.
1.2.7 2010-08-20 Floating point opcode support (VM spec 3.1.2).
Restart does not now discard undo information, so that a
restart can be undone.
1.2.6 2010-02-09 Imported fix for retained Glk array handling from Glulxe.
1.2.5 2009-11-21 Fixes for problems shown by Andrew Plotkin's glulxercise test
cases, from David Kinder.
1.2.4 2009-04-02 More David Kinder! Accelerated opcode support (VM spec 3.1.1).
1.2.3 2009-02-22 David Kinder and Eliuk Blau fixed some memory management bugs.
Added a regression test (thanks to Emily Short for assistance)
Switched to MIT-style license (see above).
1.2.2 2009-01-21 malloc & mfree contributed by the most excellent David Kinder.
1.2.1 2008-09-14 Support for 64-bit machines, contributed by Alexander Beels.
Fix for crashing bug in RESTORE, contributed by David Kinder.
Non-Unicode display bug fix, contributed by Jeremy Bernstein.
1.2 2008-01-06 Minor version increment for VM spec 3.1.
Implemented mzero and mcopy, but not malloc and mfree (yet).
1.1.3 2006-10-04 Fixed a bug in the cache logic that broke the game Floatpoint.
Added some other caching tweaks and put in a few more asserts.
1.1.2 2006-08-22 streamnum in filter I/O mode no longer prints a garbage char.
Merged in David Kinder's updated Windows startup code.
1.1.1 2006-08-17 Wow, over a year since the last update.
Rolled in Tor Andersson's fix for setmemsize.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=33c1a5d46664b4d4b9ab71cc4054cb1f72bf41fe
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
glkgit/DESCR | 4 ++++
glkgit/Makefile | 29 +++++++++++++++++++++++++++++
glkgit/PLIST | 2 ++
glkgit/TODO | 5 +++++
glkgit/distinfo | 7 +++++++
glkgit/patches/patch-aa | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 97 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 4d08b9c755..240c655b3b 100644
--- a/Makefile
+++ b/Makefile
@@ -939,6 +939,7 @@ SUBDIR+= glib-java
SUBDIR+= glibc
SUBDIR+= glide3
SUBDIR+= glimmerm
+SUBDIR+= glkgit
SUBDIR+= glkloader
SUBDIR+= glkterm
SUBDIR+= globulation2
diff --git a/glkgit/DESCR b/glkgit/DESCR
new file mode 100644
index 0000000000..e5acced001
--- /dev/null
+++ b/glkgit/DESCR
@@ -0,0 +1,4 @@
+Git is an interpreter for the Glulx virtual machine. Its main
+goal in life is to be fast. It's about five times faster than
+Glulxe, and about twice as fast as Frotz (using the same Inform
+source compiled for the Z-machine).
diff --git a/glkgit/Makefile b/glkgit/Makefile
new file mode 100644
index 0000000000..a8bb9596c4
--- /dev/null
+++ b/glkgit/Makefile
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.10 2012/12/12 10:44:37 thomasklausner Exp $
+#
+
+GITHUB_PROJECT= Git
+DISTNAME= ${GITHUB_TAG}
+PKGNAME= glkgit-1.3.5
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_GITHUB:=DavidKinder/}
+DIST_SUBDIR= ${GITHUB_PROJECT}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= ${MASTER_SITE_GITHUB:=DavidKinder/Git/}
+COMMENT= Interpreter for Glulx interactive fiction
+
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/glkg/G/}
+MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
+
+INSTALLATION_DIRS+= bin
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/git ${DESTDIR}${PREFIX}/bin/glkgit
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.glkgit
+.include "../../wip/glkloader/glk-options.mk"
+.include "../../mk/bsd.options.mk"
+.include "../../wip/glkloader/glk-depends.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/glkgit/PLIST b/glkgit/PLIST
new file mode 100644
index 0000000000..9ae34fcf48
--- /dev/null
+++ b/glkgit/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.2 2008/03/04 12:46:12 hoka_adam Exp $
+bin/glkgit
diff --git a/glkgit/TODO b/glkgit/TODO
new file mode 100644
index 0000000000..8d87c4ee31
--- /dev/null
+++ b/glkgit/TODO
@@ -0,0 +1,5 @@
+Should be imported as glkgit if ready.
+
+Doesn't work on 4.99.55:
+ Program terminated with signal 11, Segmentation fault.
+ #0 0xbbb61d97 in _malloc_prefork () from /usr/lib/libc.so.12
diff --git a/glkgit/distinfo b/glkgit/distinfo
new file mode 100644
index 0000000000..6cc62e6453
--- /dev/null
+++ b/glkgit/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.3 2005/03/07 15:24:22 dillo Exp $
+
+SHA1 (Git/v1.3.5.tar.gz) = 792f20b674a3e24cea279f1465b137aefd1db8ae
+RMD160 (Git/v1.3.5.tar.gz) = faead686350689f6751f584176215d73fe49ceef
+SHA512 (Git/v1.3.5.tar.gz) = c2f8ab8a7b9e550614c0da83ccd91020a442960802af1a8c6c2762db0ba548c2b797bdfd94af236a599f26a38e9e7f97f7f627ba0d0a1d484b154e1d094d151e
+Size (Git/v1.3.5.tar.gz) = 92364 bytes
+SHA1 (patch-aa) = ce4cd7b3bdb0f6c3fbb8c372434611cf6eb5a496
diff --git a/glkgit/patches/patch-aa b/glkgit/patches/patch-aa
new file mode 100644
index 0000000000..58d3e0186c
--- /dev/null
+++ b/glkgit/patches/patch-aa
@@ -0,0 +1,49 @@
+$NetBSD: patch-aa,v 1.3 2005/03/07 15:24:23 dillo Exp $
+
+--- Makefile.orig 2015-06-13 19:59:51.000000000 +0000
++++ Makefile
+@@ -9,16 +9,16 @@ GLK = cheapglk
+ #GLK = glkterm
+ #GLK = xglk
+
+-GLKINCLUDEDIR = ../$(GLK)
+-GLKLIBDIR = ../$(GLK)
+-GLKMAKEFILE = Make.$(GLK)
++GLKINCLUDEDIR = $(PREFIX)/include/glk
++GLKLIBDIR = $(PREFIX)/lib
++GLKMAKEFILE = Make.glk
+
+ # -----------------------------------------------------------------
+ # Step 2: pick a C compiler.
+
+ # Generic C compiler
+-CC = cc -O2
+-OPTIONS =
++#CC = cc -O2
++OPTIONS = -rdynamic
+
+ # Best settings for GCC 2.95. This generates faster code than
+ # GCC 3, so you should use this setup if possible.
+@@ -46,11 +46,11 @@ MAJOR = 1
+ MINOR = 3
+ PATCH = 4
+
+-include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
++include $(BUILDLINK_DIR)/include/glk/$(GLKMAKEFILE)
+
+ CFLAGS = $(OPTIONS) -I$(GLKINCLUDEDIR)
+
+-LIBS = -L$(GLKLIBDIR) $(GLKLIB) $(LINKLIBS)
++LIBS = -L$(GLKLIBDIR) $(GLKLIB) $(LINKLIBS) -lm
+
+ HEADERS = version.h git.h config.h compiler.h \
+ memory.h opcodes.h labels.inc
+@@ -73,7 +73,7 @@ git: $(OBJS)
+ $(CC) $(OPTIONS) -o git $(OBJS) $(LIBS)
+
+ install: git
+- cp git $(INSTALLDIR)/git
++ $(BSD_INSTALL_PROGRAM) git $(INSTALLDIR)/git
+
+ clean:
+ rm -f *~ *.o git test/*.tmp
Home |
Main Index |
Thread Index |
Old Index