From nemysis@gmx.ch  Tue Aug  7 17:34:18 2012
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DF9591065673
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  7 Aug 2012 17:34:18 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23])
	by mx1.freebsd.org (Postfix) with SMTP id 5FD108FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  7 Aug 2012 17:34:17 +0000 (UTC)
Received: (qmail invoked by alias); 07 Aug 2012 17:34:16 -0000
Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201]
  by mail.gmx.net (mp039) with SMTP; 07 Aug 2012 19:34:16 +0200
Received: by something.email.com (sSMTP sendmail emulation); Tue, 07 Aug 2012 19:34:15 +0200
Message-Id: <20120807173418.DF9591065673@hub.freebsd.org>
Date: Tue, 07 Aug 2012 19:34:15 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] games/kajaani-kombat: Makefile changed, new Options, added files/*.in
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170461
>Category:       ports
>Synopsis:       [MAINTAINER] games/kajaani-kombat: Makefile changed, new Options, added files/*.in
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 07 17:40:01 UTC 2012
>Closed-Date:    Mon Dec 17 16:00:48 UTC 2012
>Last-Modified:  Mon Dec 17 16:00:48 UTC 2012
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed:

Removed and use only ${PORTNAME}

- Added in Makefile for all ${PORTNAME}
- PKGNAMEPREFIX
- DISTNAME
- ${PKGNAMEPREFIX}${PORTNAME}
- WRKSRC
- DATADIR
- DOCSDIR



New Options for Makefile:

SUB_FILES=	${PORTNAME} \
		${PORTNAME}-server

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDATA}

.if ${PORT_OPTIONS:MDOCS}


Removed unsafe Scripts:
- kajaani-kombat.sh
- kajaani-kombat-server.sh


Added file(s):
- files/kajaani-kombat-server.in
- files/kajaani-kombat.in

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- kajaani-kombat-0.7_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/Makefile ./Makefile
--- /usr/ports/games/kajaani-kombat/Makefile	2012-05-15 18:23:43.000000000 +0200
+++ ./Makefile	2012-08-07 19:10:55.000000000 +0200
@@ -5,34 +5,37 @@
 # $FreeBSD: ports/games/kajaani-kombat/Makefile,v 1.1 2012/05/15 16:23:43 mva Exp $
 #
 
-PORTNAME=	kombat
+PORTNAME=	kajaani-kombat
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://kombat.kajaani.net/dl/
-PKGNAMEPREFIX=	kajaani-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Kajaani Kombat is a funny multiplayer game... and much more
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
+OPTIONS_DEFINE=	DATA
+OPTIONS_DEFAULT=	DATA
 
 USE_GMAKE=	yes
 USE_SDL=	sdl image mixer net ttf
 MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/kajaani-kombat \
-		bin/kajaani-kombat-server \
-		share/pixmaps/kajaani-kombat.png
+PLIST_FILES=	bin/${PORTNAME} \
+		bin/${PORTNAME}-server \
+		share/pixmaps/${PORTNAME}.png
 
 PORTDATA=	*
 PORTDOCS=	AUTHORS ChangeLog README
-DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
+SUB_FILES=	${PORTNAME} \
+		${PORTNAME}-server
+
+.include <bsd.port.options.mk>
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE})
@@ -40,26 +43,25 @@
 
 do-install:
 # Scripts
-	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
-		./kajaani-kombat\n" > ${WRKDIR}/kajaani-kombat.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat.sh ${PREFIX}/bin/kajaani-kombat
-	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
-		./kajaani-kombat-server\n" > ${WRKDIR}/kajaani-kombat-server.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat-server.sh ${PREFIX}/bin/kajaani-kombat-server
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-server ${PREFIX}/bin
+
 # Executable
 	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat-server ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-server ${DATADIR}
 
 post-install:
 # Data
-.if !defined (NOPORTDATA)
+.if ${PORT_OPTIONS:MDATA}
 	${INSTALL_DATA} ${WRKSRC}/*.png ${WRKSRC}/*.ogg ${WRKSRC}/*.ttf ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/logo.png ${PREFIX}/share/pixmaps/${PKGNAMEPREFIX}${PORTNAME}.png
 .endif
 
-# Documentations
-.if !defined(NOPORTDOCS)
+# Pixmaps
+	${INSTALL_DATA} ${WRKSRC}/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+# Documentation
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .  for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/files/kajaani-kombat-server.in ./files/kajaani-kombat-server.in
--- /usr/ports/games/kajaani-kombat/files/kajaani-kombat-server.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/kajaani-kombat-server.in	2012-08-07 18:47:23.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "Kajaani Kombat Server: Starting up..."
+cd "%%DATADIR%%"
+./kajaani-kombat-server
diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in ./files/kajaani-kombat.in
--- /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/kajaani-kombat.in	2012-08-07 18:46:42.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "Kajaani Kombat: Starting up..."
+cd "%%DATADIR%%"
+./kajaani-kombat
--- kajaani-kombat-0.7_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Wed Aug 8 20:55:18 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

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

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc: jgh@FreeBSD.org
Subject: Re: ports/170461 games/kajaani-kombat: Makefile changed, new
 Options, added files/*.in, DATA deleted
Date: Sat, 18 Aug 2012 04:09:40 +0200

 --MP_/rpG+I5jbewanzQ4a6YuMetK
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
  
 
 --MP_/rpG+I5jbewanzQ4a6YuMetK
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=kajaani-kombat.diff
 
 diff -ruN kajaani-kombat.orig/Makefile kajaani-kombat/Makefile
 --- kajaani-kombat.orig/Makefile	2012-08-18 01:08:49.000000000 +0200
 +++ kajaani-kombat/Makefile	2012-08-18 04:05:09.000000000 +0200
 @@ -18,9 +18,6 @@
  
  LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
  
 -OPTIONS_DEFINE=	DATA
 -OPTIONS_DEFAULT=	DATA
 -
  USE_GMAKE=	yes
  USE_SDL=	sdl image mixer net ttf
  MAKE_JOBS_SAFE=	yes
 
 --MP_/rpG+I5jbewanzQ4a6YuMetK--

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170461: [MAINTAINER] games/kajaani-kombat: Makefile
 changed, new Options, added files/*.in
Date: Mon, 20 Aug 2012 20:23:22 +0200

 --MP_/8VcYx4TXie_whXO9dm7a+as
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 
 --MP_/8VcYx4TXie_whXO9dm7a+as
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=kajaani-kombat.diff
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/Makefile ./Makefile
 --- /usr/ports/games/kajaani-kombat/Makefile	2012-05-15 18:23:43.000000000 +0200
 +++ ./Makefile	2012-08-20 20:20:46.000000000 +0200
 @@ -5,34 +5,34 @@
  # $FreeBSD: ports/games/kajaani-kombat/Makefile,v 1.1 2012/05/15 16:23:43 mva Exp $
  #
  
 -PORTNAME=	kombat
 +PORTNAME=	kajaani-kombat
  PORTVERSION=	0.7
 +PORTREVISION=	1
  CATEGORIES=	games
  MASTER_SITES=	http://kombat.kajaani.net/dl/
 -PKGNAMEPREFIX=	kajaani-
 -DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
  
  MAINTAINER=	nemysis@gmx.ch
  COMMENT=	Kajaani Kombat is a funny multiplayer game... and much more
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 -
 -WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 +LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
  
  USE_GMAKE=	yes
  USE_SDL=	sdl image mixer net ttf
  MAKE_JOBS_SAFE=	yes
  
 -PLIST_FILES=	bin/kajaani-kombat \
 -		bin/kajaani-kombat-server \
 -		share/pixmaps/kajaani-kombat.png
 +PLIST_FILES=	bin/${PORTNAME} \
 +		bin/${PORTNAME}-server \
 +		share/pixmaps/${PORTNAME}.png
  
  PORTDATA=	*
  PORTDOCS=	AUTHORS ChangeLog README
 -DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 -DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 +
 +SUB_FILES=	${PORTNAME} \
 +		${PORTNAME}-server
 +
 +.include <bsd.port.options.mk>
  
  do-build:
  	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE})
 @@ -40,26 +40,23 @@
  
  do-install:
  # Scripts
 -	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
 -		./kajaani-kombat\n" > ${WRKDIR}/kajaani-kombat.sh
 -	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat.sh ${PREFIX}/bin/kajaani-kombat
 -	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
 -		./kajaani-kombat-server\n" > ${WRKDIR}/kajaani-kombat-server.sh
 -	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat-server.sh ${PREFIX}/bin/kajaani-kombat-server
 +	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 +	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-server ${PREFIX}/bin
 +
  # Executable
  	${MKDIR} ${DATADIR}
 -	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${DATADIR}
 -	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat-server ${DATADIR}
 +	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 +	{INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-server ${DATADIR}
  
  post-install:
  # Data
 -.if !defined (NOPORTDATA)
  	${INSTALL_DATA} ${WRKSRC}/*.png ${WRKSRC}/*.ogg ${WRKSRC}/*.ttf ${DATADIR}
 -	${INSTALL_DATA} ${WRKSRC}/logo.png ${PREFIX}/share/pixmaps/${PKGNAMEPREFIX}${PORTNAME}.png
 -.endif
  
 -# Documentations
 -.if !defined(NOPORTDOCS)
 +# Pixmaps
 +	${INSTALL_DATA} ${WRKSRC}/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
 +
 +# Documentation
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  .  for f in ${PORTDOCS}
  	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/files/kajaani-kombat-server.in ./files/kajaani-kombat-server.in
 --- /usr/ports/games/kajaani-kombat/files/kajaani-kombat-server.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/kajaani-kombat-server.in	2012-08-07 18:47:23.000000000 +0200
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +
 +echo "Kajaani Kombat Server: Starting up..."
 +cd "%%DATADIR%%"
 +./kajaani-kombat-server
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in ./files/kajaani-kombat.in
 --- /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/kajaani-kombat.in	2012-08-07 18:46:42.000000000 +0200
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +
 +echo "Kajaani Kombat: Starting up..."
 +cd "%%DATADIR%%"
 +./kajaani-kombat
 ===> Done
 
 --MP_/8VcYx4TXie_whXO9dm7a+as--

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170461: [MAINTAINER] games/kajaani-kombat: Makefile
 changed, new Options, added files/*.in
Date: Thu, 11 Oct 2012 03:36:12 +0200

 --MP_/7Od37QJpcnrSMf6DTPNrgTL
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 
 --MP_/7Od37QJpcnrSMf6DTPNrgTL
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=kajaani-kombat.diff
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/Makefile ./Makefile
 --- /usr/ports/games/kajaani-kombat/Makefile	2012-05-15 18:23:43.000000000 +0200
 +++ ./Makefile	2012-10-07 17:52:07.000000000 +0200
 @@ -5,65 +5,57 @@
  # $FreeBSD: ports/games/kajaani-kombat/Makefile,v 1.1 2012/05/15 16:23:43 mva Exp $
  #
  
 -PORTNAME=	kombat
 +PORTNAME=	kajaani-kombat
  PORTVERSION=	0.7
 +PORTREVISION=	1
  CATEGORIES=	games
  MASTER_SITES=	http://kombat.kajaani.net/dl/
 -PKGNAMEPREFIX=	kajaani-
 -DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
  
  MAINTAINER=	nemysis@gmx.ch
 -COMMENT=	Kajaani Kombat is a funny multiplayer game... and much more
 +COMMENT=	Funny multiplayer game... and much more
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 -
 -WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 +LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
  
  USE_GMAKE=	yes
  USE_SDL=	sdl image mixer net ttf
  MAKE_JOBS_SAFE=	yes
  
 -PLIST_FILES=	bin/kajaani-kombat \
 -		bin/kajaani-kombat-server \
 -		share/pixmaps/kajaani-kombat.png
 +PLIST_FILES=	bin/${PORTNAME} \
 +		bin/${PORTNAME}-server \
 +		share/pixmaps/${PORTNAME}.png
  
  PORTDATA=	*
  PORTDOCS=	AUTHORS ChangeLog README
 -DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 -DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 +
 +SUB_FILES=	${PORTNAME} \
 +		${PORTNAME}-server
 +
 +DESKTOP_ENTRIES="Kajaani Kombat" "${COMMENT}" "${PORTNAME}" \
 +		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
 +
 +.include <bsd.port.options.mk>
  
  do-build:
  	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE})
  	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} server)
  
  do-install:
 -# Scripts
 -	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
 -		./kajaani-kombat\n" > ${WRKDIR}/kajaani-kombat.sh
 -	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat.sh ${PREFIX}/bin/kajaani-kombat
 -	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
 -		./kajaani-kombat-server\n" > ${WRKDIR}/kajaani-kombat-server.sh
 -	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat-server.sh ${PREFIX}/bin/kajaani-kombat-server
 -# Executable
 +	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 +	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-server ${PREFIX}/bin
 +
  	${MKDIR} ${DATADIR}
 -	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${DATADIR}
 -	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat-server ${DATADIR}
 +	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 +	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-server ${DATADIR}
  
 -post-install:
 -# Data
 -.if !defined (NOPORTDATA)
  	${INSTALL_DATA} ${WRKSRC}/*.png ${WRKSRC}/*.ogg ${WRKSRC}/*.ttf ${DATADIR}
 -	${INSTALL_DATA} ${WRKSRC}/logo.png ${PREFIX}/share/pixmaps/${PKGNAMEPREFIX}${PORTNAME}.png
 -.endif
  
 -# Documentations
 -.if !defined(NOPORTDOCS)
 +	${INSTALL_DATA} ${WRKSRC}/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
 +
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
 -.  for f in ${PORTDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 -.  endfor
 +	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
  .endif
  
  .include <bsd.port.mk>
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/files/kajaani-kombat-server.in ./files/kajaani-kombat-server.in
 --- /usr/ports/games/kajaani-kombat/files/kajaani-kombat-server.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/kajaani-kombat-server.in	2012-10-07 18:01:16.000000000 +0200
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +#
 +
 +cd "%%DATADIR%%"
 +exec ./kajaani-kombat-server
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in ./files/kajaani-kombat.in
 --- /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/kajaani-kombat.in	2012-10-07 18:01:09.000000000 +0200
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +#
 +
 +cd "%%DATADIR%%"
 +exec ./kajaani-kombat
 ===> Done
 
 --MP_/7Od37QJpcnrSMf6DTPNrgTL--
Responsible-Changed-From-To: jgh->freebsd-ports-bugs 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Wed Dec 5 00:09:56 UTC 2012 
Responsible-Changed-Why:  
back to the heap 

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

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170461: [MAINTAINER] games/kajaani-kombat: Makefile
 changed, new Options, added files/*.in
Date: Wed, 5 Dec 2012 18:32:24 +0100

 --MP_/zzyryMsPAHiF/yIAowRLxp6
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 OptionsNG, added Desktop entry, Manual page, pkg-plist
 --MP_/zzyryMsPAHiF/yIAowRLxp6
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=kajaani-kombat.diff
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/Makefile ./Makefile
 --- /usr/ports/games/kajaani-kombat/Makefile	2012-12-05 00:44:36.000000000 +0100
 +++ ./Makefile	2012-12-05 18:00:22.000000000 +0100
 @@ -5,65 +5,51 @@
  # $FreeBSD: head/games/kajaani-kombat/Makefile 300896 2012-07-14 13:54:48Z beat $
  #
  
 -PORTNAME=	kombat
 +PORTNAME=	kajaani-kombat
  PORTVERSION=	0.7
 +PORTREVISION=	1
  CATEGORIES=	games
  MASTER_SITES=	http://kombat.kajaani.net/dl/
 -PKGNAMEPREFIX=	kajaani-
 -DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
  
  MAINTAINER=	nemysis@gmx.ch
 -COMMENT=	Kajaani Kombat is a funny multiplayer game... and much more
 +COMMENT=	Funny multiplayer game... and much more
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 +LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
  
 -WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 -
 -USE_GMAKE=	yes
  USE_SDL=	sdl image mixer net ttf
 +USE_GMAKE=	yes
  MAKE_JOBS_SAFE=	yes
  
 -PLIST_FILES=	bin/kajaani-kombat \
 -		bin/kajaani-kombat-server \
 -		share/pixmaps/kajaani-kombat.png
 -
 -PORTDATA=	*
  PORTDOCS=	AUTHORS ChangeLog README
 -DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 -DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 +
 +MAN6=		${PORTNAME}.6
 +
 +SUB_FILES=	${PORTNAME}
 +
 +DESKTOP_ENTRIES="Kajaani Kombat" "${COMMENT}" "${PORTNAME}" \
 +		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
 +
 +.include <bsd.port.options.mk>
  
  do-build:
  	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE})
  	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} server)
  
  do-install:
 -# Scripts
 -	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
 -		./kajaani-kombat\n" > ${WRKDIR}/kajaani-kombat.sh
 -	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat.sh ${PREFIX}/bin/kajaani-kombat
 -	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
 -		./kajaani-kombat-server\n" > ${WRKDIR}/kajaani-kombat-server.sh
 -	@${INSTALL_SCRIPT} ${WRKDIR}/kajaani-kombat-server.sh ${PREFIX}/bin/kajaani-kombat-server
 -# Executable
 +	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
  	${MKDIR} ${DATADIR}
 -	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${DATADIR}
 -	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat-server ${DATADIR}
 +	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 +	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-server ${DATADIR}
 +	@(cd ${WRKSRC} && ${INSTALL_DATA} *.png *.ogg *.ttf ${DATADIR})
 +	${LN} -sf ${DATADIR}/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
  
 -post-install:
 -# Data
 -.if !defined (NOPORTDATA)
 -	${INSTALL_DATA} ${WRKSRC}/*.png ${WRKSRC}/*.ogg ${WRKSRC}/*.ttf ${DATADIR}
 -	${INSTALL_DATA} ${WRKSRC}/logo.png ${PREFIX}/share/pixmaps/${PKGNAMEPREFIX}${PORTNAME}.png
 -.endif
 +	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
  
 -# Documentations
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
 -.  for f in ${PORTDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 -.  endfor
 +	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
  .endif
  
  .include <bsd.port.mk>
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in ./files/kajaani-kombat.in
 --- /usr/ports/games/kajaani-kombat/files/kajaani-kombat.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/kajaani-kombat.in	2012-10-20 21:34:46.000000000 +0200
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +#
 +
 +cd "%%DATADIR%%"
 +exec ./kajaani-kombat "${@}"
 diff -ruN --exclude=CVS /usr/ports/games/kajaani-kombat/pkg-plist ./pkg-plist
 --- /usr/ports/games/kajaani-kombat/pkg-plist	1970-01-01 01:00:00.000000000 +0100
 +++ ./pkg-plist	2012-12-05 17:48:18.000000000 +0100
 @@ -0,0 +1,168 @@
 +bin/kajaani-kombat
 +%%DATADIR%%/0ammo.png
 +%%DATADIR%%/0big_ammo.png
 +%%DATADIR%%/0big_cannon.png
 +%%DATADIR%%/0big_cannon_dest.png
 +%%DATADIR%%/0big_cannonplacer.png
 +%%DATADIR%%/0blockplacer.png
 +%%DATADIR%%/0cannon.png
 +%%DATADIR%%/0cannon_dest.png
 +%%DATADIR%%/0cannon_down.ogg
 +%%DATADIR%%/0cannonplacer.png
 +%%DATADIR%%/0castle.png
 +%%DATADIR%%/0chooser.png
 +%%DATADIR%%/0conquered_grass.png
 +%%DATADIR%%/0cursor.png
 +%%DATADIR%%/0cursor_ch.png
 +%%DATADIR%%/0cursor_lock.png
 +%%DATADIR%%/0face.png
 +%%DATADIR%%/0sound_cannon_down.ogg
 +%%DATADIR%%/0sound_fire.ogg
 +%%DATADIR%%/0sound_hit.ogg
 +%%DATADIR%%/0sound_hit_cannon.ogg
 +%%DATADIR%%/0sound_select_castle.ogg
 +%%DATADIR%%/0wall.png
 +%%DATADIR%%/1ammo.png
 +%%DATADIR%%/1big_ammo.png
 +%%DATADIR%%/1big_cannon.png
 +%%DATADIR%%/1big_cannon_dest.png
 +%%DATADIR%%/1big_cannonplacer.png
 +%%DATADIR%%/1blockplacer.png
 +%%DATADIR%%/1cannon.png
 +%%DATADIR%%/1cannon_dest.png
 +%%DATADIR%%/1cannon_down.ogg
 +%%DATADIR%%/1cannonplacer.png
 +%%DATADIR%%/1castle.png
 +%%DATADIR%%/1chooser.png
 +%%DATADIR%%/1conquered_grass.png
 +%%DATADIR%%/1cursor.png
 +%%DATADIR%%/1cursor_ch.png
 +%%DATADIR%%/1cursor_lock.png
 +%%DATADIR%%/1face.png
 +%%DATADIR%%/1sound_cannon_down.ogg
 +%%DATADIR%%/1sound_fire.ogg
 +%%DATADIR%%/1sound_hit.ogg
 +%%DATADIR%%/1sound_hit_cannon.ogg
 +%%DATADIR%%/1sound_select_castle.ogg
 +%%DATADIR%%/1wall.png
 +%%DATADIR%%/2ammo.png
 +%%DATADIR%%/2big_ammo.png
 +%%DATADIR%%/2big_cannon.png
 +%%DATADIR%%/2big_cannon_dest.png
 +%%DATADIR%%/2big_cannonplacer.png
 +%%DATADIR%%/2blockplacer.png
 +%%DATADIR%%/2cannon.png
 +%%DATADIR%%/2cannon_dest.png
 +%%DATADIR%%/2cannon_down.ogg
 +%%DATADIR%%/2cannonplacer.png
 +%%DATADIR%%/2castle.png
 +%%DATADIR%%/2chooser.png
 +%%DATADIR%%/2conquered_grass.png
 +%%DATADIR%%/2cursor.png
 +%%DATADIR%%/2cursor_ch.png
 +%%DATADIR%%/2cursor_lock.png
 +%%DATADIR%%/2face.png
 +%%DATADIR%%/2sound_cannon_down.ogg
 +%%DATADIR%%/2sound_fire.ogg
 +%%DATADIR%%/2sound_hit.ogg
 +%%DATADIR%%/2sound_hit_cannon.ogg
 +%%DATADIR%%/2sound_select_castle.ogg
 +%%DATADIR%%/2wall.png
 +%%DATADIR%%/3ammo.png
 +%%DATADIR%%/3big_ammo.png
 +%%DATADIR%%/3big_cannon.png
 +%%DATADIR%%/3big_cannon_dest.png
 +%%DATADIR%%/3big_cannonplacer.png
 +%%DATADIR%%/3blockplacer.png
 +%%DATADIR%%/3cannon.png
 +%%DATADIR%%/3cannon_dest.png
 +%%DATADIR%%/3cannon_down.ogg
 +%%DATADIR%%/3cannonplacer.png
 +%%DATADIR%%/3castle.png
 +%%DATADIR%%/3chooser.png
 +%%DATADIR%%/3conquered_grass.png
 +%%DATADIR%%/3cursor.png
 +%%DATADIR%%/3cursor_ch.png
 +%%DATADIR%%/3cursor_lock.png
 +%%DATADIR%%/3face.png
 +%%DATADIR%%/3sound_cannon_down.ogg
 +%%DATADIR%%/3sound_fire.ogg
 +%%DATADIR%%/3sound_hit.ogg
 +%%DATADIR%%/3sound_hit_cannon.ogg
 +%%DATADIR%%/3sound_select_castle.ogg
 +%%DATADIR%%/3wall.png
 +%%DATADIR%%/4ammo.png
 +%%DATADIR%%/4big_ammo.png
 +%%DATADIR%%/4big_cannon.png
 +%%DATADIR%%/4big_cannon_dest.png
 +%%DATADIR%%/4big_cannonplacer.png
 +%%DATADIR%%/4blockplacer.png
 +%%DATADIR%%/4cannon.png
 +%%DATADIR%%/4cannon_dest.png
 +%%DATADIR%%/4cannonplacer.png
 +%%DATADIR%%/4castle.png
 +%%DATADIR%%/4chooser.png
 +%%DATADIR%%/4conquered_grass.png
 +%%DATADIR%%/4cursor.png
 +%%DATADIR%%/4cursor_ch.png
 +%%DATADIR%%/4cursor_lock.png
 +%%DATADIR%%/4face.png
 +%%DATADIR%%/4sound_hit_cannon.ogg
 +%%DATADIR%%/4wall.png
 +%%DATADIR%%/Vera.ttf
 +%%DATADIR%%/bg.png
 +%%DATADIR%%/connect_butconn.png
 +%%DATADIR%%/connect_butconn_act.png
 +%%DATADIR%%/connect_butconn_focus.png
 +%%DATADIR%%/connect_imgname.png
 +%%DATADIR%%/connect_imgname2.png
 +%%DATADIR%%/connect_imgport.png
 +%%DATADIR%%/connect_imgserv.png
 +%%DATADIR%%/host_butstart.png
 +%%DATADIR%%/host_butstart_act.png
 +%%DATADIR%%/host_butstart_focus.png
 +%%DATADIR%%/host_imgname.png
 +%%DATADIR%%/host_imgname2.png
 +%%DATADIR%%/host_imgnumcastles.png
 +%%DATADIR%%/host_imgnumpl.png
 +%%DATADIR%%/host_imgnumwins.png
 +%%DATADIR%%/host_imgport.png
 +%%DATADIR%%/kajaani-kombat
 +%%DATADIR%%/kajaani-kombat-server
 +%%DATADIR%%/logo.png
 +%%DATADIR%%/main_buthost.png
 +%%DATADIR%%/main_buthost_act.png
 +%%DATADIR%%/main_buthost_focus.png
 +%%DATADIR%%/main_butopt.png
 +%%DATADIR%%/main_butopt_act.png
 +%%DATADIR%%/main_butopt_focus.png
 +%%DATADIR%%/main_butquit.png
 +%%DATADIR%%/main_butquit_act.png
 +%%DATADIR%%/main_butquit_focus.png
 +%%DATADIR%%/main_butstart.png
 +%%DATADIR%%/main_butstart_act.png
 +%%DATADIR%%/main_butstart_focus.png
 +%%DATADIR%%/music_intro.ogg
 +%%DATADIR%%/music_placecannon.ogg
 +%%DATADIR%%/music_repair.ogg
 +%%DATADIR%%/music_shoot.ogg
 +%%DATADIR%%/numpl_butone.png
 +%%DATADIR%%/numpl_butone_act.png
 +%%DATADIR%%/numpl_butone_focus.png
 +%%DATADIR%%/numpl_buttwo.png
 +%%DATADIR%%/numpl_buttwo_act.png
 +%%DATADIR%%/numpl_buttwo_focus.png
 +%%DATADIR%%/numpl_imgtext.png
 +%%DATADIR%%/options_apply.png
 +%%DATADIR%%/options_apply_act.png
 +%%DATADIR%%/options_apply_focus.png
 +%%DATADIR%%/options_cancel.png
 +%%DATADIR%%/options_cancel_act.png
 +%%DATADIR%%/options_cancel_focus.png
 +%%DATADIR%%/sound_block_down.ogg
 +%%DATADIR%%/sound_block_rotate.ogg
 +%%DATADIR%%/sound_gui_navigation.ogg
 +%%DATADIR%%/sound_gui_select.ogg
 +%%DATADIR%%/three_sec_warning.ogg
 +share/pixmaps/kajaani-kombat.png
 +@dirrm %%DATADIR%%
 ===> Done
 
 --MP_/zzyryMsPAHiF/yIAowRLxp6--
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Mon Dec 17 16:00:47 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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