pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

frobtads: update to frobtads-2.0



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Jul 28 22:48:02 2022 +0200
Changeset:	f81a273dfcfc271d473d644278d11c4aac13869a

Modified Files:
	frobtads/Makefile
	frobtads/PLIST
	frobtads/distinfo
Added Files:
	frobtads/patches/patch-testscripts_test__make.sh

Log Message:
frobtads: update to frobtads-2.0

v2.0 - 2021-05-09
=================

  - C11 and C++14 are now required to compile FrobTADS.

  - CMake is now used as the build system. The autoconf/automake system has
    been removed.

  - NCurses is now required. Other curses libraries are not supported.

  - Imported latest available TADS base code sources.

  - Increased frob's maximum line width to 2048 characters. This fixes output
    on very wide terminals.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f81a273dfcfc271d473d644278d11c4aac13869a

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

diffstat:
 frobtads/Makefile                                | 18 +++++--------
 frobtads/PLIST                                   |  9 +++++++
 frobtads/distinfo                                |  7 ++---
 frobtads/patches/patch-testscripts_test__make.sh | 34 ++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 15 deletions(-)

diffs:
diff --git a/frobtads/Makefile b/frobtads/Makefile
index 49fb4429b5..36ba22e2b8 100644
--- a/frobtads/Makefile
+++ b/frobtads/Makefile
@@ -1,24 +1,18 @@
 # $NetBSD: Makefile,v 1.1 2015/08/17 21:11:24 yhardy Exp $
 
-GITHUB_PROJECT=	frobtads
-DISTNAME=	${GITHUB_TAG}
-PKGNAME=	${GITHUB_PROJECT}-1.2.4
+DISTNAME=	frobtads-2.0
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GITHUB:=realnc/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=realnc/frobtads/releases/download/v2.0/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.tads.org/
 COMMENT=	Portable TADS toolkit
 #LICENSE=	tads3
 
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++11
-USE_TOOLS+=	autoconf automake libtool
-
-pre-configure:
-	cd ${WRKSRC} && ${SH} bootstrap
+USE_CMAKE=	YES
+USE_LANGUAGES=	c c++14
 
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/frobtads/PLIST b/frobtads/PLIST
index 9be29a9c20..30c9761aee 100644
--- a/frobtads/PLIST
+++ b/frobtads/PLIST
@@ -3,6 +3,12 @@ bin/frob
 bin/t3make
 bin/tadsc
 bin/tadsrsc
+share/doc/${PKGNAME}/AUTHORS
+share/doc/${PKGNAME}/BUGS
+share/doc/${PKGNAME}/COPYING
+share/doc/${PKGNAME}/NEWS
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/THANKS
 share/frobtads/tads2/adv.t
 share/frobtads/tads2/gameinfo.t
 share/frobtads/tads2/std.t
@@ -86,6 +92,8 @@ share/frobtads/tads3/lib/adv3/pov.t
 share/frobtads/tads3/lib/adv3/precond.t
 share/frobtads/tads3/lib/adv3/report.t
 share/frobtads/tads3/lib/adv3/resolver.t
+share/frobtads/tads3/lib/adv3/samples/starta3.t
+share/frobtads/tads3/lib/adv3/samples/starti3.t
 share/frobtads/tads3/lib/adv3/score.t
 share/frobtads/tads3/lib/adv3/sense.t
 share/frobtads/tads3/lib/adv3/settings.t
@@ -114,6 +122,7 @@ share/frobtads/tads3/lib/gameinfo.t
 share/frobtads/tads3/lib/gramprod.t
 share/frobtads/tads3/lib/multmeth.t
 share/frobtads/tads3/lib/reflect.t
+share/frobtads/tads3/lib/samples/startB3.t
 share/frobtads/tads3/lib/system.tl
 share/frobtads/tads3/lib/tadsnet.t
 share/frobtads/tads3/lib/tok.t
diff --git a/frobtads/distinfo b/frobtads/distinfo
index 0d45b381ea..23eba2b47f 100644
--- a/frobtads/distinfo
+++ b/frobtads/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.1 2015/08/17 21:11:24 yhardy Exp $
 
-RMD160 (frobtads/1.2.4.tar.gz) = b6ddc44f24c7a9ea905dfe1201e72e79654a6174
-SHA512 (frobtads/1.2.4.tar.gz) = 6738625afcced1d6e821f96d3ec4b4c4be153323fe80e4dcf389c4fdc6fb9771ff32b84c108630ff9393717332b687ccc554dc8c8ec86001801c7672e81398be
-Size (frobtads/1.2.4.tar.gz) = 5096812 bytes
+BLAKE2s (frobtads-2.0.tar.bz2) = f4ebecf65f56ee08f013a3df474925788b6f08c56bceea004daf1873bf6e1f98
+SHA512 (frobtads-2.0.tar.bz2) = 28c84447c1ab43cfd6956b1933f9e7ab3ac0d8b7d0767f23d8535e2ea0cac0e07f17ade07776d646102caa8c23474c3ae3d46a3eef243ad8c7aec702eea04854
+Size (frobtads-2.0.tar.bz2) = 3870691 bytes
+SHA1 (patch-testscripts_test__make.sh) = cc916dc9bdc3ad47e778c0668b0754c2d5155051
diff --git a/frobtads/patches/patch-testscripts_test__make.sh b/frobtads/patches/patch-testscripts_test__make.sh
new file mode 100644
index 0000000000..9891155e00
--- /dev/null
+++ b/frobtads/patches/patch-testscripts_test__make.sh
@@ -0,0 +1,34 @@
+$NetBSD$
+
+Portability fixes: use "=" instead of "==" for test(1).
+
+--- testscripts/test_make.sh.orig	2021-05-09 08:48:44.000000000 +0000
++++ testscripts/test_make.sh
+@@ -8,13 +8,13 @@ CHARSET=$1
+ shift
+ 
+ skiprun="NO"
+-if [ $1 == "-norun" ]; then
++if [ $1 = "-norun" ]; then
+     skiprun="YES"
+     shift
+ fi
+ 
+ tstscript=""
+-if [ $1 == "-script" ]; then
++if [ $1 = "-script" ]; then
+     tstscript="YES"
+     shift
+ fi
+@@ -42,9 +42,9 @@ case "$1" in
+ esac
+ cat "$T3_OUT/$1.err" >> "$T3_OUT/$1.log"
+ 
+-if [ $skiprun == "NO" ]; then
++if [ $skiprun = "NO" ]; then
+     echo "'Make' test: $1"
+-    if [ $tstscript == "YES" ]; then
++    if [ $tstscript = "YES" ]; then
+         $TESTPROGS/test_exec -I "$T3_DAT/$1.in" -cs $CHARSET -norand "$T3_OUT/$1.t3" >> "$T3_OUT/$1.log" 2>"$T3_OUT/$1.err"
+     else
+         $TESTPROGS/test_exec -cs $CHARSET -norand "$T3_OUT/$1.t3" >> "$T3_OUT/$1.log" 2>"$T3_OUT/$1.err"


Home | Main Index | Thread Index | Old Index