From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 7 17:40:02 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A45F1065674 for ; Tue, 7 Aug 2012 17:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 317D38FC15 for ; Tue, 7 Aug 2012 17:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q77He2Hj097008 for ; Tue, 7 Aug 2012 17:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q77He2Ds097007; Tue, 7 Aug 2012 17:40:02 GMT (envelope-from gnats) Resent-Date: Tue, 7 Aug 2012 17:40:02 GMT Resent-Message-Id: <201208071740.q77He2Ds097007@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF9591065673 for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/170461: [MAINTAINER] games/kajaani-kombat: Makefile changed, new Options, added files/*.in X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Aug 2012 17:40:02 -0000 >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: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Aug 07 17:40:01 UTC 2012 >Closed-Date: >Last-Modified: >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 .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 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: >Unformatted: