Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Apr 2014 18:33:50 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351358 - head/games/nehquake
Message-ID:  <201404151833.s3FIXoKV072334@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
@@ -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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404151833.s3FIXoKV072334>