From nobody@FreeBSD.org  Sat Jul  6 18:54:14 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 02C2A84D
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  6 Jul 2013 18:54:14 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id D02E9103E
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  6 Jul 2013 18:54:13 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r66IsDem040374
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 6 Jul 2013 18:54:13 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r66IsDJY040373;
	Sat, 6 Jul 2013 18:54:13 GMT
	(envelope-from nobody)
Message-Id: <201307061854.r66IsDJY040373@oldred.freebsd.org>
Date: Sat, 6 Jul 2013 18:54:13 GMT
From: Kevin Zheng <kevinz5000@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] Trim/cleanup/convert for games/netrek-client-cow
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         180352
>Category:       ports
>Synopsis:       [maintainer-update] Trim/cleanup/convert for games/netrek-client-cow
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 06 19:00:00 UTC 2013
>Closed-Date:    Sat Jul 06 19:29:44 UTC 2013
>Last-Modified:  Sat Jul  6 19:30:01 UTC 2013
>Originator:     Kevin Zheng
>Release:        9.1-RELEASE-p4
>Organization:
>Environment:
FreeBSD sigma.local 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:38:17 UTC 2013     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Do some cleanup work on my port. This entails:
 - Trim the Makefile header
 - Remove indefinite article
 - Switch from USE_GMAKE to USES= gmake
 - Correctly use ${PREFIX} for sound files
 - Add patch in preparation for sound support that comes with port

I don't plan to bump PORTREVISION just yet; there are no functional changes as sound support doesn't come with the port anyways.
>How-To-Repeat:

>Fix:
Apply the attached patch.

Patch attached with submission follows:

diff -ruN /usr/ports/games/netrek-client-cow/Makefile ./Makefile
--- /usr/ports/games/netrek-client-cow/Makefile	2012-11-16 23:57:46.000000000 -0600
+++ ./Makefile	2013-07-06 13:41:26.000000000 -0500
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	netrek-client-cow
-# Date created:	20 April 2012
-# Whom:	Kevin Zheng <kevinz5000@gmail.com>
-#
+# Created by: Kevin Zheng <kevinz5000@gmail.com>
 # $FreeBSD: ports/games/netrek-client-cow/Makefile,v 1.4 2012/11/17 05:57:46 svnexp Exp $
-#
 
 PORTNAME=	netrek-client-cow
 PORTVERSION=	3.3.1
@@ -13,13 +9,14 @@
 		http://quozl.us.netrek.org/netrek/
 
 MAINTAINER=	kevinz5000@gmail.com
-COMMENT=	A multi-player battle simulation with a Star Trek theme
+COMMENT=	Multi-player battle simulation with a Star Trek theme
 
 LIB_DEPENDS=	Imlib2:${PORTSDIR}/graphics/imlib2
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_SDL=	sdl mixer
+
 CONFIGURE_ARGS+=	NORSA='\#'
 
 post-patch:
@@ -28,7 +25,11 @@
 	${REINPLACE_CMD} -e 's|inline void|void|' \
 		${WRKSRC}/local.[ch]
 	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
-		${WRKSRC}/x11sprite.c ${WRKSRC}/netrek-client-cow.desktop
+		${WRKSRC}/netrek-client-cow.desktop \
+		${WRKSRC}/sound.c \
+		${WRKSRC}/x11sprite.c
+	${REINPLACE_CMD} -e 's|8000, AUDIO_U8, 1|22050, AUDIO_U8, 2|' \
+		${WRKSRC}/sound.c
 	${REINPLACE_CMD} -e 's|games|bin|' \
 		${WRKSRC}/netrek-client-cow.desktop
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Sat Jul 6 19:21:20 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180352 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Sat Jul 6 19:29:43 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180352: commit references a PR
Date: Sat,  6 Jul 2013 19:29:45 +0000 (UTC)

 Author: wxs
 Date: Sat Jul  6 19:29:38 2013
 New Revision: 322408
 URL: http://svnweb.freebsd.org/changeset/ports/322408
 
 Log:
   Trim header.
   Remove indefinite article.
   Switch to USES for gmake.
   Use ${PREFIX} for sound files.
   
   PR:		ports/180352
   Submitted by:	Kevin Zheng <kevinz5000@gmail.com> (maintainer)
 
 Modified:
   head/games/netrek-client-cow/Makefile
 
 Modified: head/games/netrek-client-cow/Makefile
 ==============================================================================
 --- head/games/netrek-client-cow/Makefile	Sat Jul  6 19:24:51 2013	(r322407)
 +++ head/games/netrek-client-cow/Makefile	Sat Jul  6 19:29:38 2013	(r322408)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	netrek-client-cow
 -# Date created:	20 April 2012
 -# Whom:	Kevin Zheng <kevinz5000@gmail.com>
 -#
 +# Created by: Kevin Zheng <kevinz5000@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	netrek-client-cow
  PORTVERSION=	3.3.1
 @@ -13,13 +9,14 @@ MASTER_SITES=	http://www.netrek.org/file
  		http://quozl.us.netrek.org/netrek/
  
  MAINTAINER=	kevinz5000@gmail.com
 -COMMENT=	A multi-player battle simulation with a Star Trek theme
 +COMMENT=	Multi-player battle simulation with a Star Trek theme
  
  LIB_DEPENDS=	Imlib2:${PORTSDIR}/graphics/imlib2
  
  GNU_CONFIGURE=	yes
 -USE_GMAKE=	yes
 +USES=		gmake
  USE_SDL=	sdl mixer
 +
  CONFIGURE_ARGS+=	NORSA='\#'
  
  post-patch:
 @@ -28,7 +25,11 @@ post-patch:
  	${REINPLACE_CMD} -e 's|inline void|void|' \
  		${WRKSRC}/local.[ch]
  	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 -		${WRKSRC}/x11sprite.c ${WRKSRC}/netrek-client-cow.desktop
 +		${WRKSRC}/netrek-client-cow.desktop \
 +		${WRKSRC}/sound.c \
 +		${WRKSRC}/x11sprite.c
 +	${REINPLACE_CMD} -e 's|8000, AUDIO_U8, 1|22050, AUDIO_U8, 2|' \
 +		${WRKSRC}/sound.c
  	${REINPLACE_CMD} -e 's|games|bin|' \
  		${WRKSRC}/netrek-client-cow.desktop
  
 _______________________________________________
 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:
