From owner-svn-ports-head@FreeBSD.ORG Sat Nov 30 07:08:52 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 08F5891A; Sat, 30 Nov 2013 07:08:52 +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 DDDD61012; Sat, 30 Nov 2013 07:08:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAU78pvd022759; Sat, 30 Nov 2013 07:08:51 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAU78pXe022758; Sat, 30 Nov 2013 07:08:51 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201311300708.rAU78pXe022758@svn.freebsd.org> From: Dirk Meyer Date: Sat, 30 Nov 2013 07:08:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335265 - head/emulators/frodo 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: Sat, 30 Nov 2013 07:08:52 -0000 Author: dinoex Date: Sat Nov 30 07:08:51 2013 New Revision: 335265 URL: http://svnweb.freebsd.org/changeset/ports/335265 Log: - use STAGEDIR - use OPTIONS_DEFINE Modified: head/emulators/frodo/Makefile Modified: head/emulators/frodo/Makefile ============================================================================== --- head/emulators/frodo/Makefile Sat Nov 30 06:53:59 2013 (r335264) +++ head/emulators/frodo/Makefile Sat Nov 30 07:08:51 2013 (r335265) @@ -12,23 +12,27 @@ COMMENT= Emulates a Commodore 64 RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 -NO_STAGE= yes - USE_XORG= x11 xt xext sm ice ALL_TARGET= Frodo -WRKNAME= Frodo-4.1b -WRKSRC= ${WRKDIR}/${WRKNAME}/Src +INSTALL_WRKSRC= ${WRKDIR}/Frodo-4.1b +WRKSRC= ${INSTALL_WRKSRC}/Src GNU_CONFIGURE= yes -.if !defined(WITHOUT_SDL) -USE_SDL= sdl -.endif ROM= 1541 Basic Char Kernal +OPTIONS_DEFINE=SDL +OPTIONS_DEFAULT=SDL + +.include + +.if ${PORT_OPTIONS:MSDL} +USE_SDL= sdl +.endif + post-patch: ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ - ${WRKDIR}/${WRKNAME}/TkGui.tcl -.if !defined(WITHOUT_SDL) + ${INSTALL_WRKSRC}/TkGui.tcl +.if ${PORT_OPTIONS:MSDL} ${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|g" \ ${WRKSRC}/configure .endif @@ -36,25 +40,24 @@ post-patch: do-install: ${SED} -e 's=\$${PREFIX}=${PREFIX}=g' \ < ${FILESDIR}/frodo > ${WRKDIR}/frodo - ${INSTALL_SCRIPT} ${WRKDIR}/frodo ${PREFIX}/bin - ${MKDIR} ${PREFIX}/libexec/frodo - ${INSTALL_PROGRAM} ${WRKDIR}/${WRKNAME}/Frodo ${PREFIX}/libexec/frodo + ${INSTALL_SCRIPT} ${WRKDIR}/frodo ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/frodo + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/Frodo ${STAGEDIR}${PREFIX}/libexec/frodo/ .for i in ${ROM} - ${INSTALL_DATA} "${WRKDIR}/${WRKNAME}/${i} ROM" ${PREFIX}/libexec/frodo + ${INSTALL_DATA} "${INSTALL_WRKSRC}/${i} ROM" ${STAGEDIR}${PREFIX}/libexec/frodo/ .endfor - ${INSTALL_DATA} "${WRKDIR}/${WRKNAME}/Frodo Logo" ${PREFIX}/libexec/frodo - ${INSTALL_SCRIPT} "${WRKDIR}/${WRKNAME}/TkGui.tcl" ${PREFIX}/libexec/frodo - ${MKDIR} ${PREFIX}/libexec/frodo/64prgs - @${TAR} -C ${WRKDIR}/${WRKNAME}/64prgs -cf - . | \ - ${TAR} -C ${PREFIX}/libexec/frodo/64prgs -xf - + ${INSTALL_DATA} "${INSTALL_WRKSRC}/Frodo Logo" ${STAGEDIR}${PREFIX}/libexec/frodo/ + ${INSTALL_SCRIPT} "${INSTALL_WRKSRC}/TkGui.tcl" ${STAGEDIR}${PREFIX}/libexec/frodo/ + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/frodo/64prgs + ${TAR} -C ${INSTALL_WRKSRC}/64prgs -cf - . | \ + ${TAR} -C ${STAGEDIR}${PREFIX}/libexec/frodo/64prgs -xf - +.if ${PORT_OPTIONS:MDOCS} post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in CHANGES - ${INSTALL_DATA} ${WRKDIR}/${WRKNAME}/${i} ${DOCSDIR}/ -.endfor - @${TAR} -C ${WRKDIR}/${WRKNAME}/Docs -cf - . | ${TAR} -C ${DOCSDIR} -xf - + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${INSTALL_WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}/ + ${TAR} -C ${INSTALL_WRKSRC}/Docs -cf - . | \ + ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf - .endif .include