From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 26 23:20:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C21A416A424 for ; Sun, 26 Mar 2006 23:20:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9E5643D5C for ; Sun, 26 Mar 2006 23:20:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2QNKKTW017079 for ; Sun, 26 Mar 2006 23:20:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2QNKKH6017078; Sun, 26 Mar 2006 23:20:20 GMT (envelope-from gnats) Resent-Date: Sun, 26 Mar 2006 23:20:20 GMT Resent-Message-Id: <200603262320.k2QNKKH6017078@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, Dmitry Marakasov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88D6016A41F for ; Sun, 26 Mar 2006 23:15:36 +0000 (UTC) (envelope-from amdmi3@mail.ru) Received: from mx27.mail.ru (mx27.mail.ru [194.67.23.63]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDC3743D4C for ; Sun, 26 Mar 2006 23:15:35 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=29139 helo=nexii.panopticon) by mx27.mail.ru with esmtp id 1FNeSK-000Obu-00 for FreeBSD-gnats-submit@freebsd.org; Mon, 27 Mar 2006 03:15:34 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id 6DEE41148A for ; Mon, 27 Mar 2006 03:20:17 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id ECC08898; Mon, 27 Mar 2006 03:16:16 +0400 (MSD) Message-Id: <20060326231616.ECC08898@hades.panopticon> Date: Mon, 27 Mar 2006 03:16:16 +0400 (MSD) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/94983: [MAINTAINER] games/vor: update to 0.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 23:20:23 -0000 >Number: 94983 >Category: ports >Synopsis: [MAINTAINER] games/vor: update to 0.4 >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: Sun Mar 26 23:20:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.0-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #1: Fri Jan 27 12:07:19 MSK 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: ===> Update to 0.4. Changes: * Added an easy mode (Press 'e' for an easy game). * Rocks are now totally solid (they bounce off each other and get pushed by your jets). * Fixed placement of new ships so you're less likely to die multiple times. * Added explanatory message at game over. ===> Cleanup port Remove USE_REINPLACE, optimize do-install target, handle PORTDOCS... >How-To-Repeat: >Fix: --- vor-0.4.patch begins here --- diff -ruN vor.orig/Makefile vor/Makefile --- vor.orig/Makefile Sun Sep 11 03:16:02 2005 +++ vor/Makefile Mon Mar 27 03:11:09 2006 @@ -6,7 +6,7 @@ # PORTNAME= vor -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= games MASTER_SITES= http://qualdan.com/vor/ @@ -18,35 +18,31 @@ USE_SDL= mixer image sdl USE_BZIP2= yes USE_GMAKE= yes -USE_REINPLACE= yes + +PORTDOCS= README post-patch: -.for file in main.c shape.h sound.h - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/${file} -.endfor -.for file in shape.h score.c score.h debug.c - @${REINPLACE_CMD} -e 's|||' ${WRKSRC}/${file} -.endfor + @${REINPLACE_CMD} -e 's|SDL/||' ${WRKSRC}/sound.c @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|^\(my_objects.*\)$$|\1 ${LOCALBASE}/lib/libargp.a|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|/usr/share/vor|${PREFIX}/share/vor|g' ${WRKSRC}/config.h + @${REINPLACE_CMD} -e 's|/usr/share/vor|${DATADIR}|' ${WRKSRC}/Makefile +.if ${OSVERSION} < 500000 + @${REINPLACE_CMD} -e 's|UINT32_MAX|0xffffffffU|' ${WRKSRC}/mt.c + @${REINPLACE_CMD} -e 's|INT32_MIN|(-0x7fffffff-1)|' ${WRKSRC}/mt.c +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vor ${PREFIX}/bin - ${MKDIR} ${DATADIR} - ${MKDIR} ${DATADIR}/banners - ${MKDIR} ${DATADIR}/fonts - ${MKDIR} ${DATADIR}/icons - ${MKDIR} ${DATADIR}/indicators - ${MKDIR} ${DATADIR}/music - ${MKDIR} ${DATADIR}/sounds - ${MKDIR} ${DATADIR}/sprites - ${INSTALL_DATA} ${WRKSRC}/data/banners/* ${DATADIR}/banners/ - ${INSTALL_DATA} ${WRKSRC}/data/fonts/* ${DATADIR}/fonts/ - ${INSTALL_DATA} ${WRKSRC}/data/icons/* ${DATADIR}/icons/ - ${INSTALL_DATA} ${WRKSRC}/data/indicators/* ${DATADIR}/indicators/ - ${INSTALL_DATA} ${WRKSRC}/data/music/* ${DATADIR}/music/ - ${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${DATADIR}/sounds/ - ${INSTALL_DATA} ${WRKSRC}/data/sprites/* ${DATADIR}/sprites/ +.for d in banners fonts icons indicators music sounds sprites + ${MKDIR} ${DATADIR}/${d} + ${INSTALL_DATA} ${WRKSRC}/data/${d}/* ${DATADIR}/${d}/ +.endfor + +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +.endfor +.endif .include diff -ruN vor.orig/distinfo vor/distinfo --- vor.orig/distinfo Sun Jan 22 21:09:16 2006 +++ vor/distinfo Mon Mar 27 03:11:09 2006 @@ -1,3 +1,3 @@ -MD5 (vor-0.3.tar.bz2) = 814100a94a7881e58ef0238ec3eb4367 -SHA256 (vor-0.3.tar.bz2) = d0170ec85e41605bd1c84b15e9d93f7069e5348cfe7fa1f63ebd48578e111d94 -SIZE (vor-0.3.tar.bz2) = 444658 +MD5 (vor-0.4.tar.bz2) = 8ab437075fb9fa6a5b8cd269e339aa9a +SHA256 (vor-0.4.tar.bz2) = 4f502e6485f71e48aec2922f06fb6d83e1cdd4fa9f606e703022f3f98730c779 +SIZE (vor-0.4.tar.bz2) = 450486 diff -ruN vor.orig/files/patch-file.c vor/files/patch-file.c --- vor.orig/files/patch-file.c Sun Sep 11 03:16:02 2005 +++ vor/files/patch-file.c Mon Mar 27 03:11:09 2006 @@ -1,26 +1,13 @@ ---- file.c.orig Wed Sep 7 05:00:47 2005 -+++ file.c Wed Sep 7 05:01:01 2005 -@@ -58,20 +58,19 @@ - find_data_dir(void) +--- file.c.orig Sun Mar 26 06:52:35 2006 ++++ file.c Mon Mar 27 02:30:51 2006 +@@ -101,9 +101,9 @@ { int i; -- char *data_options[3] = { -- "./data", -+ char *data_options[2] = { + char *data_options[3] = { ++ DATA_PREFIX, getenv("VOR_DATA"), - DATA_PREFIX + "data", +- DATA_PREFIX }; -- for(i=0; i<3; i++) { -+ for(i=0; i<2; i++) { - if(!data_options[i]) continue; - g_data_dir = strdup(data_options[i]); - if(is_dir(g_data_dir)) return true; - } - - fprintf(stderr, "Can't find VoR data! Tried:\n"); -- for(i=0; i<3; i++) { -+ for(i=0; i<2; i++) { - fprintf(stderr, "\t%s\n", data_options[i]); - } - return false; + for(i=0; i<3; i++) { diff -ruN vor.orig/pkg-descr vor/pkg-descr --- vor.orig/pkg-descr Sun Sep 11 03:16:02 2005 +++ vor/pkg-descr Mon Mar 27 03:11:09 2006 @@ -8,5 +8,3 @@ moments here and there, not an epic space adventure. WWW: http://herkamire.com/jason/vor - -- Dmitry Marakasov --- vor-0.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: