From owner-svn-ports-all@FreeBSD.ORG Thu Jan 16 10:44:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1ADFA52B; Thu, 16 Jan 2014 10:44:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0589A18C7; Thu, 16 Jan 2014 10:44:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GAiMvc045874; Thu, 16 Jan 2014 10:44:22 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GAiMur045869; Thu, 16 Jan 2014 10:44:22 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201401161044.s0GAiMur045869@svn.freebsd.org> From: John Marino Date: Thu, 16 Jan 2014 10:44:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339906 - in head/games/exult: . 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.17 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: Thu, 16 Jan 2014 10:44:23 -0000 Author: marino Date: Thu Jan 16 10:44:21 2014 New Revision: 339906 URL: http://svnweb.freebsd.org/changeset/ports/339906 QAT: https://qat.redports.org/buildarchive/r339906/ Log: games/exult: Update to latest 1.5.x snapshot (Unbreaks F10+) The previous version of Exult, 1.2, is considered ancient by the developers. Morever, it's c++ was horrid, requiring around 3 dozen patches just to build on equally ancient gcc 4.5. Exult has not been released yet, but the snapshots are considered superior even to the last RC release, 1.4.9rc. The C++ code builds without patches on both gcc 4.7 (DragonFly) and clang from F10 (verified by Redports) The Exult Studio was added as an option, it's on by default. I did not add the Mod or usecode compiler. If somebody wants those, they can be added as options as well. While updating, support stage. Deleted: head/games/exult/files/patch-audio__midi_drivers__fmopldrv.h head/games/exult/files/patch-files-databuf.h head/games/exult/files/patch-files-rwregress.cc head/games/exult/files/patch-hash_utils.h head/games/exult/files/patch-mouse.h head/games/exult/files/patch-usecode-useval.cc head/games/exult/files/patch-usecode__ucxt__include__ucfunc.h Modified: head/games/exult/Makefile head/games/exult/distinfo head/games/exult/files/pkg-message.in head/games/exult/pkg-descr head/games/exult/pkg-plist Modified: head/games/exult/Makefile ============================================================================== --- head/games/exult/Makefile Thu Jan 16 09:40:39 2014 (r339905) +++ head/games/exult/Makefile Thu Jan 16 10:44:21 2014 (r339906) @@ -2,44 +2,48 @@ # $FreeBSD$ PORTNAME= exult -PORTVERSION= 1.2 -PORTREVISION= 6 +PORTVERSION= 1.5.0.20130315 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-all-versions/${PORTVERSION} +MASTER_SITES= http://www.math.leidenuniv.nl/~wpalenst/cvs/ +DISTNAME= exult-20130315-0400 MAINTAINER= ports@FreeBSD.org COMMENT= Ultima VII engine +LICENSE= GPLv2 + BUILD_DEPENDS= timidity:${PORTSDIR}/audio/timidity RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity USE_SDL= sdl mixer USE_XORG= x11 USES= gmake pkgconfig -USE_AUTOTOOLS= libtool +USE_AUTOTOOLS= libtool autoconf automake aclocal autoheader libtoolize +AUTOMAKE_ARGS= --add-missing CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_JOBS_UNSAFE= yes -MAN1= expack.1 ipack.1 shp2pcx.1 splitshp.1 textpack.1 -MAN6= exult.6 +WRKSRC= ${WRKDIR}/exult SUB_FILES= pkg-message -NO_STAGE= yes +OPTIONS_DEFINE= STUDIO +OPTIONS_DEFAULT=STUDIO +OPTIONS_SUB= yes +STUDIO_DESC= Install Exult Studio + .include -post-patch: - @${REINPLACE_CMD} -e 's|desktop||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure +.if ${PORT_OPTIONS:MSTUDIO} +CONFIGURE_ARGS+=--enable-exult-studio \ + --enable-exult-studio-support +USE_GNOME+= libglade2 +.endif post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in FAQ NEWS README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif - @${CAT} ${PKGMESSAGE} .include Modified: head/games/exult/distinfo ============================================================================== --- head/games/exult/distinfo Thu Jan 16 09:40:39 2014 (r339905) +++ head/games/exult/distinfo Thu Jan 16 10:44:21 2014 (r339906) @@ -1,2 +1,2 @@ -SHA256 (exult-1.2.tar.gz) = a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a -SIZE (exult-1.2.tar.gz) = 1722259 +SHA256 (exult-20130315-0400.tar.gz) = 368dc28016d56c5251531e4cff463d9ffcaa151d74bad65bdc5366c213e12fcc +SIZE (exult-20130315-0400.tar.gz) = 4784001 Modified: head/games/exult/files/pkg-message.in ============================================================================== --- head/games/exult/files/pkg-message.in Thu Jan 16 09:40:39 2014 (r339905) +++ head/games/exult/files/pkg-message.in Thu Jan 16 10:44:21 2014 (r339906) @@ -1,4 +1,4 @@ ****************************************************************************** -* Run Exult from directory, containing original Ultima VII data. +* Run Exult from directory containing original Ultima VII data. * Please, read %%DOCSDIR%%/README for additional information. ****************************************************************************** Modified: head/games/exult/pkg-descr ============================================================================== --- head/games/exult/pkg-descr Thu Jan 16 09:40:39 2014 (r339905) +++ head/games/exult/pkg-descr Thu Jan 16 10:44:21 2014 (r339906) @@ -1,6 +1,6 @@ Exult is an engine built for running Ultima VII usecode. With Exult you can play both "The Black Gate" and "Serpent Isle" parts of the game. -But original ORIGIN's Ultima VII data is still needed. Refer to README file -for details. +However, the original ORIGIN's Ultima VII data is required as Exult is +just the engine. Refer to README file for details. WWW: http://exult.sourceforge.net Modified: head/games/exult/pkg-plist ============================================================================== --- head/games/exult/pkg-plist Thu Jan 16 09:40:39 2014 (r339905) +++ head/games/exult/pkg-plist Thu Jan 16 10:44:21 2014 (r339906) @@ -1,24 +1,50 @@ bin/expack bin/exult +%%STUDIO%%bin/exult_studio +bin/ipack bin/shp2pcx bin/splitshp bin/textpack -bin/ucc bin/ucxt -@exec /bin/mkdir -p %D/share/exult/estudio/new +man/man1/expack.1.gz +man/man1/exult_studio.1.gz +man/man1/ipack.1.gz +man/man1/shp2pcx.1.gz +man/man1/splitshp.1.gz +man/man1/textpack.1.gz +man/man1/ucc.1.gz +man/man6/exult.6.gz +share/applications/exult.desktop +%%DATADIR%%/bg_mr_faces.vga +%%DATADIR%%/bg_paperdol.vga +%%STUDIO%%%%DATADIR%%/estudio/new/blends.dat +%%STUDIO%%%%DATADIR%%/estudio/new/combos.flx +%%STUDIO%%%%DATADIR%%/estudio/new/faces.vga +%%STUDIO%%%%DATADIR%%/estudio/new/fonts.vga +%%STUDIO%%%%DATADIR%%/estudio/new/gumps.vga +%%STUDIO%%%%DATADIR%%/estudio/new/palettes.flx +%%STUDIO%%%%DATADIR%%/estudio/new/paperdol.vga +%%STUDIO%%%%DATADIR%%/estudio/new/pointers.shp +%%STUDIO%%%%DATADIR%%/estudio/new/shapes.vga +%%STUDIO%%%%DATADIR%%/estudio/new/sprites.vga +%%STUDIO%%%%DATADIR%%/estudio/new/text.flx %%DATADIR%%/exult.flx %%DATADIR%%/exult_bg.flx +%%DATADIR%%/exult_iphone.flx %%DATADIR%%/exult_si.flx +%%STUDIO%%%%DATADIR%%/exult_studio.glade %%DATADIR%%/exultmsg.txt %%DATADIR%%/midisfx.flx %%DATADIR%%/u7bgintrinsics.data %%DATADIR%%/u7misc.data %%DATADIR%%/u7opcodes.data %%DATADIR%%/u7siintrinsics.data -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/estudio/new -@dirrm %%DATADIR%%/estudio -@dirrm %%DATADIR%% +%%DOCSDIR%%/FAQ +%%DOCSDIR%%/NEWS +%%DOCSDIR%%/README +share/icons/exult.png +@dirrmtry share/icons +%%STUDIO%%@dirrmtry %%DATADIR%%/estudio/new +%%STUDIO%%@dirrmtry %%DATADIR%%/estudio +@dirrmtry %%DATADIR%% +@dirrmtry %%DOCSDIR%%