Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Jan 2014 22:19:40 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341465 - in head/games/instead: . files
Message-ID:  <201401272219.s0RMJe9S032722@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Jan 27 22:19:40 2014
New Revision: 341465
URL: http://svnweb.freebsd.org/changeset/ports/341465
QAT: https://qat.redports.org/buildarchive/r341465/

Log:
  - Update to 2.0.1
  - Add LICENSE
  - Switch to cmake

Deleted:
  head/games/instead/files/
Modified:
  head/games/instead/Makefile
  head/games/instead/distinfo
  head/games/instead/pkg-plist

Modified: head/games/instead/Makefile
==============================================================================
--- head/games/instead/Makefile	Mon Jan 27 22:15:27 2014	(r341464)
+++ head/games/instead/Makefile	Mon Jan 27 22:19:40 2014	(r341465)
@@ -2,51 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	instead
-PORTVERSION=	1.9.1
-PORTREVISION=	2
+PORTVERSION=	2.0.1
 CATEGORIES=	games
-MASTER_SITES=	SF/instead/instead/${PORTVERSION}/ \
-		http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES=	SF/instead/instead/${PORTVERSION}/
 DISTNAME=	instead_${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple Text Adventure, The Interpreter
 
-HAS_CONFIGURE=	yes
-USES=		pkgconfig iconv gmake
-USE_GNOME=	gtk20
-USE_LUA=	5.1
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+LICENSE=	MIT
 
-CONFIGURE_SCRIPT=	configure.sh
-CONFIGURE_ENV=	PREFIX="${PREFIX}"
+USES=		cmake:outsource pkgconfig iconv
+CMAKE_ARGS=	-DMANDIR=man
+USE_LUA=	5.1
 
-WRKSRC=		${WRKDIR}/instead-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=SDL
+OPTIONS_DEFAULT=SDL GTK2
 OPTIONS_SINGLE=	SDL_VERSION
 OPTIONS_SINGLE_SDL_VERSION=	SDL SDL2
+OPTIONS_RADIO=	GTK_VERSION
+OPTIONS_RADIO_GTK_VERSION=	GTK2 GTK3
 
 SDL_VERSION_DESC=SDL version
 SDL_DESC=	Use SDL 1.2
 SDL2_DESC=	Use SDL 2.0
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSDL2}
-USE_SDL=	sdl2 image2 ttf2 mixer2
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|&-nonexistent|' ${WRKSRC}/configure.sh
-.else
-USE_SDL=	sdl image ttf mixer
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|sdl2-config|&-nonexistent|' ${WRKSRC}/configure.sh
-.endif
+GTK_VERSION_DESC=GTK version for file open dialog
+GTK2_DESC=	Use GTK 2
+GTK3_DESC=	Use GTK 3
+
+SDL_USE=	SDL=sdl,image,ttf,mixer
+SDL2_USE=	SDL=sdl2,image2,ttf2,mixer2
+SDL2_CMAKE_ON=	-DWITH_SDL2=ON
+SDL2_CMAKE_OFF=	-DWITH_SDL2=OFF
+GTK2_USE=	GNOME=gtk20
+GTK2_CMAKE_ON=	-DWITH_GTK2=ON
+GTK2_CMAKE_OFF=	-DWITH_GTK2=OFF
+GTK3_USE=	GNOME=gtk30
+GTK3_CMAKE_ON=	-DWITH_GTK3=ON
+GTK3_CMAKE_OFF=	-DWITH_GTK3=OFF
 
 .include <bsd.port.mk>

Modified: head/games/instead/distinfo
==============================================================================
--- head/games/instead/distinfo	Mon Jan 27 22:15:27 2014	(r341464)
+++ head/games/instead/distinfo	Mon Jan 27 22:19:40 2014	(r341465)
@@ -1,2 +1,2 @@
-SHA256 (instead_1.9.1.tar.gz) = f5577c5118b5f4a2897c7bb26f3ad7993005dbf0ae8fe762b4434e1151ddb430
-SIZE (instead_1.9.1.tar.gz) = 5551348
+SHA256 (instead_2.0.1.tar.gz) = 57fa913c0667a19b527e23ffcc48fc7a7cb57e23dce459d499902875d1bbf12e
+SIZE (instead_2.0.1.tar.gz) = 5559716

Modified: head/games/instead/pkg-plist
==============================================================================
--- head/games/instead/pkg-plist	Mon Jan 27 22:15:27 2014	(r341464)
+++ head/games/instead/pkg-plist	Mon Jan 27 22:19:40 2014	(r341465)
@@ -4,4 +4,5 @@ man/man6/instead.6.gz
 share/applications/instead.desktop
 share/pixmaps/sdl_instead.ico
 share/pixmaps/sdl_instead.png
+share/pixmaps/sdl_instead.svg
 share/pixmaps/sdl_instead_1.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401272219.s0RMJe9S032722>