From owner-svn-ports-all@FreeBSD.ORG Tue Feb 5 09:15:14 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E9D8B4EC; Tue, 5 Feb 2013 09:15:14 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CD6CB13D; Tue, 5 Feb 2013 09:15:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r159FEMo010423; Tue, 5 Feb 2013 09:15:14 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r159FE4U010416; Tue, 5 Feb 2013 09:15:14 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201302050915.r159FE4U010416@svn.freebsd.org> From: Martin Wilke Date: Tue, 5 Feb 2013 09:15:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311678 - in head/games/super_methane_brothers: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Feb 2013 09:15:15 -0000 Author: miwi Date: Tue Feb 5 09:15:13 2013 New Revision: 311678 URL: http://svnweb.freebsd.org/changeset/ports/311678 Log: - Update to 1.5.1 PR: 175043 Submitted by: Ports Fury Added: head/games/super_methane_brothers/files/ head/games/super_methane_brothers/files/patch-sources__methane.cpp (contents, props changed) head/games/super_methane_brothers/pkg-req (contents, props changed) Deleted: head/games/super_methane_brothers/pkg-install head/games/super_methane_brothers/pkg-plist Modified: head/games/super_methane_brothers/Makefile head/games/super_methane_brothers/distinfo (contents, props changed) Modified: head/games/super_methane_brothers/Makefile ============================================================================== --- head/games/super_methane_brothers/Makefile Tue Feb 5 09:12:52 2013 (r311677) +++ head/games/super_methane_brothers/Makefile Tue Feb 5 09:15:13 2013 (r311678) @@ -2,42 +2,52 @@ # $FreeBSD$ PORTNAME= super_methane_brothers -PORTVERSION= 1.4.8 -PORTREVISION= 5 +PORTVERSION= 1.5.1 CATEGORIES= games MASTER_SITES= SF/methane/Methane%20Stable/Methane%20V${PORTVERSION} DISTNAME= methane-${PORTVERSION} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A port of the Amiga platform game of the same name +COMMENT= Port of the Amiga platform game of the same name -LIB_DEPENDS= clanCore:${PORTSDIR}/devel/clanlib1 \ - mikmod:${PORTSDIR}/audio/libmikmod +LICENSE= GPLv2 +LIB_DEPENDS= clan23Core:${PORTSDIR}/devel/clanlib \ + execinfo:${PORTSDIR}/devel/libexecinfo + +USE_GCC= 4.6+ +USE_GL= glu +USE_PKGCONFIG= build USE_GMAKE= yes -MAKEFILE= makefile -BUILD_WRKSRC= ${WRKSRC}/source/linux +MAKE_ENV= METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LDFLAGS}" +MAKE_JOBS_UNSAFE= yes + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo + +PORTDOCS= * +PLIST_FILES= bin/methane + +.include post-patch: @${REINPLACE_CMD} -e \ - 's|g++|${CXX}|; s|gcc|${CXX}|; \ - s|^\(METHANE_FLAGS =\)|\1 ${CPPFLAGS}|; \ - s|^\(METHANE_LIBS =\)|\1 ${LDFLAGS}|; \ - s|0.8|1.0|g' \ - ${BUILD_WRKSRC}/makefile + 's|-2.2|-2.3|g ; \ + s|FLAGS =|FLAGS +=| ; \ + s|LIBS =|LIBS +=| ; \ + s|g++|$${CXX}| ; \ + s|gcc|$${CXX}|' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/methane ${PREFIX}/bin + (cd ${WRKDIR}/${DISTNAME} && ${INSTALL_PROGRAM} methane ${PREFIX}/bin) ${CHGRP} games ${PREFIX}/bin/methane ${CHMOD} g+s ${PREFIX}/bin/methane -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/html - cd ${WRKSRC} && ${INSTALL_DATA} authors history readme todo ${DOCSDIR} - cd ${WRKSRC}/docs && ${INSTALL_DATA} *.gif *.html ${DOCSDIR}/html +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + @(cd ${WRKDIR}/${DISTNAME}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}) .endif - -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGREQ} ${PKGNAME} POST-INSTALL .include Modified: head/games/super_methane_brothers/distinfo ============================================================================== --- head/games/super_methane_brothers/distinfo Tue Feb 5 09:12:52 2013 (r311677) +++ head/games/super_methane_brothers/distinfo Tue Feb 5 09:15:13 2013 (r311678) @@ -1,2 +1,2 @@ -SHA256 (methane-1.4.8.tgz) = 7e91d0b478b133a74565f0a7a01783cdda20bd555ca92feb4da66e51b51a9289 -SIZE (methane-1.4.8.tgz) = 1063099 +SHA256 (methane-1.5.1.tgz) = ac1de7009e638c784b4d413b56a4387be94a31bd5fe3050db7b51e39ccfdd248 +SIZE (methane-1.5.1.tgz) = 1057881 Added: head/games/super_methane_brothers/files/patch-sources__methane.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/super_methane_brothers/files/patch-sources__methane.cpp Tue Feb 5 09:15:13 2013 (r311678) @@ -0,0 +1,24 @@ +--- sources/methane.cpp.orig 2011-12-11 14:18:38.301132904 +0100 ++++ sources/methane.cpp 2011-12-11 14:15:32.669126965 +0100 +@@ -105,15 +105,15 @@ + return 0; + } + +- CL_AutoPtr setup_sound; +- CL_AutoPtr sound_output; +- CL_AutoPtr setup_mikmod; ++ CL_UniquePtr setup_sound; ++ CL_UniquePtr sound_output; ++ CL_UniquePtr setup_mikmod; + + if (GLOBAL_SoundEnable) + { +- setup_sound = new CL_SetupSound; +- sound_output = new CL_SoundOutput(44100); +- setup_mikmod = new CL_SetupMikMod; ++ setup_sound = cl_move(CL_UniquePtr(new CL_SetupSound)); ++ sound_output = cl_move(CL_UniquePtr(new CL_SoundOutput(44100))); ++ setup_mikmod = cl_move(CL_UniquePtr(new CL_SetupMikMod)); + } + + // Set the video mode Added: head/games/super_methane_brothers/pkg-req ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/super_methane_brothers/pkg-req Tue Feb 5 09:15:13 2013 (r311678) @@ -0,0 +1,16 @@ +#!/bin/sh + +SCOREFILE="/var/games/methane.scores" + +if [ "x$2" = "xPOST-INSTALL" ]; then + mkdir -p /var/games + touch $SCOREFILE + chown root:games $SCOREFILE + chmod 664 $SCOREFILE +fi + +if [ "x$2" = "xPOST-DEINSTALL" ]; then + if [ ! -s $SCOREFILE ]; then + rm -f $SCOREFILE + fi +fi