Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Nov 2014 01:17:33 +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: r373389 - head/games/freeminer
Message-ID:  <201411250117.sAP1HXjW012104@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Nov 25 01:17:32 2014
New Revision: 373389
URL: https://svnweb.freebsd.org/changeset/ports/373389
QAT: https://qat.redports.org/buildarchive/r373389/

Log:
  - Update to 0.4.10.4
  - Use @sample

Modified:
  head/games/freeminer/Makefile
  head/games/freeminer/distinfo
  head/games/freeminer/pkg-plist

Modified: head/games/freeminer/Makefile
==============================================================================
--- head/games/freeminer/Makefile	Tue Nov 25 00:40:17 2014	(r373388)
+++ head/games/freeminer/Makefile	Tue Nov 25 01:17:32 2014	(r373389)
@@ -2,24 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	freeminer
-PORTVERSION=	0.4.9.3
-PORTREVISION=	5
+PORTVERSION=	0.4.10.4
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open source sandbox game inspired by Minecraft
 
-LICENSE=	LGPL21
+LICENSE=	LGPL21 GPLv3 # or later
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
-GH_COMMIT=	cfd8282
+GH_COMMIT=	900587a
 
-USES=		cmake
+USES=		compiler:c++11-lib cmake
 CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
-		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \
+		-DRUN_IN_PLACE=0
 
 PORTDATA=	*
 PORTDOCS=	*
@@ -63,6 +65,10 @@ LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${P
 
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 900000
+BROKEN=		does not build (lack of long long support)
+.endif
+
 .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
 USES+=		openal
 LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
@@ -85,7 +91,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/*.cmake
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|' \
 		${WRKSRC}/src/CMakeLists.txt
 .if ! ${PORT_OPTIONS:MLUAJIT}
 	@${REINPLACE_CMD} -e '/find_/ s|LUA_|NO&|g' \
@@ -94,5 +100,7 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/games
+	@${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.example \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>

Modified: head/games/freeminer/distinfo
==============================================================================
--- head/games/freeminer/distinfo	Tue Nov 25 00:40:17 2014	(r373388)
+++ head/games/freeminer/distinfo	Tue Nov 25 01:17:32 2014	(r373389)
@@ -1,2 +1,2 @@
-SHA256 (freeminer-0.4.9.3.tar.gz) = b7170467db99077cf00df8476642436ad744477500d55da444b8e4fa26cf37b5
-SIZE (freeminer-0.4.9.3.tar.gz) = 5361739
+SHA256 (freeminer-0.4.10.4.tar.gz) = 1002fa47f2fa1aa0ef63acb1636a741c8afc14e122ce2230b058c60d7b450b12
+SIZE (freeminer-0.4.10.4.tar.gz) = 5770067

Modified: head/games/freeminer/pkg-plist
==============================================================================
--- head/games/freeminer/pkg-plist	Tue Nov 25 00:40:17 2014	(r373388)
+++ head/games/freeminer/pkg-plist	Tue Nov 25 01:17:32 2014	(r373389)
@@ -1,10 +1,9 @@
 %%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
+@sample etc/freeminer.conf.sample
 man/man6/freeminer.6.gz
 man/man6/freeminerserver.6.gz
+share/appdata/freeminer.appdata.xml
 share/applications/freeminer.desktop
 share/icons/hicolor/scalable/apps/freeminer.svg
 @dir %%DATADIR%%/games



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