From tkato432@yahoo.com  Sun Jan  5 18:00:55 2014
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 8ADBE73A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  5 Jan 2014 18:00:40 +0000 (UTC)
Received: from omta02.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C0141661
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  5 Jan 2014 18:00:40 +0000 (UTC)
Received: from coppermine.my.domain (ZT034124.ppp.dion.ne.jp [59.128.34.124])
	by omta02.auone-net.jp (au one net mail) with ESMTP id EF3B9156000B
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon,  6 Jan 2014 03:00:37 +0900 (JST)
Message-Id: <20140106025443.e88009673716c0b0cfcc1557@yahoo.com>
Date: Mon, 6 Jan 2014 02:54:43 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: games/typespeed: Support CC properly

>Number:         185502
>Category:       ports
>Synopsis:       games/typespeed: Support CC properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 05 18:10:01 UTC 2014
>Closed-Date:    Fri Feb 07 16:11:11 UTC 2014
>Last-Modified:  Fri Feb 07 16:11:11 UTC 2014
>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/typespeed/Makefile games/typespeed/Makefile
--- /usr/ports/games/typespeed/Makefile	2013-11-06 22:01:09.000000000 +0900
+++ games/typespeed/Makefile	2014-01-06 00:00:00.000000000 +0900
@@ -3,63 +3,62 @@
 
 PORTNAME=	typespeed
 PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Test your typing speed and get your fingers\' CPS
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-highscoredir="/var/games/typespeed"
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-SCOREPREFIX?=	/var/games
-SCOREDIR=	${SCOREPREFIX}/typespeed
-SCOREFILE=	typespeed.score
+USES=		ncurses
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-highscoredir="${SCOREDIR}"
 
 CFLAGS+=	-I${LOCALBASE}/include -DWITH_HIGHSCOREDIR=\"${SCOREDIR}\"  \
 		-DHIGHDIR=\"${SCOREDIR}\" -DHIGHSCOREDIR=\"${SCOREDIR}\"
 
 SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	SCOREDIR="${SCOREDIR}" SCOREFILE="${SCOREFILE}" WRKSRC="${WRKSRC}"
-MAN1=		typespeed.1
+SUB_LIST=	SCOREDIR="${SCOREDIR}" SCOREFILE="${SCOREFILE}"
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+SCOREPREFIX?=	/var/games
+SCOREDIR=	${SCOREPREFIX}/typespeed
+SCOREFILE=	typespeed.score
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|\(/etc\)|${PREFIX}\1|' \
-		${WRKSRC}/src/pathnames.h
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|^\(CC =\).*|\1 @CC@|'
+	@${REINPLACE_CMD} -e \
+		's|\(/etc\)|${PREFIX}\1|' ${WRKSRC}/src/pathnames.h
 
 do-install:
-	${INSTALL_PROGRAM} -g games -m 2555 ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/convert ${PREFIX}/bin/${PORTNAME}-hs-conv
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.6 ${MANPREFIX}/man/man1/${MAN1}
-	${INSTALL_DATA} ${WRKSRC}/etc/typespeedrc ${PREFIX}/etc/typespeedrc.dist
-.if !exists(${PREFIX}/etc/typespeedrc)
-	${INSTALL_DATA} ${WRKSRC}/etc/typespeedrc ${PREFIX}/etc
-.endif
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/words
-	${FIND} ${WRKSRC}/words/ -name "words.*" -type f \
-		-exec ${INSTALL_DATA} {} ${DATADIR}/words \;
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} ${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} convert \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-hs-conv)
+	(cd ${WRKSRC}/man && ${INSTALL_MAN} ${PORTNAME}.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/man6)
+	(cd ${WRKSRC}/etc && ${INSTALL_DATA} typespeedrc \
+		${STAGEDIR}${PREFIX}/etc/typespeedrc.dist)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/src && ${INSTALL_DATA} ${SCOREFILE} \
+		${STAGEDIR}${DATADIR}/${SCOREFILE}.default)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/words
+	(cd ${WRKSRC}/words && ${INSTALL_DATA} words.* \
+		${STAGEDIR}${DATADIR}/words)
 .if ${PORT_OPTIONS:MNLS}
 .for i in de_DE fr_FR it
-	${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \
-		${PREFIX}/share/locale/${i}/LC_MESSAGES/typespeed.mo
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
+	(cd ${WRKSRC}/po && ${INSTALL_DATA} ${i}.gmo \
+		${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/typespeed.mo)
 .endfor
 .endif
 
-post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include <bsd.port.mk>
diff -urN /usr/ports/games/typespeed/files/pkg-install.in games/typespeed/files/pkg-install.in
--- /usr/ports/games/typespeed/files/pkg-install.in	2013-11-06 22:01:09.000000000 +0900
+++ games/typespeed/files/pkg-install.in	2014-01-06 00:00:00.000000000 +0900
@@ -4,7 +4,6 @@
 
 SCOREDIR="%%SCOREDIR%%"
 SCOREFILE="%%SCOREFILE%%"
-WRKSRC="%%WRKSRC%%"
 
 [ "$2" != "POST-INSTALL" ] && exit 0
 
@@ -13,7 +12,7 @@
 	chown root:games ${SCOREDIR}
 fi
 
-install -o root -g games -m 0464 ${WRKSRC}/src/${SCOREFILE} ${SCOREDIR}/${SCOREFILE}.default
+install -o root -g games -m 0464 ${PKG_PREFIX}/share/typespeed/${SCOREFILE}.default ${SCOREDIR}/${SCOREFILE}.default
 
 file="${SCOREDIR}/${SCOREFILE}"
 if [ -f "$file" ]; then
diff -urN /usr/ports/games/typespeed/pkg-plist games/typespeed/pkg-plist
--- /usr/ports/games/typespeed/pkg-plist	2013-11-06 22:01:09.000000000 +0900
+++ games/typespeed/pkg-plist	2014-01-06 00:00:00.000000000 +0900
@@ -1,11 +1,17 @@
+@group games
+@mode 2555
 bin/typespeed
+@mode
+@group
 bin/typespeed-hs-conv
 @unexec if cmp -s %D/etc/typespeedrc %D/etc/typespeedrc.dist; then rm -f %D/etc/typespeedrc; fi
 etc/typespeedrc.dist
 @exec [ -f %B/typespeedrc ] || cp %B/%f %B/typespeedrc
+man/man6/typespeed.6.gz
 %%NLS%%share/locale/de_DE/LC_MESSAGES/typespeed.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/typespeed.mo
 %%NLS%%share/locale/it/LC_MESSAGES/typespeed.mo
+%%DATADIR%%/typespeed.score.default
 %%DATADIR%%/words/words.csharp
 %%DATADIR%%/words/words.csharp_with_operators
 %%DATADIR%%/words/words.dos
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Jan 23 15:48:25 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185502 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Sat Jan 25 15:38:49 UTC 2014 
State-Changed-Why:  
build fails on 8.X 
http://pkgdev.miwibox.org/84amd64-default/2014-01-25_14h25m34s/logs/errors/typespeed-0.6.5_2.log 
http://pkgdev.miwibox.org/84i386-default/2014-01-25_14h25m34s/logs/errors/typespeed-0.6.5_2.log 

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

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185502: games/typespeed: Support CC properly
Date: Mon, 27 Jan 2014 02:57:04 +0900

 At least, recognizing /var/games as leftover is obviously
 incorrect behavior.
 
 There is probably something wrong with poudriere. Although it has
 a dedicated routine for 8.3 to handle standard directory tree, it
 cares nothing about 8.4.
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Feb 7 16:11:10 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185502 
>Unformatted:
