svn commit: r428765 - in head/sysutils/showbeastie: . files

[Jason E. Hale]

Author: jhale
Date: Sat Dec 17 14:41:07 2016
New Revision: 428765
URL: https://svnweb.freebsd.org/changeset/ports/428765

Log:
  Update to 0.3
  
  - Fix build on FreeBSD 12.0-CURRENT.  sys/boot/ficl/Makefile now includes
    sys/boot/Makefile.ficl, so the directory the port copies is moved up
    one level
  - Showbeastie will now sleep until the user terminates it with Ctrl-c,
    which makes sure that logos and brands can be displayed correctly on
    80x25 consoles
  
  PR:		214674
  Submitted by:	Tobias Kortkamp <t at tobik.me> (maintainer)

Modified:
  head/sysutils/showbeastie/Makefile
  head/sysutils/showbeastie/files/patch-testmain.c

Modified: head/sysutils/showbeastie/Makefile
==============================================================================
--- head/sysutils/showbeastie/Makefile	Sat Dec 17 14:34:04 2016	(r428764)
+++ head/sysutils/showbeastie/Makefile	Sat Dec 17 14:41:07 2016	(r428765)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	showbeastie
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -27,11 +27,13 @@ MAKE_ARGS+=	-m ${SRC_BASE}/share/mk
 
 BROKEN_FreeBSD_9=	builds but expects newer loader environment
 
+WRKSRC_SUBDIR=	ficl
+
 pre-patch:
 	@${MKDIR} ${WRKSRC}
-	@${TAR} -C ${SRC_BASE}/sys/boot/ficl \
+	@${TAR} -C ${SRC_BASE}/sys/boot \
 		--exclude '*.o' --exclude '*.a' --exclude 'testmain' \
-		-cf - . | ${TAR} -C ${WRKSRC} -xf -
+		-cf - . | ${TAR} -C ${WRKSRC}/.. -xf -
 
 post-patch:
 	${REINPLACE_CMD} 's|-I.*/\.\./common|-I${SRC_BASE}/sys/boot/common|g' \

Modified: head/sysutils/showbeastie/files/patch-testmain.c
==============================================================================
--- head/sysutils/showbeastie/files/patch-testmain.c	Sat Dec 17 14:34:04 2016	(r428764)
+++ head/sysutils/showbeastie/files/patch-testmain.c	Sat Dec 17 14:41:07 2016	(r428765)
@@ -1,4 +1,4 @@
---- testmain.c.orig	2015-10-11 17:48:47 UTC
+--- testmain.c.orig	2016-11-17 00:02:13 UTC
 +++ testmain.c
 @@ -296,6 +296,7 @@ void buildTestInterface(FICL_SYSTEM *pSy
      ficlBuild(pSys, "cd",       ficlChDir,    FW_DEFAULT);
@@ -8,7 +8,7 @@
      ficlBuild(pSys, "pwd",      ficlGetCWD,   FW_DEFAULT);
      ficlBuild(pSys, "system",   ficlSystem,   FW_DEFAULT);
      ficlBuild(pSys, "spewhash", spewHash,     FW_DEFAULT);
-@@ -316,17 +317,58 @@ int main(int argc, char **argv)
+@@ -316,17 +317,59 @@ int main(int argc, char **argv)
      buildTestInterface(pSys);
      pVM = ficlNewVM(pSys);
  
@@ -63,7 +63,8 @@
 +    ficlEvaluate(pVM, "draw-beastie");
 +    ficlEvaluate(pVM, "draw-brand");
 +    ficlEvaluate(pVM, "menu-init");
-+    printf("\n\n");
++    fflush(stdout);
++    sleep(3600); // sleep "forever"
 +    return 0;
 +
      for (;;)