pkgsrc-WIP-changes archive

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

bosh: Build with smake



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Sep 27 17:29:44 2018 +0200
Changeset:	2d837d7f996defbde466e251f85fcefd79afe382

Modified Files:
	bosh/Makefile
	bosh/TODO

Log Message:
bosh: Build with smake

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

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

diffstat:
 bosh/Makefile | 18 +++++++++---------
 bosh/TODO     |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs:
diff --git a/bosh/Makefile b/bosh/Makefile
index 229587e604..795d44ffa3 100644
--- a/bosh/Makefile
+++ b/bosh/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	schily-2018-09-26
-PKGNAME=	bosh-20160524
+PKGNAME=	bosh-20180926
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=schilytools/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,8 +13,9 @@ LICENSE=	cddl-1.0
 
 MAKE_JOBS_SAFE=	no
 
-USE_TOOLS+=	gmake tbl
-MAKE_FLAGS+=	GMAKE_NOWARN=true
+USE_TOOLS+=	tbl
+TOOL_DEPENDS+=	smake-[0-9]*:../../wip/smake
+SMAKE=		MAKEFLAGS= smake
 
 PKG_SHELL=	bin/bosh
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
@@ -25,25 +26,24 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 .include "../../wip/smake/Makefile.common"
 
 do-configure:
-	cd ${WRKSRC}/inc && ${MAKE_PROGRAM} ${MAKE_FLAGS}
+	cd ${WRKSRC}/inc && ${SMAKE}
 
 do-build:
 	cd ${WRKSRC} && for library in					\
 		libschily libxtermcap libfind libgetopt libshedit;	\
 	do								\
-		cd ${WRKSRC}/$${library} &&				\
-			${MAKE_PROGRAM} ${MAKE_FLAGS};			\
+		cd ${WRKSRC}/$${library} && ${SMAKE};			\
 	done
-	cd ${WRKSRC}/sh && ${MAKE_PROGRAM} ${MAKE_FLAGS}
+	cd ${WRKSRC}/sh && ${SMAKE}
 
 # Process tables in manpage
 post-build:
 	cd ${WRKSRC} && ${TBL} sh/sh.1 >sh/sh.1.tmp;			\
-		mv -f sh/sh.1.tmp sh/bosh.1
+		${MV} -f sh/sh.1.tmp sh/bosh.1
 
 do-test:
 	cd ${WRKSRC}/sh &&						\
-		cd tests; ${MAKE_PROGRAM} ${MAKE_FLAGS} tests
+		cd tests; ${SMAKE} test
 
 do-install:
 	cd ${WRKSRC}/sh &&						\
diff --git a/bosh/TODO b/bosh/TODO
index bc37453556..9da04dd551 100644
--- a/bosh/TODO
+++ b/bosh/TODO
@@ -7,4 +7,4 @@
     => Different behaviour (compared to ash and bash) is documented
 [X] Add obosh and pbosh variants to this package?
     => No, use separate packages
-[ ] Use smake for build
+[X] Use smake for build


Home | Main Index | Thread Index | Old Index