CVS commit: pkgsrc/lang/inform

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Jul 24 03:18:54 UTC 2017

Modified Files:
        pkgsrc/lang/inform: Makefile PLIST distinfo
Added Files:
        pkgsrc/lang/inform/patches: patch-Makefile
Removed Files:
        pkgsrc/lang/inform/patches: patch-aa patch-ab

Log Message:
update to inform-6.33-6.12.1
(versioned as 6.33.20160609 based on the tarball date)

Version 6.33-6.12.1 (6 June 2016)
=================================

* Inform version is now 6.33, with Inform7-related patches and new features.

* The Inform Library is 6.12.1 with lots of bugfixes and enhancements.

* Package version scheme changed to indicate both compiler and library
  versions included.

* Include files trimmed to those known to be freely redistributable and
  checked to make sure they work.

* DM4 removed due to license incompatibilities.

* Added a manpage.

* Added pblorb.pl and scanblorb.pl utilities for dealing with Blorb files.

Version 6.32.1 (16 July 2012)
=============================

* Inform version is now 6.32, with more patches for use with Inform 7.

* The Inform program is now distributed under the Artistic License 2.0.

* The advent.inf example is now at release 9.

drop nathanw's maintainership by his request
tested by wes fraizer


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/inform/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/inform/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/inform/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/inform/patches/patch-Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/inform/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/inform/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/inform/Makefile
diff -u pkgsrc/lang/inform/Makefile:1.17 pkgsrc/lang/inform/Makefile:1.18
--- pkgsrc/lang/inform/Makefile:1.17    Sat Feb 21 13:25:59 2015
+++ pkgsrc/lang/inform/Makefile Mon Jul 24 03:18:54 2017
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.17 2015/02/21 13:25:59 mef Exp $
+# $NetBSD: Makefile,v 1.18 2017/07/24 03:18:54 maya Exp $
 
-DISTNAME=      inform-6.31.1
-PKGREVISION=   1
+PKGNAME=       inform-6.33.20160609
+DISTNAME=      inform-6.33-6.12.1
 CATEGORIES=    lang
 MASTER_SITES=  http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/
 
-MAINTAINER=    nathanw%mit.edu@localhost
-HOMEPAGE=      http://inform7.com/
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://inform7.com/
 COMMENT=       Interactive fiction compiler (Z-Machine and Glulx)
-LICENSE=       inform-license
+LICENSE=       artistic-2.0
 
-GNU_CONFIGURE= yes
+NO_CONFIGURE=  yes
 USE_TOOLS+=    gmake
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/inform/PLIST
diff -u pkgsrc/lang/inform/PLIST:1.10 pkgsrc/lang/inform/PLIST:1.11
--- pkgsrc/lang/inform/PLIST:1.10       Thu Jun  3 05:24:27 2010
+++ pkgsrc/lang/inform/PLIST    Mon Jul 24 03:18:54 2017
@@ -1,259 +1,79 @@
-@comment $NetBSD: PLIST,v 1.10 2010/06/03 05:24:27 dholland Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/07/24 03:18:54 maya Exp $
 bin/inform
-bin/inform-6.31
-share/inform/6.31/include/AdHints.h
-share/inform/6.31/include/CCPL.h
-share/inform/6.31/include/ExpertGrammar.h
-share/inform/6.31/include/GoNeighbour.h
-share/inform/6.31/include/HelpRoutines.h
-share/inform/6.31/include/Locksmith.h
-share/inform/6.31/include/Menus.h
-share/inform/6.31/include/NPC_ENGINE.h
-share/inform/6.31/include/NewMenu.h
-share/inform/6.31/include/NewbieGrammar.h
-share/inform/6.31/include/SampleTranscript.h
-share/inform/6.31/include/Scenic.h
-share/inform/6.31/include/Scoper.h
-share/inform/6.31/include/SmartCantGo.h
-share/inform/6.31/include/action.h
-share/inform/6.31/include/adhints.h
-share/inform/6.31/include/adhints.txt
-share/inform/6.31/include/altmenu.h
-share/inform/6.31/include/boxclever.h
-share/inform/6.31/include/branch.h
-share/inform/6.31/include/calyx_adjectives.h
-share/inform/6.31/include/ccpl.h
-share/inform/6.31/include/center.h
-share/inform/6.31/include/clothes.h
-share/inform/6.31/include/clothing.h
-share/inform/6.31/include/compass.h
-share/inform/6.31/include/daemons.h
-share/inform/6.31/include/diary.h
-share/inform/6.31/include/dirs.h
-share/inform/6.31/include/domenu.h
-share/inform/6.31/include/doors.h
-share/inform/6.31/include/dynobj.h
-share/inform/6.31/include/easydoors.h
-share/inform/6.31/include/expertgrammar.h
-share/inform/6.31/include/fkeys.h
-share/inform/6.31/include/follower.h
-share/inform/6.31/include/footnote.h
-share/inform/6.31/include/goneighbour.h
-share/inform/6.31/include/helproutines.h
-share/inform/6.31/include/hints.h
-share/inform/6.31/include/hintsms.h
-share/inform/6.31/include/howtoplay.h
-share/inform/6.31/include/info.h
-share/inform/6.31/include/istring.h
-share/inform/6.31/include/links.h
-share/inform/6.31/include/links.inf
-share/inform/6.31/include/locksmith.h
-share/inform/6.31/include/longint.h
-share/inform/6.31/include/manual.h
-share/inform/6.31/include/menus.h
-share/inform/6.31/include/mistype.h
-share/inform/6.31/include/money.h
-share/inform/6.31/include/moveclass.h
-share/inform/6.31/include/movie.h
-share/inform/6.31/include/nameable.h
-share/inform/6.31/include/newbiegrammar.h
-share/inform/6.31/include/newmenu.h
-share/inform/6.31/include/newmenus.h
-share/inform/6.31/include/npc_engine.h
-share/inform/6.31/include/npc_engine.inf
-share/inform/6.31/include/npc_engine.txt
-share/inform/6.31/include/oldaemon.h
-share/inform/6.31/include/outofrch.h
-share/inform/6.31/include/phtalkoo.h
-share/inform/6.31/include/physics.h
-share/inform/6.31/include/pluralob.h
-share/inform/6.31/include/pname.h
-share/inform/6.31/include/pname.txt
-share/inform/6.31/include/printtime.h
-share/inform/6.31/include/recept.h
-share/inform/6.31/include/sampletranscript.h
-share/inform/6.31/include/scenic.h
-share/inform/6.31/include/scoper.h
-share/inform/6.31/include/showobj.h
-share/inform/6.31/include/shuffle.h
-share/inform/6.31/include/smartcantgo.h
-share/inform/6.31/include/sound.h
-share/inform/6.31/include/style.h
-share/inform/6.31/include/text_functions.h
-share/inform/6.31/include/text_functions.inf
-share/inform/6.31/include/timepiece.h
-share/inform/6.31/include/timesys.h
-share/inform/6.31/include/timewait.h
-share/inform/6.31/include/torch.h
-share/inform/6.31/include/trinitystat.h
-share/inform/6.31/include/utility.h
-share/inform/6.31/include/waittime.h
-share/inform/6.31/include/whatis.h
-share/inform/6.31/include/whowhat.h
-share/inform/6.31/include/yesno.h
-share/inform/6.31/include/zclock.h
-share/inform/6.31/include/znsi.h
-share/inform/6.31/module/English.h
-share/inform/6.31/module/Grammar.h
-share/inform/6.31/module/Parser.h
-share/inform/6.31/module/VerbLib.h
-share/inform/6.31/module/Verblib.h
-share/inform/6.31/module/english.h
-share/inform/6.31/module/grammar.h
-share/inform/6.31/module/infix.h
-share/inform/6.31/module/linklpa.h
-share/inform/6.31/module/linklv.h
-share/inform/6.31/module/parser.h
-share/inform/6.31/module/parserm.h
-share/inform/6.31/module/parserm.m5
-share/inform/6.31/module/verblib.h
-share/inform/6.31/module/verblibm.h
-share/inform/6.31/module/verblibm.m5
-share/inform/manual/app.html
-share/inform/manual/backcover.html
-share/inform/manual/ch1.html
-share/inform/manual/ch2.html
-share/inform/manual/ch3.html
-share/inform/manual/ch4.html
-share/inform/manual/ch5.html
-share/inform/manual/ch6.html
-share/inform/manual/ch7.html
-share/inform/manual/ch8.html
-share/inform/manual/cited.html
-share/inform/manual/colophon.html
-share/inform/manual/contents.html
-share/inform/manual/dm4-011_1.jpg
-share/inform/manual/dm4-015_1.jpg
-share/inform/manual/dm4-048_1.jpg
-share/inform/manual/dm4-057_1.jpg
-share/inform/manual/dm4-084_1.jpg
-share/inform/manual/dm4-092_1.jpg
-share/inform/manual/dm4-097_1.jpg
-share/inform/manual/dm4-106_1.jpg
-share/inform/manual/dm4-116_1.jpg
-share/inform/manual/dm4-122_1.jpg
-share/inform/manual/dm4-125_1.jpg
-share/inform/manual/dm4-126_1.jpg
-share/inform/manual/dm4-128_1.jpg
-share/inform/manual/dm4-132_1.jpg
-share/inform/manual/dm4-135_1.jpg
-share/inform/manual/dm4-137_1.jpg
-share/inform/manual/dm4-141_1.jpg
-share/inform/manual/dm4-144_1.jpg
-share/inform/manual/dm4-148_1.jpg
-share/inform/manual/dm4-154_1.jpg
-share/inform/manual/dm4-157_1.jpg
-share/inform/manual/dm4-162_1.jpg
-share/inform/manual/dm4-170_1.jpg
-share/inform/manual/dm4-176_1.jpg
-share/inform/manual/dm4-178_1.jpg
-share/inform/manual/dm4-186_1.jpg
-share/inform/manual/dm4-198_1.jpg
-share/inform/manual/dm4-204_1.jpg
-share/inform/manual/dm4-211_1.jpg
-share/inform/manual/dm4-216_1.jpg
-share/inform/manual/dm4-222_1.jpg
-share/inform/manual/dm4-225_1.jpg
-share/inform/manual/dm4-232_1.jpg
-share/inform/manual/dm4-241_1.jpg
-share/inform/manual/dm4-247_1.jpg
-share/inform/manual/dm4-253_1.jpg
-share/inform/manual/dm4-260_1.jpg
-share/inform/manual/dm4-262_1.jpg
-share/inform/manual/dm4-267_1.jpg
-share/inform/manual/dm4-279_1.jpg
-share/inform/manual/dm4-288_1.jpg
-share/inform/manual/dm4-295_1.jpg
-share/inform/manual/dm4-300_1.jpg
-share/inform/manual/dm4-314_1.jpg
-share/inform/manual/dm4-318_1.jpg
-share/inform/manual/dm4-331_1.jpg
-share/inform/manual/dm4-336_1.jpg
-share/inform/manual/dm4-344_1.jpg
-share/inform/manual/dm4-349_1.jpg
-share/inform/manual/dm4-352_1.jpg
-share/inform/manual/dm4-374_1.jpg
-share/inform/manual/dm4-378_1.jpg
-share/inform/manual/dm4-391_1.jpg
-share/inform/manual/dm4-392_1.jpg
-share/inform/manual/dm4-406_1.jpg
-share/inform/manual/dm4-412_1.jpg
-share/inform/manual/dm4-538_1.jpg
-share/inform/manual/dm4-546_1.jpg
-share/inform/manual/dm4-572_1.jpg
-share/inform/manual/dm4index.html
-share/inform/manual/exdm4index.html
-share/inform/manual/index.html
-share/inform/manual/intro.html
-share/inform/manual/roller2.jpg
-share/inform/manual/s1.html
-share/inform/manual/s10.html
-share/inform/manual/s11.html
-share/inform/manual/s12.html
-share/inform/manual/s13.html
-share/inform/manual/s14.html
-share/inform/manual/s15.html
-share/inform/manual/s16.html
-share/inform/manual/s17.html
-share/inform/manual/s18.html
-share/inform/manual/s19.html
-share/inform/manual/s2.html
-share/inform/manual/s20.html
-share/inform/manual/s21.html
-share/inform/manual/s22.html
-share/inform/manual/s23.html
-share/inform/manual/s24.html
-share/inform/manual/s25.html
-share/inform/manual/s26.html
-share/inform/manual/s27.html
-share/inform/manual/s28.html
-share/inform/manual/s29.html
-share/inform/manual/s3.html
-share/inform/manual/s30.html
-share/inform/manual/s31.html
-share/inform/manual/s32.html
-share/inform/manual/s33.html
-share/inform/manual/s34.html
-share/inform/manual/s35.html
-share/inform/manual/s36.html
-share/inform/manual/s37.html
-share/inform/manual/s38.html
-share/inform/manual/s39.html
-share/inform/manual/s4.html
-share/inform/manual/s40.html
-share/inform/manual/s41.html
-share/inform/manual/s42.html
-share/inform/manual/s43.html
-share/inform/manual/s44.html
-share/inform/manual/s45.html
-share/inform/manual/s46.html
-share/inform/manual/s47.html
-share/inform/manual/s48.html
-share/inform/manual/s49.html
-share/inform/manual/s5.html
-share/inform/manual/s50.html
-share/inform/manual/s51.html
-share/inform/manual/s52.html
-share/inform/manual/s6.html
-share/inform/manual/s7.html
-share/inform/manual/s8.html
-share/inform/manual/s9.html
-share/inform/manual/sa1.html
-share/inform/manual/sa2.html
-share/inform/manual/sa3.html
-share/inform/manual/sa4.html
-share/inform/manual/sa5.html
-share/inform/manual/sa6.html
-share/inform/manual/tables.html
-share/zcode/advent.z5
-share/zcode/adventureland.z5
-share/zcode/balances.z5
-share/zcode/museum.z5
-share/zcode/ruins1.z5
-share/zcode/ruins2.z5
-share/zcode/ruins3.z5
-share/zcode/toyshop.z5
-@pkgdir share/inform/include
-@pkgdir share/inform/module
-@pkgdir share/inform/manual
-@pkgdir share/zcode
+man/man1/inform.1
+share/inform/demos/README
+share/inform/demos/advent.inf
+share/inform/demos/advent.z5
+share/inform/demos/adventureland.inf
+share/inform/demos/adventureland.z5
+share/inform/demos/balances.inf
+share/inform/demos/balances.z5
+share/inform/demos/museum.inf
+share/inform/demos/museum.z5
+share/inform/demos/ruins1.inf
+share/inform/demos/ruins1.z5
+share/inform/demos/ruins2.inf
+share/inform/demos/ruins2.z5
+share/inform/demos/ruins3.inf
+share/inform/demos/ruins3.z5
+share/inform/demos/toyshop.inf
+share/inform/demos/toyshop.z5
+share/inform/include/dmenus.h
+share/inform/include/doors.h
+share/inform/include/doors2.h
+share/inform/include/footnote.h
+share/inform/include/helproutines.h
+share/inform/include/howtoplay.h
+share/inform/include/mistype.h
+share/inform/include/moveclass.h
+share/inform/include/newbiegrammar.h
+share/inform/include/seeno.h
+share/inform/include/shuffle.h
+share/inform/include/smartcantgo.h
+share/inform/include/sound.h
+share/inform/include/tmenus.h
+share/inform/include/torch.h
+share/inform/include/trinitystat.h
+share/inform/include/whowhat.h
+share/inform/include/yesno.h
+share/inform/include/zclock.h
+share/inform/lib/ARTISTIC
+share/inform/lib/COPYING
+share/inform/lib/ChangeLog
+share/inform/lib/English.h
+share/inform/lib/Grammar.h
+share/inform/lib/Parser.h
+share/inform/lib/README.txt
+share/inform/lib/VerbLib.h
+share/inform/lib/Verblib.h
+share/inform/lib/english.h
+share/inform/lib/grammar.h
+share/inform/lib/infglk.h
+share/inform/lib/infix.h
+share/inform/lib/linklpa.h
+share/inform/lib/linklv.h
+share/inform/lib/parser.h
+share/inform/lib/parserm.h
+share/inform/lib/verblib.h
+share/inform/lib/verblibm.h
+share/inform/lib/voices_and_tenses.txt
+share/inform/tutor/README
+share/inform/tutor/alice.inf
+share/inform/tutor/alice.txt
+share/inform/tutor/alice.z5
+share/inform/tutor/aloneice.inf
+share/inform/tutor/aloneice.z5
+share/inform/tutor/house01.inf
+share/inform/tutor/house01.z5
+share/inform/tutor/house02.inf
+share/inform/tutor/house02.z5
+share/inform/tutor/house03.inf
+share/inform/tutor/house03.z5
+share/inform/tutor/house04.inf
+share/inform/tutor/house04.z5
+share/inform/tutor/house05.inf
+share/inform/tutor/house05.z5
+share/inform/tutor/house06.inf
+share/inform/tutor/house06.z5
+share/inform/tutor/house07.inf
+share/inform/tutor/house07.z5

Index: pkgsrc/lang/inform/distinfo
diff -u pkgsrc/lang/inform/distinfo:1.7 pkgsrc/lang/inform/distinfo:1.8
--- pkgsrc/lang/inform/distinfo:1.7     Tue Nov  3 22:50:36 2015
+++ pkgsrc/lang/inform/distinfo Mon Jul 24 03:18:54 2017
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 22:50:36 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/07/24 03:18:54 maya Exp $
 
-SHA1 (inform-6.31.1.tar.gz) = 0c6c43536236ea09de689291fb90c1203f342de2
-RMD160 (inform-6.31.1.tar.gz) = e3dc7f8c5d6b41dec42f7c8c0f4a59a5ff448f16
-SHA512 (inform-6.31.1.tar.gz) = 7579aca3b32f32d4c0269117e662be7e637504433cfe41b4c40879462d60bb384fe592773ebf489b0f6556220a88c301f4cd90d5c794213d69884bf366be51b3
-Size (inform-6.31.1.tar.gz) = 1947301 bytes
-SHA1 (patch-aa) = 2f43e50548c7b2c566593d1fb79d173e189dcfcc
-SHA1 (patch-ab) = c4c3b5a97700b3bf7009909e85227a4af7b23a3e
+SHA1 (inform-6.33-6.12.1.tar.gz) = b6f944d0c7377b58fc0a7c8980846755d2c53be2
+RMD160 (inform-6.33-6.12.1.tar.gz) = 100eb4aba874df6f7a3a9d5e47781d5d11af5d7f
+SHA512 (inform-6.33-6.12.1.tar.gz) = 6eaff617fad8ebc63663113b75f81cc0209e32472435abc4773db0ddacef9117a6cbf2fe9525a8ef7028302bc297144b6ec38b2b4d6bf0406472d2490b15d345
+Size (inform-6.33-6.12.1.tar.gz) = 742439 bytes
+SHA1 (patch-Makefile) = aee3d31890f689438aa05d12666d265553e22c84

Added files:

Index: pkgsrc/lang/inform/patches/patch-Makefile
diff -u /dev/null pkgsrc/lang/inform/patches/patch-Makefile:1.1
--- /dev/null   Mon Jul 24 03:18:54 2017
+++ pkgsrc/lang/inform/patches/patch-Makefile   Mon Jul 24 03:18:54 2017
@@ -0,0 +1,47 @@
+$NetBSD: patch-Makefile,v 1.1 2017/07/24 03:18:54 maya Exp $
+
+Allow overriding PREFIX
+DESTDIR support
+
+--- Makefile.orig      2016-06-04 03:25:08.000000000 +0000
++++ Makefile
+@@ -2,7 +2,7 @@ CC = gcc
+ 
+ #OPTS = -g -Wall -Wextra
+ 
+-PREFIX = /usr/local
++PREFIX ?= /usr/local
+ MAN_PREFIX = $(PREFIX)
+ 
+ COMPVERSION = 6.33
+@@ -63,18 +63,18 @@ strip: $(BINNAME)
+       strip $(BINNAME)
+ 
+ install: $(BINNAME) lib
+-      install -d -m 755 $(BINDIR)
+-      install -c -m 755 $(BINNAME) $(BINDIR)
+-      install -d -m 755 $(LIBDIR)
+-      install -c -m 644 $(wildcard lib/*) $(LIBDIR)
+-      install -d -m 755 $(INCLUDEDIR)
+-      install -c -m 644 $(wildcard include/*) $(INCLUDEDIR)
+-      install -d -m 755 $(MANDIR)
+-      install -c -m 644 $(MANPAGE) $(MANDIR)
+-      install -d -m 755 $(DEMODIR)
+-      install -c -m 644 $(wildcard demos/*) $(DEMODIR)
+-      install -d -m 755 $(TUTORDIR)
+-      install -c -m 644 $(wildcard tutor/*) $(TUTORDIR)
++      install -d -m 755 $(DESTDIR)$(BINDIR)
++      install -c -m 755 $(BINNAME) $(DESTDIR)$(BINDIR)
++      install -d -m 755 $(DESTDIR)$(LIBDIR)
++      install -c -m 644 $(wildcard lib/*) $(DESTDIR)$(LIBDIR)
++      install -d -m 755 $(DESTDIR)$(INCLUDEDIR)
++      install -c -m 644 $(wildcard include/*) $(DESTDIR)$(INCLUDEDIR)
++      install -d -m 755 $(DESTDIR)$(MANDIR)
++      install -c -m 644 $(MANPAGE) $(DESTDIR)$(MANDIR)
++      install -d -m 755 $(DESTDIR)$(DEMODIR)
++      install -c -m 644 $(wildcard demos/*) $(DESTDIR)$(DEMODIR)
++      install -d -m 755 $(DESTDIR)$(TUTORDIR)
++      install -c -m 644 $(wildcard tutor/*) $(DESTDIR)$(TUTORDIR)
+ 
+ install-strip: strip install
+