From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 24 18:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 6414939D for ; Sun, 24 Nov 2013 18:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 48F402CCA for ; Sun, 24 Nov 2013 18:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOIA1Ew046750 for ; Sun, 24 Nov 2013 18:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAOIA1sN046749; Sun, 24 Nov 2013 18:10:01 GMT (envelope-from gnats) Resent-Date: Sun, 24 Nov 2013 18:10:01 GMT Resent-Message-Id: <201311241810.rAOIA1sN046749@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru 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 C02B42A6 for ; Sun, 24 Nov 2013 18:01:43 +0000 (UTC) Received: from omta03.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67]) by mx1.freebsd.org (Postfix) with ESMTP id 95E262C7D for ; Sun, 24 Nov 2013 18:01:43 +0000 (UTC) Received: from coppermine.my.domain (ZT030024.ppp.dion.ne.jp [59.128.30.24]) by omta03.auone-net.jp (au one net mail) with ESMTP id 7B431188002E for ; Mon, 25 Nov 2013 03:01:41 +0900 (JST) Message-Id: <20131125025136.01a27c29d590b160848dfb9c@yahoo.com> Date: Mon, 25 Nov 2013 02:51:36 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184221: games/nighthawk: Support CC/CFLAGS properly X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2013 18:10:01 -0000 >Number: 184221 >Category: ports >Synopsis: games/nighthawk: Support CC/CFLAGS properly >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 24 18:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Support CC/CFLAGS properly >How-To-Repeat: >Fix: diff -urN /usr/ports/games/nighthawk/Makefile games/nighthawk/Makefile --- /usr/ports/games/nighthawk/Makefile 2013-11-06 22:01:24.000000000 +0900 +++ games/nighthawk/Makefile 2013-11-25 00:00:00.000000000 +0900 @@ -5,28 +5,24 @@ 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 @@ ${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 diff -urN /usr/ports/games/nighthawk/pkg-plist games/nighthawk/pkg-plist --- /usr/ports/games/nighthawk/pkg-plist 2013-11-06 22:01:24.000000000 +0900 +++ games/nighthawk/pkg-plist 2013-11-25 00:00:00.000000000 +0900 @@ -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 @@ @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 >Release-Note: >Audit-Trail: >Unformatted: