svn commit: r337887 - in branches/2014Q1/games/tuxpuck: . files

[Pawel Pekala]

Author: pawel
Date: Sat Dec 28 17:58:09 2013
New Revision: 337887
URL: http://svnweb.freebsd.org/changeset/ports/337887

Log:
  MFH: r337448
  
  Respect CC
  
  PR:		ports/184231
  Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>
  Approved by:    portmgr

Modified:
  branches/2014Q1/games/tuxpuck/Makefile
  branches/2014Q1/games/tuxpuck/files/patch-Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/tuxpuck/Makefile
==============================================================================
--- branches/2014Q1/games/tuxpuck/Makefile	Sat Dec 28 17:45:18 2013	(r337886)
+++ branches/2014Q1/games/tuxpuck/Makefile	Sat Dec 28 17:58:09 2013	(r337887)
@@ -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: branches/2014Q1/games/tuxpuck/files/patch-Makefile
==============================================================================
--- branches/2014Q1/games/tuxpuck/files/patch-Makefile	Sat Dec 28 17:45:18 2013	(r337886)
+++ branches/2014Q1/games/tuxpuck/files/patch-Makefile	Sat Dec 28 17:58:09 2013	(r337887)
@@ -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