From owner-svn-ports-head@FreeBSD.ORG Wed Nov 27 20:42:46 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 760B27B7; Wed, 27 Nov 2013 20:42:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6579926FE; Wed, 27 Nov 2013 20:42:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARKgk80031775; Wed, 27 Nov 2013 20:42:46 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARKgkip031773; Wed, 27 Nov 2013 20:42:46 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201311272042.rARKgkip031773@svn.freebsd.org> From: Dirk Meyer Date: Wed, 27 Nov 2013 20:42:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335056 - head/emulators/stonx 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.16 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: Wed, 27 Nov 2013 20:42:46 -0000 Author: dinoex Date: Wed Nov 27 20:42:45 2013 New Revision: 335056 URL: http://svnweb.freebsd.org/changeset/ports/335056 Log: - use OPTIONS_DEFINE - fix option EXAMPLES Modified: head/emulators/stonx/Makefile head/emulators/stonx/pkg-plist Modified: head/emulators/stonx/Makefile ============================================================================== --- head/emulators/stonx/Makefile Wed Nov 27 20:42:14 2013 (r335055) +++ head/emulators/stonx/Makefile Wed Nov 27 20:42:45 2013 (r335056) @@ -13,7 +13,8 @@ COMMENT= AtariST emulator BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ gccmakedep:${PORTSDIR}/devel/gccmakedep \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ + ${LOCALBASE}/lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir RESTRICTED= tos.img is copyrighted @@ -26,11 +27,6 @@ CONFIGURE_ARGS= --x-includes=${LOCALBASE --x-libraries=${LOCALBASE}/lib ALL_TARGET= all fnttobdf tosfonts fonts -pre-build: - ${CP} ${DISTDIR}/${TOSIMG} ${WRKSRC}/tos.img - -# Installing -# BINDIR= ${PREFIX}/bin FNTDIR= ${PREFIX}/lib/X11/fonts/misc @@ -41,6 +37,11 @@ DOCS= ../COPYING AUTHORS DEBUGGING INSTA FONTS= System0-iso.pcf System0.pcf System1-iso.pcf System1.pcf \ System2-iso.pcf System2.pcf +.include + +pre-build: + ${CP} ${DISTDIR}/${TOSIMG} ${WRKSRC}/tos.img + post-install: .for f in ${ETCFILES} ${INSTALL_DATA} ${WRKSRC}/etc/$f ${ETCDIR}/ @@ -48,32 +49,25 @@ post-install: @${ECHO_MSG} "===> Installing fonts" .for f in ${FONTS} ${INSTALL_DATA} ${WRKSRC}/data/$f ${FNTDIR}/ - @${GZIP_CMD} ${FNTDIR}/$f -.endfor - @mkfontdir ${FNTDIR} -.if !defined(NOPORTDOCS) - @${ECHO_MSG} "===> Installing docs" - @${MKDIR} ${DOCSDIR} -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/$f ${DOCSDIR}/ -.endfor - @${MKDIR} ${EXAMPLESDIR} -.for f in ${DATA} - ${INSTALL_DATA} ${WRKSRC}/$f ${EXAMPLESDIR}/ + ${GZIP_CMD} ${FNTDIR}/$f .endfor + mkfontdir ${FNTDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/docs/,} ${DOCSDIR}/ +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${DATA:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/ .endif .if (defined(DISPLAY) && ${DISPLAY} != "") - @xset fp+ ${FNTDIR} - @xset fp rehash + xset fp+ ${FNTDIR} + xset fp rehash .endif -.include - .if !exists(${DISTDIR}/${TOSIMG}) IGNORE= please get a ROM dump from your AtariST and save it as\ "${TOSIMG}" in "${DISTDIR}" manually, and then make again .endif -BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc - -.include +.include Modified: head/emulators/stonx/pkg-plist ============================================================================== --- head/emulators/stonx/pkg-plist Wed Nov 27 20:42:14 2013 (r335055) +++ head/emulators/stonx/pkg-plist Wed Nov 27 20:42:45 2013 (r335056) @@ -22,10 +22,10 @@ lib/X11/fonts/misc/System2.pcf.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%%%DOCSDIR%%/TOS-VERSIONS -%%PORTDOCS%%%%EXAMPLESDIR%%/bench1.pas -%%PORTDOCS%%%%EXAMPLESDIR%%/bench1.prg -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench1.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench1.prg +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%%/gemdos_c/mint @dirrm %%DATADIR%%/gemdos_c @dirrm %%DATADIR%%