From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 24 18:10:04 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 9BB613B2 for ; Sun, 24 Nov 2013 18:10:04 +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 7C8FE2CE0 for ; Sun, 24 Nov 2013 18:10:04 +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 rAOIA40V046860 for ; Sun, 24 Nov 2013 18:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAOIA4NX046859; Sun, 24 Nov 2013 18:10:04 GMT (envelope-from gnats) Resent-Date: Sun, 24 Nov 2013 18:10:04 GMT Resent-Message-Id: <201311241810.rAOIA4NX046859@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 [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 41F342BE for ; Sun, 24 Nov 2013 18:01:47 +0000 (UTC) Received: from omta02.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145]) by mx1.freebsd.org (Postfix) with ESMTP id 183D12C7E for ; Sun, 24 Nov 2013 18:01:47 +0000 (UTC) Received: from coppermine.my.domain (ZT030024.ppp.dion.ne.jp [59.128.30.24]) by omta02.auone-net.jp (au one net mail) with ESMTP id 563D31560005 for ; Mon, 25 Nov 2013 03:01:45 +0900 (JST) Message-Id: <20131125025146.a4860e1381701a1aa08ef697@yahoo.com> Date: Mon, 25 Nov 2013 02:51:46 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184231: games/tuxpuck: Support CC 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:04 -0000 X-List-Received-Date: Sun, 24 Nov 2013 18:10:04 -0000 >Number: 184231 >Category: ports >Synopsis: games/tuxpuck: Support CC 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:04 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Support CC properly >How-To-Repeat: >Fix: diff -urN /usr/ports/games/tuxpuck/Makefile games/tuxpuck/Makefile --- /usr/ports/games/tuxpuck/Makefile 2013-11-12 18:11:17.000000000 +0900 +++ games/tuxpuck/Makefile 2013-11-25 00:00:00.000000000 +0900 @@ -22,15 +22,19 @@ ALL_TARGET= ${PORTNAME} MAKE_JOBS_UNSAFE= yes -CFLAGS+= -I${LOCALBASE}/include/libpng15 - PLIST_FILES= bin/${PORTNAME} man/man6/tuxpuck.6.gz post-patch: - cd ${WRKSRC}; \ - ${REINPLACE_CMD} 's|timer_create|_timer_create|g' \ - tuxpuck.c video.c timer.c intro.c tuxpuck.h - ${REINPLACE_CMD} -e 's|sdl-config|$$(SDL_CONFIG)|g' ${WRKSRC}/utils/Makefile +.for i in intro.c timer.c tuxpuck.c tuxpuck.h video.c + @${REINPLACE_CMD} -e \ + 's|timer_create|_timer_create|g' ${WRKSRC}/${i} +.endfor +.for i in data utils + @${REINPLACE_CMD} -e \ + 's|^CC|#CC| ; \ + s|^CFLAGS|#CFLAGS| ; \ + s|sdl-config|$$(SDL_CONFIG)|' ${WRKSRC}/${i}/Makefile +.endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff -urN /usr/ports/games/tuxpuck/files/patch-Makefile games/tuxpuck/files/patch-Makefile --- /usr/ports/games/tuxpuck/files/patch-Makefile 2013-11-06 22:00:20.000000000 +0900 +++ games/tuxpuck/files/patch-Makefile 2013-11-25 00:00:00.000000000 +0900 @@ -16,12 +16,12 @@ %.o : %.c - $(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $< -+ $(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` -c -o $@ $< ++ $(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` `libpng-config --cflags` -c -o $@ $< $(NAME) : $(OBJS) cd data; $(MAKE) - $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \ -+ $(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` -lm -lpng \ ++ $(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` `libpng-config --libs` -lm \ -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME) w32icon.o : data/icons/tuxpuck.ico >Release-Note: >Audit-Trail: >Unformatted: