From owner-svn-ports-head@freebsd.org Fri Jun 24 15:14:48 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 D0423B80534; Fri, 24 Jun 2016 15:14:48 +0000 (UTC) (envelope-from amdmi3@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 921A411EC; Fri, 24 Jun 2016 15:14:48 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5OFElDl050508; Fri, 24 Jun 2016 15:14:47 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5OFElHe050507; Fri, 24 Jun 2016 15:14:47 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201606241514.u5OFElHe050507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 24 Jun 2016 15:14:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417430 - head/emulators/klh10 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.22 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: Fri, 24 Jun 2016 15:14:48 -0000 Author: amdmi3 Date: Fri Jun 24 15:14:47 2016 New Revision: 417430 URL: https://svnweb.freebsd.org/changeset/ports/417430 Log: - Switch to options helpers - Cosmetic fixes Modified: head/emulators/klh10/Makefile Modified: head/emulators/klh10/Makefile ============================================================================== --- head/emulators/klh10/Makefile Fri Jun 24 14:54:30 2016 (r417429) +++ head/emulators/klh10/Makefile Fri Jun 24 15:14:47 2016 (r417430) @@ -16,8 +16,6 @@ ONLY_FOR_ARCHS= i386 BUILD_WRKSRC= ${WRKSRC}/bld/fbx86 INSTALL_WRKSRC= ${BUILD_WRKSRC} -OPTIONS_DEFINE= DOCS - # someday add support for base-kl and base-ks targets MAKE_ENV= KLH10_HOME="${DATADIR}" ALL_TARGET= base-ks-its @@ -77,6 +75,8 @@ KSITS_DOCS= Intro.txt \ utils.txt \ vtape.txt +OPTIONS_DEFINE= DOCS + post-patch: @${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \ 's|logf |log_f |g ; \ @@ -86,38 +86,32 @@ post-patch: do-install: .for i in ${KSITS_NATIVE_PROGS} - cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} ${i} \ - ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin .endfor - @ ${MKDIR} ${STAGEDIR}${KSITS_DRIVER_DIR} + @${MKDIR} ${STAGEDIR}${KSITS_DRIVER_DIR} .for i in ${KSITS_EM_DRIVERS} ${KSITS_EM_SDRIVERS} - cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} ${i} \ - ${STAGEDIR}${KSITS_DRIVER_DIR} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${i} ${STAGEDIR}${KSITS_DRIVER_DIR} .endfor - @ ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} .for i in ${KSITS_EM_DAT} - cd ${WRKSRC}/run/ksits && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/run/ksits/${i} ${STAGEDIR}${DATADIR} .endfor - @ ${MKDIR} ${STAGEDIR}${DATADIR}/flushed - @ ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${FILESDIR} && ${INSTALL_DATA} PDPs \ - ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/run/ksits && ${INSTALL_DATA} README \ - ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/flushed + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/PDPs ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/run/ksits/README ${STAGEDIR}${DOCSDIR} .for i in ${KSITS_DOCS} - cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor - @ ${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/adm + @${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/adm .for i in ${KSITS_PUBADM} - cd ${WRKSRC}/run/ksits/pubits/adm && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${DOCSDIR}/pubits/adm + ${INSTALL_DATA} ${WRKSRC}/run/ksits/pubits/adm/${i} ${STAGEDIR}${DOCSDIR}/pubits/adm .endfor - @ ${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/doc + @${MKDIR} ${STAGEDIR}${DOCSDIR}/pubits/doc .for i in ${KSITS_PUBDOC} - cd ${WRKSRC}/run/ksits/pubits/doc && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${DOCSDIR}/pubits/doc + ${INSTALL_DATA} ${WRKSRC}/run/ksits/pubits/doc/${i} ${STAGEDIR}${DOCSDIR}/pubits/doc .endfor .include