From owner-svn-ports-all@FreeBSD.ORG Wed Dec 25 19:45:09 2013 Return-Path: Delivered-To: svn-ports-all@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 21F2C4CD; Wed, 25 Dec 2013 19:45:09 +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 E87E71E81; Wed, 25 Dec 2013 19:45:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPJj8bs077785; Wed, 25 Dec 2013 19:45:08 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPJj86m077782; Wed, 25 Dec 2013 19:45:08 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312251945.rBPJj86m077782@svn.freebsd.org> From: Pawel Pekala Date: Wed, 25 Dec 2013 19:45:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337448 - in head/games/tuxpuck: . files 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: Wed, 25 Dec 2013 19:45:09 -0000 Author: pawel Date: Wed Dec 25 19:45:08 2013 New Revision: 337448 URL: http://svnweb.freebsd.org/changeset/ports/337448 Log: Respect CC PR: ports/184231 Submitted by: KATO Tsuguru Modified: head/games/tuxpuck/Makefile head/games/tuxpuck/files/patch-Makefile (contents, props changed) Modified: head/games/tuxpuck/Makefile ============================================================================== --- head/games/tuxpuck/Makefile Wed Dec 25 19:39:39 2013 (r337447) +++ head/games/tuxpuck/Makefile Wed Dec 25 19:45:08 2013 (r337448) @@ -22,15 +22,19 @@ USES= gmake 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 Modified: head/games/tuxpuck/files/patch-Makefile ============================================================================== --- head/games/tuxpuck/files/patch-Makefile Wed Dec 25 19:39:39 2013 (r337447) +++ head/games/tuxpuck/files/patch-Makefile Wed Dec 25 19:45:08 2013 (r337448) @@ -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