From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 04:27:40 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E799095D; Wed, 30 Oct 2013 04:27:40 +0000 (UTC) (envelope-from danilo@FreeBSD.org) 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 BA0D821A9; Wed, 30 Oct 2013 04:27:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9U4Re4l002392; Wed, 30 Oct 2013 04:27:40 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9U4ReaL002390; Wed, 30 Oct 2013 04:27:40 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201310300427.r9U4ReaL002390@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Wed, 30 Oct 2013 04:27:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332062 - head/games/awale X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 04:27:41 -0000 Author: danilo Date: Wed Oct 30 04:27:40 2013 New Revision: 332062 URL: http://svnweb.freebsd.org/changeset/ports/332062 Log: - Add stage support - Use options helpers - Fix wish8.4 dependency Modified: head/games/awale/Makefile head/games/awale/pkg-plist Modified: head/games/awale/Makefile ============================================================================== --- head/games/awale/Makefile Wed Oct 30 04:08:17 2013 (r332061) +++ head/games/awale/Makefile Wed Oct 30 04:27:40 2013 (r332062) @@ -11,46 +11,37 @@ COMMENT= African board game OPTIONS_DEFINE= GUI DOCS OPTIONS_DEFAULT= GUI +OPTIONS_SUB= yes GUI_DESC= Installs Tcl/Tk GUI -MAN6= ${PORTNAME}.6 +GUI_RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MGUI} -USE_TK_WRAPPER= yes -MAN6+= x${PORTNAME}.6 -PLIST_SUB+= GUI="" -.else -PLIST_SUB+= GUI="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e '/bin\/bash/d' ${WRKSRC}/src/xawale.tcl @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/src/x${PORTNAME} @${ECHO_CMD} "${DATADIR}/xawale.tcl" >> ${WRKSRC}/src/x${PORTNAME} + @${REINPLACE_CMD} -e 's|wish|wish8.4|' ${WRKSRC}/src/xawale.tcl do-build: (cd ${WRKSRC}/src && ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.6 ${MAN6PREFIX}/man/man6 - @${MKDIR} ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 + @${MKDIR} ${STAGEDIR}${DATADIR} .for f in README *.bmp *.gif *.ico *.png - ${INSTALL_DATA} ${WRKSRC}/src/${f} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/src/${f} ${STAGEDIR}${DATADIR} .endfor .if ${PORT_OPTIONS:MGUI} - ${INSTALL_SCRIPT} ${WRKSRC}/src/x${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/x${PORTNAME}.6 ${MAN6PREFIX}/man/man6 - ${INSTALL_SCRIPT} ${WRKSRC}/src/xawale.tcl ${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/src/x${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/x${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 + ${INSTALL_SCRIPT} ${WRKSRC}/src/xawale.tcl ${STAGEDIR}${DATADIR} .endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS ChangeLog NEWS README THANKS - cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: head/games/awale/pkg-plist ============================================================================== --- head/games/awale/pkg-plist Wed Oct 30 04:08:17 2013 (r332061) +++ head/games/awale/pkg-plist Wed Oct 30 04:27:40 2013 (r332062) @@ -1,4 +1,6 @@ bin/awale +man/man6/awale.6.gz +%%GUI%%man/man6/xawale.6.gz %%GUI%%bin/xawale %%DATADIR%%/AwaleBanner.bmp %%DATADIR%%/README