From owner-svn-ports-all@FreeBSD.ORG Tue Apr 15 18:33:50 2014 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 ESMTPS id BEB91C0F; Tue, 15 Apr 2014 18:33:50 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91B111CBE; Tue, 15 Apr 2014 18:33:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3FIXoGl072336; Tue, 15 Apr 2014 18:33:50 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3FIXoKV072334; Tue, 15 Apr 2014 18:33:50 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404151833.s3FIXoKV072334@svn.freebsd.org> From: Pawel Pekala Date: Tue, 15 Apr 2014 18:33:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351358 - head/games/nehquake 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, 15 Apr 2014 18:33:50 -0000 Author: pawel Date: Tue Apr 15 18:33:49 2014 New Revision: 351358 URL: http://svnweb.freebsd.org/changeset/ports/351358 QAT: https://qat.redports.org/buildarchive/r351358/ Log: - Add staging support - Convert to USES=tar:bzip2 - Use options helpers and subs Modified: head/games/nehquake/Makefile head/games/nehquake/pkg-plist Modified: head/games/nehquake/Makefile ============================================================================== --- head/games/nehquake/Makefile Tue Apr 15 17:45:54 2014 (r351357) +++ head/games/nehquake/Makefile Tue Apr 15 18:33:49 2014 (r351358) @@ -12,19 +12,22 @@ DISTNAME= NehQuake-bjp-bin-src.linux MAINTAINER= ports@FreeBSD.org COMMENT= Quake engine designed for playing Nehahra -USES= gmake dos2unix -USE_BZIP2= yes +USES= gmake dos2unix tar:bzip2 USE_GL= gl USE_XORG= xxf86dga OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL X86_ASM OPTIONS_DEFAULT= OPTIMIZED_CFLAGS SDL X86_ASM +OPTIONS_SUB= yes + +SDL_USE= SDL=sdl +SDL_MAKE_ENV= BUILD_SDL=YES + X86_ASM_DESC= Enable x86 assembly code ALL_TARGET= release SUB_FILES= pkg-message -NO_STAGE= yes .include "${.CURDIR}/../quake-data/Makefile.include" .include @@ -37,24 +40,11 @@ MAKE_ENV+= USE_${f}=NO . endif .endfor -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -MAKE_ENV+= BUILD_SDL=YES -PLIST_SUB+= SDL="" -.else -PLIST_SUB+= SDL="@comment " -.endif - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MSDL} - ${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra-sdl ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra-sdl ${STAGEDIR}${PREFIX}/bin .endif - ${MKDIR} ${Q1DIR}/nehahra - -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} + @${MKDIR} ${STAGEDIR}${Q1DIR}/nehahra .include Modified: head/games/nehquake/pkg-plist ============================================================================== --- head/games/nehquake/pkg-plist Tue Apr 15 17:45:54 2014 (r351357) +++ head/games/nehquake/pkg-plist Tue Apr 15 18:33:49 2014 (r351358) @@ -1,3 +1,4 @@ bin/nehahra %%SDL%%bin/nehahra-sdl -@unexec rmdir %D/%%Q1DIR%%/nehahra 2>/dev/null || echo "If you are permanently removing this port, you should remove any configuration files and data files left in %D/%%Q1DIR%%/nehahra." | fmt +@dirrmtry %%Q1DIR%%/nehahra +@exec mkdir -p %D/%%Q1DIR%%/nehahra