version 10.1.2

pkgbuild rewritten for open-source release.

6 files changed, 119 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88d2b3614525..aeac0e75a925 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,32 @@
 pkgbase = inform7
-	pkgdesc = A design system for interactive fiction based on natural language
-	pkgver = 6M62
-	pkgrel = 4
-	url = http://inform7.com/
+	pkgdesc = A design system for interactive fiction based on natural language (git version)
+	pkgver = 10.1.2
+	pkgrel = 1
+	url = https://ganelson.github.io/inform
+	arch = aarch64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = i486
 	arch = i686
+	arch = pentium4
 	arch = x86_64
-	license = custom:Inform
-	depends = perl
-	source = http://inform7.com/apps/6M62/I7_6M62_Linux_all.tar.gz
-	source = install-inform7.sh.patch
-	source = LICENSE
-	md5sums = cf8a251a3531eadf29d9490c2bb53802
-	md5sums = 647052976b3870e975e069f71f770d20
-	md5sums = a18958ae17bcc3733119cad77376eec5
+	groups = inform
+	license = Artistic2.0
+	makedepends = rsync
+	provides = inform
+	provides = inform7
+	options = !buildflags
+	options = !makeflags
+	source = inform-10.1.2.tar.gz::https://github.com/ganelson/inform/archive/refs/tags/v10.1.2.tar.gz
+	source = inweb-7.2.0.tar.gz::https://github.com/ganelson/inweb/archive/refs/tags/v7.2.0.tar.gz
+	source = intest-2.1.0.tar.gz::https://github.com/ganelson/intest/archive/refs/tags/v2.1.0.tar.gz
+	source = make-integration-settings.mk
+	source = wrapper.sh
+	sha256sums = 145cae27638c2dde4979f37b67d60de3243f6ee6456b808426fb9dcbda850dd0
+	sha256sums = 0fa772ed3b2e7c7242be6dbfad319bc213f49881eba56549248f90ea1a47fbcf
+	sha256sums = 3a5c86005212b3aa68064e133abed54529a83c7c6963a845afadbcc7db1d647e
+	sha256sums = 5a42023a0de9ba0e8bc9fb0d17713d6d4827d297dbd28c9a84c6a2267098d845
+	sha256sums = acd2313b91b9bc0d3b55da3691b2e8fd7fefd3550ff2983f7648fbf61cabf3cb
 
 pkgname = inform7
-
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f979dc5852cc..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,5 +0,0 @@
-The command-line tools share the traditional Inform license: they are
-free, and impose no significant restrictions on even commercial use, but
-are not yet open source in the sense of the GPL (even though source code
-is likely to be published in due course): in particular, those wishing
-to develop variant forms must apply for copyright permission.
diff --git a/PKGBUILD b/PKGBUILD
index e5b87427baad..1ef699a0d0c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,75 @@
+# Maintainer: libele <libele@disroot.org>
 # Contributor: Jonathan Liu <net147@gmail.com>
+
 pkgname=inform7
-pkgver=6M62
-pkgrel=4
-pkgdesc="A design system for interactive fiction based on natural language"
-arch=('i686' 'x86_64')
-url="http://inform7.com/"
-license=('custom:Inform')
-depends=('perl')
-source=("http://inform7.com/apps/${pkgver}/I7_${pkgver}_Linux_all.tar.gz"
-        "install-inform7.sh.patch"
-        "LICENSE")
-md5sums=('cf8a251a3531eadf29d9490c2bb53802'
-         '647052976b3870e975e069f71f770d20'
-         'a18958ae17bcc3733119cad77376eec5')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/install-inform7.sh.patch"
+_pkgname=inform
+pkgver=10.1.2
+_inwebver=7.2.0
+_intestver=2.1.0
+pkgrel=1
+pkgdesc="A design system for interactive fiction based on natural language (git version)"
+arch=('aarch64' 'arm' 'armv6h' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
+url="https://ganelson.github.io/inform"
+license=('Artistic2.0')
+makedepends=('rsync')
+provides=('inform' 'inform7')
+groups=(inform)
+options=(!buildflags !makeflags)
+
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/ganelson/inform/archive/refs/tags/v$pkgver.tar.gz"
+	"inweb-$_inwebver.tar.gz::https://github.com/ganelson/inweb/archive/refs/tags/v$_inwebver.tar.gz"
+	"intest-$_intestver.tar.gz::https://github.com/ganelson/intest/archive/refs/tags/v$_intestver.tar.gz"
+	'make-integration-settings.mk'
+	'wrapper.sh')
+
+sha256sums=('145cae27638c2dde4979f37b67d60de3243f6ee6456b808426fb9dcbda850dd0'
+            '0fa772ed3b2e7c7242be6dbfad319bc213f49881eba56549248f90ea1a47fbcf'
+            '3a5c86005212b3aa68064e133abed54529a83c7c6963a845afadbcc7db1d647e'
+            '5a42023a0de9ba0e8bc9fb0d17713d6d4827d297dbd28c9a84c6a2267098d845'
+            'acd2313b91b9bc0d3b55da3691b2e8fd7fefd3550ff2983f7648fbf61cabf3cb')
+
+build() {
+  cd "$srcdir"
+  mv "inweb-$_inwebver" inweb
+  mv "intest-$_intestver" intest
+
+  bash inweb/scripts/first.sh linux
+  bash intest/scripts/first.sh
+
+  cd "$_pkgname-$pkgver"
+  bash scripts/first.sh
+  ../intest/Tangled/intest inform7 -show Acidity
+  make
+
+  make retrospective
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./install-inform7.sh -p "$pkgdir/usr"
-  mv "${pkgdir}/usr/man" "${pkgdir}/usr/share/"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+check() {
+  cd "$_pkgname-$pkgver"
+  make check
 }
 
-# vim:set ts=2 sw=2 et:
+package() {
+  cd "$_pkgname-$pkgver"
+  make forceintegration
+
+  cd "$srcdir"
+  cp -a dist/* "$pkgdir"
+
+  install -Dm755 wrapper.sh "$pkgdir/usr/bin/inform7"
+
+  cd "$_pkgname-$pkgver/retrospective/6L02"
+  install -Dm755 cBlorb "$pkgdir/usr/lib/$_pkgname/retrospective/6L02/cBlorb"
+  install -Dm755 ni "$pkgdir/usr/lib/$_pkgname/retrospective/6L02/ni"
+  cp -ar Extensions "$pkgdir/usr/lib/$_pkgname/retrospective/6L02/Extensions"
+
+  cd ../6L38
+  install -Dm755 cBlorb "$pkgdir/usr/lib/$_pkgname/retrospective/6L38/cBlorb"
+  install -Dm755 ni "$pkgdir/usr/lib/$_pkgname/retrospective/6L38/ni"
+  cp -ar Internal "$pkgdir/usr/lib/$_pkgname/retrospective/6L38/Internal"
+
+  cd ../6M62
+  install -Dm755 cBlorb "$pkgdir/usr/lib/$_pkgname/retrospective/6M62/cBlorb"
+  install -Dm755 ni "$pkgdir/usr/lib/$_pkgname/retrospective/6M62/ni"
+  cp -ar Internal "$pkgdir/usr/lib/$_pkgname/retrospective/6M62/Internal"
+}
diff --git a/install-inform7.sh.patch b/install-inform7.sh.patch
deleted file mode 100644
index 068bd1e3a7a0..000000000000
--- a/install-inform7.sh.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur inform7-6L02.orig/install-inform7.sh inform7-6L02/install-inform7.sh
---- inform7-6L02.orig/install-inform7.sh	2014-05-08 00:48:08.000000000 +1000
-+++ inform7-6L02/install-inform7.sh	2014-05-09 23:09:01.626788006 +1000
-@@ -97,10 +97,8 @@
- tar xzf ${D}/${COMPDEP} || exit 4
- tar xzf ${D}/${TERPDEP} || exit 4
- 
--if [ "$PREFIX" != "/usr/local" ]; then
--    cmd="s|/usr/local|$PREFIX|;"
--    perl -p -i -e "$cmd" bin/i7 || exit 6
--fi
-+cmd="s|/usr/local|/usr|;"
-+perl -p -i -e "$cmd" bin/i7 || exit 6
- 
- cd ${D}
- exit 0
diff --git a/make-integration-settings.mk b/make-integration-settings.mk
new file mode 100644
index 000000000000..ccd85e8d6103
--- /dev/null
+++ b/make-integration-settings.mk
@@ -0,0 +1,13 @@
+INTEGRATION=1
+
+BUILTINCOMPS=../dist/usr/bin
+INTERNAL=../dist/usr/lib/inform7
+
+INBLORBNAME=inblorb
+INFORM6NAME=i6
+INFORM7NAME=ni
+INTESTNAME=intest
+
+BUILTINHTML=../dist/usr/share/doc/inform7
+BUILTINHTMLINNER=$(BUILTINHTML)
+INDOCOPTS=-to $(BUILTINHTML) website
diff --git a/wrapper.sh b/wrapper.sh
new file mode 100755
index 000000000000..1a08f071f648
--- /dev/null
+++ b/wrapper.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+LIBPATH=/usr/lib/inform7
+INFORM7=/usr/bin/ni
+
+if [ -z "$1" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ];
+    then $INFORM7 -help;
+elif [ "$1" = "-version" ] || [ "$1" = "--version" ];
+    then $INFORM7 -version;
+else $INFORM7 -no-census-update -internal $LIBPATH "$@"; fi