From owner-svn-ports-head@FreeBSD.ORG Tue Nov 26 15:51:22 2013 Return-Path: Delivered-To: svn-ports-head@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 104C5977; Tue, 26 Nov 2013 15:51:22 +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 E5B5527A9; Tue, 26 Nov 2013 15:51:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQFpLue030536; Tue, 26 Nov 2013 15:51:21 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQFpLSd030534; Tue, 26 Nov 2013 15:51:21 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311261551.rAQFpLSd030534@svn.freebsd.org> From: William Grzybowski Date: Tue, 26 Nov 2013 15:51:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334950 - head/games/nighthawk 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: Tue, 26 Nov 2013 15:51:22 -0000 Author: wg Date: Tue Nov 26 15:51:21 2013 New Revision: 334950 URL: http://svnweb.freebsd.org/changeset/ports/334950 Log: games/nighthawk: Support CC/CFLAGS properly - Support CC/CFLAGS properly - Allow staging - USES gmake PR: ports/184221 Submitted by: KATO Tsuguru Modified: head/games/nighthawk/Makefile head/games/nighthawk/pkg-plist Modified: head/games/nighthawk/Makefile ============================================================================== --- head/games/nighthawk/Makefile Tue Nov 26 15:45:50 2013 (r334949) +++ head/games/nighthawk/Makefile Tue Nov 26 15:51:21 2013 (r334950) @@ -5,28 +5,24 @@ PORTNAME= nighthawk PORTVERSION= 3.0.0 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= games/arcade +MASTER_SITES= SUNSITE/games/arcade MAINTAINER= ports@FreeBSD.org -COMMENT= An X11 shoot-'em up which requires some lateral thinking +COMMENT= X11 shoot-'em up which requires some lateral thinking WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes +USES= gmake USE_GL= glut -USE_GMAKE= yes MAKE_ARGS= CC="${CC}" CPP="${CXX}" CC_FLAGS="${CXXFLAGS}" \ - LIB_FLAGS="${LDFLAGS}" - -MAN6= nighthawk.6 + LIB_FLAGS="${LDFLAGS}" GCC="${CC}" CFLAGS="${CFLAGS}" CFLAGS+= -DINSTALL_DIR=\\\"\${DATADIR}\\\" \ -DSCORES_FILE=\\\"/var/games/nighthawk.scores\\\" \ -I${LOCALBASE}/include LDFLAGS+= -lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut -NO_STAGE= yes post-patch: ${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ 's|make|$$(MAKE)|g ; \ @@ -36,16 +32,12 @@ post-patch: ${REINPLACE_CMD} -e 's|^|#|g' ${WRKSRC}/config.user do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/nighthawk ${PREFIX}/bin - ${CHOWN} root:games ${PREFIX}/bin/nighthawk - ${CHMOD} g+s ${PREFIX}/bin/nighthawk - ${INSTALL_DATA} ${WRKSRC}/doc/nighthawk.6 ${MANPREFIX}/man/man6 - @${MKDIR} ${DATADIR} + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} nighthawk \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/doc && ${INSTALL_MAN} nighthawk.6 \ + ${STAGEDIR}${MANPREFIX}/man/man6) + @${MKDIR} ${STAGEDIR}${DATADIR} ${TAR} -C ${WRKSRC} --exclude ".xvpics" -cf - data | \ - ${TAR} -C ${DATADIR} --unlink -xf - - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} - @${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} - @${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx - @${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL + ${TAR} -C ${STAGEDIR}${DATADIR} --unlink -xf - .include Modified: head/games/nighthawk/pkg-plist ============================================================================== --- head/games/nighthawk/pkg-plist Tue Nov 26 15:45:50 2013 (r334949) +++ head/games/nighthawk/pkg-plist Tue Nov 26 15:51:21 2013 (r334950) @@ -1,4 +1,11 @@ +@owner root +@group games +@mode 6755 bin/nighthawk +@owner +@group +@mode +man/man6/nighthawk.6.gz %%DATADIR%%/data/Anoyle/Bridge.f %%DATADIR%%/data/Anoyle/Bridge.m %%DATADIR%%/data/Anoyle/Engineering.f @@ -215,4 +222,4 @@ bin/nighthawk @dirrm %%DATADIR%%/data/Anoyle @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% -@unexec if [ -s /var/games/nighthawk.scores ] || rm -f /var/games/nighthawk.scores +@unexec if [ ! -s /var/games/nighthawk.scores ]; then rm -f /var/games/nighthawk.scores; fi