Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Dec 2013 01:25:01 +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: r335803 - in head/games: . freeminer freeminer-default freeminer/files
Message-ID:  <201312070125.rB71P1bu019103@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Dec  7 01:25:01 2013
New Revision: 335803
URL: http://svnweb.freebsd.org/changeset/ports/335803

Log:
  - Add freeminer and freeminer-game: forks of minecraft and
    minecraft_game correspondingly
  
  Freeminer is a Minecraft-inspired sandbox game.
  
  WWW: http://freeminer.org/

Added:
  head/games/freeminer/
     - copied from r335645, head/games/minetest/
  head/games/freeminer-default/
     - copied from r335645, head/games/minetest_game/
  head/games/freeminer/files/freeminer.in
     - copied, changed from r335645, head/games/minetest/files/minetest.in
  head/games/freeminer/pkg-message   (contents, props changed)
Deleted:
  head/games/freeminer/files/minetest.in
Modified:
  head/games/Makefile
  head/games/freeminer-default/Makefile
  head/games/freeminer-default/distinfo
  head/games/freeminer-default/pkg-descr
  head/games/freeminer/Makefile
  head/games/freeminer/distinfo
  head/games/freeminer/pkg-descr
  head/games/freeminer/pkg-plist

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Sat Dec  7 01:03:55 2013	(r335802)
+++ head/games/Makefile	Sat Dec  7 01:25:01 2013	(r335803)
@@ -280,6 +280,8 @@
     SUBDIR += freedoko
     SUBDIR += freedroid
     SUBDIR += freedroidrpg
+    SUBDIR += freeminer
+    SUBDIR += freeminer-default
     SUBDIR += freera
     SUBDIR += freesweep
     SUBDIR += freesynd

Modified: head/games/freeminer-default/Makefile
==============================================================================
--- head/games/minetest_game/Makefile	Wed Dec  4 22:31:40 2013	(r335645)
+++ head/games/freeminer-default/Makefile	Sat Dec  7 01:25:01 2013	(r335803)
@@ -1,23 +1,26 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	minetest_game
-PORTVERSION=	0.4.8
+PORTNAME=	default
+PORTVERSION=	0.4.8.2
 CATEGORIES=	games
+PKGNAMEPREFIX=	freeminer-
+DIST_SUBDIR=	freeminer
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	The main game for the Minetest game engine
+COMMENT=	The main game for the Freeminer game engine
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	minetest:${PORTSDIR}/games/minetest
+RUN_DEPENDS=	freeminer:${PORTSDIR}/games/freeminer
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	minetest
-GH_COMMIT=	51de423
+GH_ACCOUNT=	freeminer
+GH_PROJECT=	${PORTNAME}
+GH_COMMIT=	6261db9
 
 NO_BUILD=	yes
-DATADIR=	${PREFIX}/share/minetest/games/${PORTNAME}
+DATADIR=	${PREFIX}/share/freeminer/games/${PORTNAME}
 PORTDATA=	*
 
 do-install:

Modified: head/games/freeminer-default/distinfo
==============================================================================
--- head/games/minetest_game/distinfo	Wed Dec  4 22:31:40 2013	(r335645)
+++ head/games/freeminer-default/distinfo	Sat Dec  7 01:25:01 2013	(r335803)
@@ -1,2 +1,2 @@
-SHA256 (minetest_game-0.4.8.tar.gz) = a323beed31db267c220fbab2621ae025d623b32be34ac28bbdd6ef7d15feea1c
-SIZE (minetest_game-0.4.8.tar.gz) = 751763
+SHA256 (freeminer/default-0.4.8.2.tar.gz) = 7372ea4835dd79e9a317ef0b523291afa39edd324dff34208b679ae1fbeaa82b
+SIZE (freeminer/default-0.4.8.2.tar.gz) = 765200

Modified: head/games/freeminer-default/pkg-descr
==============================================================================
--- head/games/minetest_game/pkg-descr	Wed Dec  4 22:31:40 2013	(r335645)
+++ head/games/freeminer-default/pkg-descr	Sat Dec  7 01:25:01 2013	(r335803)
@@ -1,3 +1,3 @@
-The main game for the Minetest game engine.
+Default game for freeminer
 
-WWW: http://minetest.net/
+WWW: http://freeminer.org/

Modified: head/games/freeminer/Makefile
==============================================================================
--- head/games/minetest/Makefile	Wed Dec  4 22:31:40 2013	(r335645)
+++ head/games/freeminer/Makefile	Sat Dec  7 01:25:01 2013	(r335803)
@@ -1,12 +1,12 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	minetest
-PORTVERSION=	0.4.8
+PORTNAME=	freeminer
+PORTVERSION=	0.4.8.2
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	Infiniminer/Minecraft inspired game
+COMMENT=	Open source sandbox game inspired by Minecraft
 
 LICENSE=	LGPL21
 
@@ -14,8 +14,8 @@ LIB_DEPENDS=	libIrrlicht.so:${PORTSDIR}/
 		sqlite3:${PORTSDIR}/databases/sqlite3
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	minetest
-GH_COMMIT=	122875c
+GH_ACCOUNT=	${PORTNAME}
+GH_COMMIT=	79bf405
 
 USES=		cmake
 CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
@@ -69,8 +69,8 @@ LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/a
 
 .if ${PORT_OPTIONS:MSERVER}
 USE_RC_SUBR=	${PORTNAME}
-USERS=		${PORTNAME}
-GROUPS=		${PORTNAME}
+USERS=		minetest # reuse, as freeminer is a fork of
+GROUPS=		minetest
 .endif
 
 post-patch:

Modified: head/games/freeminer/distinfo
==============================================================================
--- head/games/minetest/distinfo	Wed Dec  4 22:31:40 2013	(r335645)
+++ head/games/freeminer/distinfo	Sat Dec  7 01:25:01 2013	(r335803)
@@ -1,2 +1,2 @@
-SHA256 (minetest-0.4.8.tar.gz) = 657329dd4733801617f32f110e527ce6e0fc93d30168683842f881414d28c309
-SIZE (minetest-0.4.8.tar.gz) = 5157034
+SHA256 (freeminer-0.4.8.2.tar.gz) = 38606ece229b82332765b7777a6ed97f0062eeb1ded4a3b5e1a1211720047f14
+SIZE (freeminer-0.4.8.2.tar.gz) = 5313173

Copied and modified: head/games/freeminer/files/freeminer.in (from r335645, head/games/minetest/files/minetest.in)
==============================================================================
--- head/games/minetest/files/minetest.in	Wed Dec  4 22:31:40 2013	(r335645, copy source)
+++ head/games/freeminer/files/freeminer.in	Sat Dec  7 01:25:01 2013	(r335803)
@@ -2,74 +2,74 @@
 
 # $FreeBSD$
 #
-# PROVIDE: minetest
+# PROVIDE: freeminer
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
-# Add the following line to /etc/rc.conf[.local] to enable minetest server
+# Add the following line to /etc/rc.conf[.local] to enable freeminer server
 #
-# minetest_enable (bool):  Set to "NO" by default
-#                          Set it to "YES" to enable minetest server
-# minetest_conffile (str): Path to config file (required).
-#                          (default: /usr/local/etc/minetest.conf)
-# minetest_rundir (str):   Path to directory holding a pidfile.
-#                          (default: /var/run/minetest)
-# minetest_user (str):     User to run as
-#                          (default: minetest)
-# minetest_group (str):    Group to run as
-#                          (default: minetest)
-# minetest_logdir (str):   Path to log directory
-#                          (default: /var/log/minetest)
-# minetest_dbdir (str):    Path to world database directory
-#                          (default: /var/db/minetest)
+# freeminer_enable (bool):  Set to "NO" by default
+#                          Set it to "YES" to enable freeminer server
+# freeminer_conffile (str): Path to config file (required).
+#                          (default: /usr/local/etc/freeminer.conf)
+# freeminer_rundir (str):   Path to directory holding a pidfile.
+#                          (default: /var/run/freeminer)
+# freeminer_user (str):     User to run as
+#                          (default: freeminer)
+# freeminer_group (str):    Group to run as
+#                          (default: freeminer)
+# freeminer_logdir (str):   Path to log directory
+#                          (default: /var/log/freeminer)
+# freeminer_dbdir (str):    Path to world database directory
+#                          (default: /var/db/freeminer)
 
 . /etc/rc.subr
 
-name=minetest
-rcvar=minetest_enable
+name=freeminer
+rcvar=freeminer_enable
 
 load_rc_config ${name}
 
-: ${minetest_enable="NO"}
-: ${minetest_config="/usr/local/etc/minetest.conf"}
-: ${minetest_rundir="/var/run/minetest"}
-: ${minetest_user="minetest"}
-: ${minetest_group="minetest"}
-: ${minetest_logdir="/var/log/minetest"}
-: ${minetest_dbdir="/var/db/minetest"}
-: ${minetest_args:="--logfile ${minetest_logdir}/debug.log --world ${minetest_dbdir}/world ${minetest_flags}"}
+: ${freeminer_enable="NO"}
+: ${freeminer_config="/usr/local/etc/freeminer.conf"}
+: ${freeminer_rundir="/var/run/freeminer"}
+: ${freeminer_user="freeminer"}
+: ${freeminer_group="freeminer"}
+: ${freeminer_logdir="/var/log/freeminer"}
+: ${freeminer_dbdir="/var/db/freeminer"}
+: ${freeminer_args:="--logfile ${freeminer_logdir}/debug.log --world ${freeminer_dbdir}/world ${freeminer_flags}"}
 
 pidfile=
 
-case "${minetest_args}" in
+case "${freeminer_args}" in
 *--config\ *)
-	echo "Warning \$minetest_args includes --config option." \
-	     "Please use \$minetest_conffile instead."
+	echo "Warning \$freeminer_args includes --config option." \
+	     "Please use \$freeminer_conffile instead."
 	;;
 *)
-	minetest_args="--config ${minetest_config} ${minetest_args}"
+	freeminer_args="--config ${freeminer_config} ${freeminer_args}"
 	;;
 esac
 
 command=/usr/sbin/daemon
-procname=/usr/local/bin/minetestserver
-pidfile=${minetest_rundir}/minetest.pid
-command_args="-c -f -p ${pidfile} ${procname} ${minetest_args}"
-required_files=${minetest_config}
-start_precmd=minetest_prestart
-
-minetest_prestart () {
-	if [ ! -d ${minetest_rundir} ]; then
-		mkdir -m 755 -p ${minetest_rundir}
-		chown -R ${minetest_user}:${minetest_group} ${minetest_rundir}
+procname=/usr/local/bin/freeminerserver
+pidfile=${freeminer_rundir}/freeminer.pid
+command_args="-c -f -p ${pidfile} ${procname} ${freeminer_args}"
+required_files=${freeminer_config}
+start_precmd=freeminer_prestart
+
+freeminer_prestart () {
+	if [ ! -d ${freeminer_rundir} ]; then
+		mkdir -m 755 -p ${freeminer_rundir}
+		chown -R ${freeminer_user}:${freeminer_group} ${freeminer_rundir}
 	fi
-	if [ ! -d ${minetest_logdir} ]; then
-		mkdir -m 755 -p ${minetest_logdir}
-		chown -R ${minetest_user}:${minetest_group} ${minetest_logdir}
+	if [ ! -d ${freeminer_logdir} ]; then
+		mkdir -m 755 -p ${freeminer_logdir}
+		chown -R ${freeminer_user}:${freeminer_group} ${freeminer_logdir}
 	fi
-	if [ ! -d ${minetest_dbdir} ]; then
-		mkdir -m 755 -p ${minetest_dbdir}/data
-		chown -R ${minetest_user}:${minetest_group} ${minetest_dbdir}
+	if [ ! -d ${freeminer_dbdir} ]; then
+		mkdir -m 755 -p ${freeminer_dbdir}/data
+		chown -R ${freeminer_user}:${freeminer_group} ${freeminer_dbdir}
 	fi
 }
 

Modified: head/games/freeminer/pkg-descr
==============================================================================
--- head/games/minetest/pkg-descr	Wed Dec  4 22:31:40 2013	(r335645)
+++ head/games/freeminer/pkg-descr	Sat Dec  7 01:25:01 2013	(r335803)
@@ -1,4 +1,3 @@
-Minetest is an infinite-world block sandbox game and a game engine,
-inspired by InfiniMiner, Minecraft and the like.
+Freeminer is a Minecraft-inspired sandbox game.
 
-WWW: http://minetest.net/
+WWW: http://freeminer.org/

Added: head/games/freeminer/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/freeminer/pkg-message	Sat Dec  7 01:25:01 2013	(r335803)
@@ -0,0 +1,9 @@
+Freeminer engine has been installed.
+
+Note that for offline play or for server hosting you also need
+to install game data. For now, only one game is available for
+freeminer and you can install it with games/freeminer-default
+port.
+
+For online play engine is sufficient as it will downloaded all
+required data automatically.

Modified: head/games/freeminer/pkg-plist
==============================================================================
--- head/games/minetest/pkg-plist	Wed Dec  4 22:31:40 2013	(r335645)
+++ head/games/freeminer/pkg-plist	Sat Dec  7 01:25:01 2013	(r335803)
@@ -1,13 +1,7 @@
-%%CLIENT%%bin/minetest
-%%SERVER%%bin/minetestserver
-@unexec if cmp -s %D/etc/minetest.conf.example %D/etc/minetest.conf; then rm -f %D/etc/minetest.conf; fi
-etc/minetest.conf.example
-@exec if [ ! -f %B/minetest.conf ]; then cp -p %D/%F %B/minetest.conf; fi
-man/man6/minetest.6.gz
-man/man6/minetestserver.6.gz
-share/applications/minetest.desktop
-share/icons/hicolor/scalable/apps/minetest-icon.svg
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
+%%CLIENT%%bin/freeminer
+%%SERVER%%bin/freeminerserver
+@unexec if cmp -s %D/etc/freeminer.conf.example %D/etc/freeminer.conf; then rm -f %D/etc/freeminer.conf; fi
+etc/freeminer.conf.example
+@exec if [ ! -f %B/freeminer.conf ]; then cp -p %D/%F %B/freeminer.conf; fi
+man/man6/freeminer.6.gz
+man/man6/freeminerserver.6.gz



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