From nobody@FreeBSD.org Sat Aug 12 14:33:07 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 355EC16A4DA for ; Sat, 12 Aug 2006 14:33:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id E217D43D45 for ; Sat, 12 Aug 2006 14:33:06 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k7CEX6pK042742 for ; Sat, 12 Aug 2006 14:33:06 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k7CEX5ES042733; Sat, 12 Aug 2006 14:33:05 GMT (envelope-from nobody) Message-Id: <200608121433.k7CEX5ES042733@www.freebsd.org> Date: Sat, 12 Aug 2006 14:33:05 GMT From: Raymond Pasco To: freebsd-gnats-submit@FreeBSD.org Subject: Update port: games/alephone to current version (with additional patch) X-Send-Pr-Version: www-2.3 >Number: 101922 >Category: ports >Synopsis: Update port: games/alephone to current version (with additional patch) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 12 14:40:13 GMT 2006 >Closed-Date: Sat Aug 12 21:05:08 GMT 2006 >Last-Modified: Sat Aug 12 21:05:08 GMT 2006 >Originator: Raymond Pasco >Release: 6.0-RELEASE >Organization: N/A >Environment: FreeBSD nina.caedescontego.net 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386 >Description: A couple changes here: -update to latest version -set myself as maintainer -patch from Gregory Smith to fix a crash if /dev/dsp is busy >How-To-Repeat: N/A >Fix: --- alephone.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # /usr/ports/games/alephone # /usr/ports/games/alephone/Makefile # /usr/ports/games/alephone/distinfo # /usr/ports/games/alephone/pkg-descr # /usr/ports/games/alephone/pkg-message # /usr/ports/games/alephone/pkg-plist # /usr/ports/games/alephone/files # /usr/ports/games/alephone/files/patch-Source_Files__Misc__Logging_gruntwork.h # /usr/ports/games/alephone/files/patch-Source_Files__Sound__sound_sdl.h # echo c - /usr/ports/games/alephone mkdir -p /usr/ports/games/alephone > /dev/null 2>&1 echo x - /usr/ports/games/alephone/Makefile sed 's/^X//' >/usr/ports/games/alephone/Makefile << 'END-of-/usr/ports/games/alephone/Makefile' X# New ports collection makefile for: alephone X# Date created: 27 February 2001 X# Whom: Michael Alyn Miller X# X# $FreeBSD: /repoman/r/pcvs/ports/games/alephone/Makefile,v 1.23 2006/05/03 13:25:05 pav Exp $ X# X XPORTNAME= alephone XPORTVERSION= 20060701 XCATEGORIES= games XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR= marathon XDISTNAME= AlephOne-${PORTVERSION} XEXTRACT_SUFX= .tar.bz2 X XMAINTAINER= ray@cultofray.net XCOMMENT= The open source version of Bungie's Marathon game X XBUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost XLIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ X lua.5:${PORTSDIR}/lang/lua50 X XUSE_X_PREFIX= yes XUSE_GNOME= gnometarget XUSE_SDL= image net sdl sound XUSE_GL= yes XGNU_CONFIGURE= yes XCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" X XCPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include XLDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib X X.include X X.if ${OSVERSION} < 500035 XCXXFLAGS+= -ftemplate-depth-30 X.endif X Xpost-patch: X @${REINPLACE_CMD} -e 's||streambuf\.h>|' \ X ${WRKSRC}/Source_Files/CSeries/snprintf.h X @${REINPLACE_CMD} -e 's|m_buffer\.clear()|m_buffer.resize(0)|g ; \ X s|m_displayBuffer\.clear()|m_displayBuffer.resize(0)|g' \ X ${WRKSRC}/Source_Files/Misc/Console.cpp X.endif X Xpost-install: X @${CAT} ${PKGMESSAGE} X X.include END-of-/usr/ports/games/alephone/Makefile echo x - /usr/ports/games/alephone/distinfo sed 's/^X//' >/usr/ports/games/alephone/distinfo << 'END-of-/usr/ports/games/alephone/distinfo' XMD5 (AlephOne-20060701.tar.bz2) = e0a8e3eca91e06fa19c95027980af0e0 XSHA256 (AlephOne-20060701.tar.bz2) = 594442f269b6d6ea69ea78e8100e017ec637f5d4c9e702bb112e9503301c2437 XSIZE (AlephOne-20060701.tar.bz2) = 5985411 END-of-/usr/ports/games/alephone/distinfo echo x - /usr/ports/games/alephone/pkg-descr sed 's/^X//' >/usr/ports/games/alephone/pkg-descr << 'END-of-/usr/ports/games/alephone/pkg-descr' XAleph One is the open source version of Bungie's Marathon game. X XMarathon is a three-part, first-person shooter series that was published Xby Bungie Software. The complete Marathon trilogy consists of Marathon, XMarathon 2: Durandal, and Marathon Infinity. The hallmark of the series Xis the detailed story-line that unfolds throughout the game. X XAfter Bungie released the source code to the Mac OS version of Marathon, Xthe Aleph One project was created to enhance the software and port it to Xother operating systems. The project's home page and news site is found Xat http://source.bungie.org. As AlephOne has matured, so have the user- Xcontributed scenarios, some which far surpass the original Marathon game Xscenarios themselves. X XAleph One is OpenGL-accelerated, but performs well without OpenGL if you Xdo not have a graphics card with the appropriate functionality (you need Xto use the -g/--nogl option). X XWWW: http://source.bungie.org/ X XMichael Alyn Miller Xmalyn@strangeGizmo.com END-of-/usr/ports/games/alephone/pkg-descr echo x - /usr/ports/games/alephone/pkg-message sed 's/^X//' >/usr/ports/games/alephone/pkg-message << 'END-of-/usr/ports/games/alephone/pkg-message' X************************************************************************ X XThis package does not include any Aleph One data files. There are a few Xways of getting a fully-playable version of Aleph One: X X * Install the `alephone-data' port. This port includes the data files X from Marathon Infinity. X X * Get a copy of Marathon 2 or Marathon Infinity and convert those data X files into the appropriate AlephOne format (http://source.bungie.org X has more information). You can get any of the Marathon series (and X AlephOne conversions of Marathon 2 and Marathon Infinity) from X http://trilogyrelease.bungie.org/. X X * Go to http://archives.bungie.org and download one or more of the SDL X scenarios. X X * The games/marathon2-data port contains the AlephOne versions of the X "Marathon 2: Durandal" data files. X XAlephOne works best with OpenGL; if you do not have an OpenGL-savvy card Xand the game is sluggish, try using the -g option to disable OpenGL. X X************************************************************************ END-of-/usr/ports/games/alephone/pkg-message echo x - /usr/ports/games/alephone/pkg-plist sed 's/^X//' >/usr/ports/games/alephone/pkg-plist << 'END-of-/usr/ports/games/alephone/pkg-plist' Xbin/alephone Xshare/AlephOne/Fonts Xshare/AlephOne/MML/Interface_Rects.mml Xshare/AlephOne/MML/Transparent_Liquids.mml Xshare/AlephOne/MML/Transparent_Sprites.mml Xshare/AlephOne/Themes/Default/button_c.bmp Xshare/AlephOne/Themes/Default/button_l.bmp Xshare/AlephOne/Themes/Default/button_r.bmp Xshare/AlephOne/Themes/Default/frame_b.bmp Xshare/AlephOne/Themes/Default/frame_bl.bmp Xshare/AlephOne/Themes/Default/frame_br.bmp Xshare/AlephOne/Themes/Default/frame_l.bmp Xshare/AlephOne/Themes/Default/frame_r.bmp Xshare/AlephOne/Themes/Default/frame_t.bmp Xshare/AlephOne/Themes/Default/frame_tl.bmp Xshare/AlephOne/Themes/Default/frame_tr.bmp Xshare/AlephOne/Themes/Default/list_b.bmp Xshare/AlephOne/Themes/Default/list_bl.bmp Xshare/AlephOne/Themes/Default/list_br.bmp Xshare/AlephOne/Themes/Default/list_l.bmp Xshare/AlephOne/Themes/Default/list_r.bmp Xshare/AlephOne/Themes/Default/list_t.bmp Xshare/AlephOne/Themes/Default/list_tl.bmp Xshare/AlephOne/Themes/Default/list_tr.bmp Xshare/AlephOne/Themes/Default/resources Xshare/AlephOne/Themes/Default/slider.bmp Xshare/AlephOne/Themes/Default/slider_c.bmp Xshare/AlephOne/Themes/Default/slider_l.bmp Xshare/AlephOne/Themes/Default/slider_r.bmp Xshare/AlephOne/Themes/Default/theme.mml Xshare/AlephOne/Themes/Default/thumb_b.bmp Xshare/AlephOne/Themes/Default/thumb_bc.bmp Xshare/AlephOne/Themes/Default/thumb_c.bmp Xshare/AlephOne/Themes/Default/thumb_t.bmp Xshare/AlephOne/Themes/Default/thumb_tc.bmp X@dirrm share/AlephOne/Themes/Default X@dirrm share/AlephOne/Themes X@dirrm share/AlephOne/MML X@dirrm share/AlephOne END-of-/usr/ports/games/alephone/pkg-plist echo c - /usr/ports/games/alephone/files mkdir -p /usr/ports/games/alephone/files > /dev/null 2>&1 echo x - /usr/ports/games/alephone/files/patch-Source_Files__Misc__Logging_gruntwork.h sed 's/^X//' >/usr/ports/games/alephone/files/patch-Source_Files__Misc__Logging_gruntwork.h << 'END-of-/usr/ports/games/alephone/files/patch-Source_Files__Misc__Logging_gruntwork.h' X--- Source_Files/Misc/Logging_gruntwork.h.orig Tue Aug 30 23:47:00 2005 X+++ Source_Files/Misc/Logging_gruntwork.h Tue Apr 18 12:27:12 2006 X@@ -13,14 +13,14 @@ X #define logDump(message) (GetCurrentLogger()->logMessage(logDomain, logDumpLevel, __FILE__, __LINE__, (message))) X #else X // this obsoletes this whole file, pretty much - since macros can support var args and stuff :P X-#define logFatal(...) (GetCurrentLogger()->logMessage(logDomain, logFatalLevel, __FILE__, __LINE__, __VA_ARGS__)) X-#define logError(...) (GetCurrentLogger()->logMessage(logDomain, logErrorLevel, __FILE__, __LINE__, __VA_ARGS__)) X-#define logWarning(...) (GetCurrentLogger()->logMessage(logDomain, logWarningLevel, __FILE__, __LINE__, __VA_ARGS__)) X-#define logAnomaly(...) (GetCurrentLogger()->logMessage(logDomain, logAnomalyLevel, __FILE__, __LINE__, __VA_ARGS__)) X-#define logNote(...) (GetCurrentLogger()->logMessage(logDomain, logNoteLevel, __FILE__, __LINE__, __VA_ARGS__)) X-#define logSummary(...) (GetCurrentLogger()->logMessage(logDomain, logSummaryLevel, __FILE__, __LINE__, __VA_ARGS__)) X-#define logTrace(...) (GetCurrentLogger()->logMessage(logDomain, logTraceLevel, __FILE__, __LINE__, __VA_ARGS__)) X-#define logDump(...) (GetCurrentLogger()->logMessage(logDomain, logDumpLevel, __FILE__, __LINE__, __VA_ARGS__)) X+#define logFatal(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logFatalLevel, __FILE__, __LINE__, ##ARGS)) X+#define logError(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logErrorLevel, __FILE__, __LINE__, ##ARGS)) X+#define logWarning(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logWarningLevel, __FILE__, __LINE__, ##ARGS)) X+#define logAnomaly(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logAnomalyLevel, __FILE__, __LINE__, ##ARGS)) X+#define logNote(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logNoteLevel, __FILE__, __LINE__, ##ARGS)) X+#define logSummary(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logSummaryLevel, __FILE__, __LINE__, ##ARGS)) X+#define logTrace(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logTraceLevel, __FILE__, __LINE__, ##ARGS)) X+#define logDump(ARGS...) (GetCurrentLogger()->logMessage(logDomain, logDumpLevel, __FILE__, __LINE__, ##ARGS)) X #endif X X END-of-/usr/ports/games/alephone/files/patch-Source_Files__Misc__Logging_gruntwork.h echo x - /usr/ports/games/alephone/files/patch-Source_Files__Sound__sound_sdl.h sed 's/^X//' >/usr/ports/games/alephone/files/patch-Source_Files__Sound__sound_sdl.h << 'END-of-/usr/ports/games/alephone/files/patch-Source_Files__Sound__sound_sdl.h' X--- Source_Files/Sound/sound_sdl.h.orig Sat Aug 12 09:43:24 2006 X+++ Source_Files/Sound/sound_sdl.h Sat Aug 12 09:44:25 2006 X@@ -346,6 +346,7 @@ X #ifdef MUSIC_SDL X bool load_music_sdl(FileSpecifier &song_file) X { X+ if (!_sm_initialized || !_sm_active) return false; X sdl_channel *c = sdl_channels + MUSIC_CHANNEL; // Music channel X uint32 music_sample_rate; // Music sample rate in Hz X END-of-/usr/ports/games/alephone/files/patch-Source_Files__Sound__sound_sdl.h exit >Release-Note: >Audit-Trail: State-Changed-From-To: open->closed State-Changed-By: pav State-Changed-When: Sat Aug 12 21:04:38 UTC 2006 State-Changed-Why: Committed, thanks! Please, next time, submit an update as an unified diff between old and new port directory. Also, USE_BZIP2=yes is better than EXTRACT_SFX http://www.freebsd.org/cgi/query-pr.cgi?pr=101922 >Unformatted: