From tkato432@yahoo.com  Sun Nov 24 18:02:00 2013
Return-Path: <tkato432@yahoo.com>
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 <FreeBSD-gnats-submit@FreeBSD.org>; 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 <FreeBSD-gnats-submit@FreeBSD.org>; 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 <FreeBSD-gnats-submit@FreeBSD.org>; 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 <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: games/tuxpuck: Support CC properly

>Number:         184231
>Category:       ports
>Synopsis:       games/tuxpuck: Support CC properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 24 18:10:04 UTC 2013
>Closed-Date:    Wed Dec 25 19:45:21 UTC 2013
>Last-Modified:  Sat Dec 28 18:00:01 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Wed Dec 25 19:38:38 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184231 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Wed Dec 25 19:45:21 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184231 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184231: commit references a PR
Date: Wed, 25 Dec 2013 19:45:16 +0000 (UTC)

 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 <tkato432@yahoo.com>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184231: commit references a PR
Date: Sat, 28 Dec 2013 17:58:17 +0000 (UTC)

 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@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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
