From owner-svn-ports-head@FreeBSD.ORG Thu Nov 22 15:37:59 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8912996E; Thu, 22 Nov 2012 15:37:59 +0000 (UTC) (envelope-from danfe@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 64E098FC08; Thu, 22 Nov 2012 15:37:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAMFbxnn010697; Thu, 22 Nov 2012 15:37:59 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAMFbx8e010694; Thu, 22 Nov 2012 15:37:59 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201211221537.qAMFbx8e010694@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 22 Nov 2012 15:37:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307656 - in head/games/uhexen: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2012 15:37:59 -0000 Author: danfe Date: Thu Nov 22 15:37:58 2012 New Revision: 307656 URL: http://svnweb.freebsd.org/changeset/ports/307656 Log: - Switch to the official sf.net CDN in MASTER_SITES - Integrate with our standard shareware game data port - Convert to the new OPTIONS framework - Relinquish maintainership, cleanup Makefile Feature safe: yes Modified: head/games/uhexen/Makefile head/games/uhexen/distinfo head/games/uhexen/files/patch-src::h2_main.c Modified: head/games/uhexen/Makefile ============================================================================== --- head/games/uhexen/Makefile Thu Nov 22 14:58:09 2012 (r307655) +++ head/games/uhexen/Makefile Thu Nov 22 15:37:58 2012 (r307656) @@ -1,62 +1,34 @@ -# New ports collection makefile for: U-Hexen -# Date created: 10 February 2003 -# Whom: Maxim Sobolev -# +# Created by: Maxim Sobolev # $FreeBSD$ -# PORTNAME= uhexen PORTVERSION= 0.601 PORTREVISION= 8 CATEGORIES= games -MASTER_SITES= http://uhexen.sourceforge.net/ -DISTNAME= ${PORTNAME}-latest +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/U-hexen%20version%20${PORTVERSION} -MAINTAINER= danfe@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Yet another port of Hexen, popular game from Raven Software -USE_SDL= mixer sdl USE_GMAKE= yes +USE_SDL= mixer sdl -OPTIONS= WAD "Install demo-version WAD file" on \ - MUSIC "Enable support for in-game music" on +OPTIONS_DEFINE= MUSIC +OPTIONS_DEFAULT= MUSIC +MUSIC_DESC= In-game MIDI music support .include .if ${ARCH} == "powerpc" -BROKEN= Does not compile on powerpc +BROKEN= Does not compile on ${ARCH} .endif -.if !defined(WITHOUT_WAD) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} hexen.zip -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -PLIST_SUB= WAD="" -.else -PLIST_SUB= WAD="@comment " -.endif - -.if !defined(WITHOUT_MUSIC) -RUN_DEPENDS+= ${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity -.endif - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -PLIST_FILES= bin/uhexen %%DATADIR%%/.keep_me %%WAD%%%%DATADIR%%/hexen.wad -PLIST_DIRS= %%DATADIR%% - -post-extract: -.if !defined(WITHOUT_WAD) - @${UNZIP_CMD} -qo ${DISTDIR}/hexen.zip \ - -d ${WRKSRC} +.if ${PORT_OPTIONS:MMUSIC} +RUN_DEPENDS= ${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/uhexen ${PREFIX}/bin - @${MKDIR} ${DATADIR} -.if !defined(WITHOUT_WAD) - ${INSTALL_DATA} ${WRKSRC}/hexen.wad ${DATADIR} -.endif - @${TOUCH} ${DATADIR}/.keep_me + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin +.include "${.CURDIR}/../doom-data/Makefile.include" .include Modified: head/games/uhexen/distinfo ============================================================================== --- head/games/uhexen/distinfo Thu Nov 22 14:58:09 2012 (r307655) +++ head/games/uhexen/distinfo Thu Nov 22 15:37:58 2012 (r307656) @@ -1,4 +1,2 @@ -SHA256 (uhexen-latest.tar.gz) = 2bcfee59530573b44d3cf560a9df285da4af0407f9ab68ee05ee3e537f1457de -SIZE (uhexen-latest.tar.gz) = 407703 -SHA256 (hexen.zip) = 739aa91b307b5b2dc46089f7a062cde0559bb5b75859d46950b2f1812f7e54f6 -SIZE (hexen.zip) = 5216479 +SHA256 (uhexen-0.601.tar.gz) = 2bcfee59530573b44d3cf560a9df285da4af0407f9ab68ee05ee3e537f1457de +SIZE (uhexen-0.601.tar.gz) = 407703 Modified: head/games/uhexen/files/patch-src::h2_main.c ============================================================================== --- head/games/uhexen/files/patch-src::h2_main.c Thu Nov 22 14:58:09 2012 (r307655) +++ head/games/uhexen/files/patch-src::h2_main.c Thu Nov 22 15:37:58 2012 (r307656) @@ -8,7 +8,7 @@ $FreeBSD$ { "hexen.wad", - "/usr/local/share/games/uhexen/hexen.wad" -+ PREFIX "/share/uhexen/hexen.wad" ++ PREFIX "/share/doom/hexen.wad" }; #else static char *wadfiles[MAXWADFILES] =