From owner-svn-ports-all@FreeBSD.ORG Tue Dec 31 08:51:36 2013 Return-Path: Delivered-To: svn-ports-all@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 33D8EE55; Tue, 31 Dec 2013 08:51:36 +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 1F9611FAB; Tue, 31 Dec 2013 08:51:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBV8pZi7096680; Tue, 31 Dec 2013 08:51:35 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBV8pZ0i096679; Tue, 31 Dec 2013 08:51:35 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312310851.rBV8pZ0i096679@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 31 Dec 2013 08:51:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338264 - head/games/wordplay 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.17 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: Tue, 31 Dec 2013 08:51:36 -0000 Author: nemysis Date: Tue Dec 31 08:51:35 2013 New Revision: 338264 URL: http://svnweb.freebsd.org/changeset/ports/338264 Log: - Support STAGEDIR - Add DOCS Option Approved by: pawel / wg (mentors, implicit) Modified: head/games/wordplay/Makefile Modified: head/games/wordplay/Makefile ============================================================================== --- head/games/wordplay/Makefile Tue Dec 31 08:43:18 2013 (r338263) +++ head/games/wordplay/Makefile Tue Dec 31 08:51:35 2013 (r338264) @@ -19,8 +19,7 @@ PORTDOCS= readme PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/words721.txt PLIST_DIRS= %%DATADIR%% -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|CC=gcc|CC?=g++|' ${WRKSRC}/makefile @@ -31,12 +30,11 @@ do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${PORTNAME}.c -o ${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/words721.txt ${DATADIR} -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/words721.txt ${STAGEDIR}${DATADIR} + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include