From owner-svn-ports-head@freebsd.org Sat Apr 2 05:39:15 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E82F1AEB309; Sat, 2 Apr 2016 05:39:15 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B60A312B3; Sat, 2 Apr 2016 05:39:15 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u325dEYT053550; Sat, 2 Apr 2016 05:39:14 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u325dEPD053548; Sat, 2 Apr 2016 05:39:14 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604020539.u325dEPD053548@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 2 Apr 2016 05:39:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412380 - in head/sysutils/showbeastie: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2016 05:39:16 -0000 Author: pi Date: Sat Apr 2 05:39:14 2016 New Revision: 412380 URL: https://svnweb.freebsd.org/changeset/ports/412380 Log: sysutils/showbeastie: 0.1 -> 0.2, build-fixes PR: 208283 Submitted by: xmj, Tobias Kortkamp (maintainer) Modified: head/sysutils/showbeastie/Makefile head/sysutils/showbeastie/files/patch-testmain.c Modified: head/sysutils/showbeastie/Makefile ============================================================================== --- head/sysutils/showbeastie/Makefile Sat Apr 2 02:53:44 2016 (r412379) +++ head/sysutils/showbeastie/Makefile Sat Apr 2 05:39:14 2016 (r412380) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= showbeastie -PORTVERSION= 0.1 +PORTVERSION= 0.2 CATEGORIES= sysutils MASTER_SITES= DISTFILES= @@ -12,9 +12,9 @@ COMMENT= Preview FreeBSD loader logos LICENSE= BSD2CLAUSE -# Let's pretend we build a kernel module, because we require the -# kernel sources -USES= kmod +.if !exists(${SRC_BASE}/sys/Makefile) +IGNORE= requires kernel source files in ${SRC_BASE} +.endif NO_FETCH= yes @@ -22,9 +22,14 @@ ALL_TARGET= testmain PLIST_FILES= bin/${PORTNAME} +# Make sure building succeeds on HEAD +MAKE_ARGS+= -m ${SRC_BASE}/share/mk + pre-patch: @${MKDIR} ${WRKSRC} - @(cd ${SRC_BASE}/sys/boot/ficl && ${COPYTREE_SHARE} . ${WRKSRC}) + @${TAR} -C ${SRC_BASE}/sys/boot/ficl \ + --exclude '*.o' --exclude '*.a' --exclude 'testmain' \ + -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 Apr 2 02:53:44 2016 (r412379) +++ head/sysutils/showbeastie/files/patch-testmain.c Sat Apr 2 05:39:14 2016 (r412380) @@ -1,6 +1,14 @@ ---- testmain.c.orig 2016-03-02 15:04:22 UTC +--- testmain.c.orig 2015-10-11 17:48:47 UTC +++ testmain.c -@@ -316,17 +316,38 @@ int main(int argc, char **argv) +@@ -296,6 +296,7 @@ void buildTestInterface(FICL_SYSTEM *pSy + ficlBuild(pSys, "cd", ficlChDir, FW_DEFAULT); + ficlBuild(pSys, "execxt", execxt, FW_DEFAULT); + ficlBuild(pSys, "load", ficlLoad, FW_DEFAULT); ++ ficlBuild(pSys, "include", ficlLoad, FW_DEFAULT); + 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) buildTestInterface(pSys); pVM = ficlNewVM(pSys); @@ -9,16 +17,28 @@ + ficlEvaluate(pVM, "vocabulary support-functions"); + ficlEvaluate(pVM, ": contains? ( -- ) FALSE ;"); + ficlEvaluate(pVM, ": any_conf_read? ( -- ) FALSE ;"); ++ ficlEvaluate(pVM, ": boot_serial? ( -- ) TRUE ;"); + ficlEvaluate(pVM, ": load_kernel ( -- ) ;"); + ficlEvaluate(pVM, ": load_modules ( -- ) ;"); + ficlEvaluate(pVM, ": delay_execute ( -- ) ;"); ++ ficlEvaluate(pVM, ": boot ( -- ) ;"); ++ ficlEvaluate(pVM, ": reboot ( -- ) ;"); ++ ficlEvaluate(pVM, ": load_xen_throw ( -- ) ;"); + ficlEvaluate(pVM, "variable logoX"); + ficlEvaluate(pVM, "variable logoY"); ++ ficlEvaluate(pVM, "variable brandX"); ++ ficlEvaluate(pVM, "variable brandY"); + + sprintf(in, "load %s", "/boot/screen.4th"); + ficlEvaluate(pVM, in); + sprintf(in, "load %s", "/boot/beastie.4th"); + ficlEvaluate(pVM, in); ++ sprintf(in, "load %s", "/boot/brand.4th"); ++ ficlEvaluate(pVM, in); ++ sprintf(in, "load %s", "/boot/frames.4th"); ++ ficlEvaluate(pVM, in); ++ sprintf(in, "load %s", "/boot/menu.4th"); ++ ficlEvaluate(pVM, in); /* ** load file from cmd line... @@ -26,15 +46,23 @@ if (argc > 1) { - sprintf(in, ".( loading %s ) cr load %s\n cr", argv[1], argv[1]); -+ sprintf(in, "load %s", argv[1], argv[1]); ++ char *brand = "/boot/brand-fbsd.4th"; ++ sprintf(in, "load %s", argv[1]); ++ ficlEvaluate(pVM, in); ++ if (argc > 2) { ++ brand = argv[2]; ++ } ++ sprintf(in, "load %s", brand); ficlEvaluate(pVM, in); + } else { -+ fprintf(stderr, "usage: %s \n", argv[0]); ++ fprintf(stderr, "usage: %s []\n", argv[0]); + return 1; } + system("clear"); + ficlEvaluate(pVM, "draw-beastie"); ++ ficlEvaluate(pVM, "draw-brand"); ++ ficlEvaluate(pVM, "menu-init"); + printf("\n\n"); + return 0; +