From owner-svn-ports-head@FreeBSD.ORG Sun Jun 8 03:11:57 2014 Return-Path: Delivered-To: svn-ports-head@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 2CC9B718; Sun, 8 Jun 2014 03:11:57 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B9B52C45; Sun, 8 Jun 2014 03:11:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s583BuLS093813; Sun, 8 Jun 2014 03:11:56 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s583ButU093811; Sun, 8 Jun 2014 03:11:56 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201406080311.s583ButU093811@svn.freebsd.org> From: "Vanilla I. Shu" Date: Sun, 8 Jun 2014 03:11:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356968 - head/games/minecraft-server 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.18 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: Sun, 08 Jun 2014 03:11:57 -0000 Author: vanilla Date: Sun Jun 8 03:11:56 2014 New Revision: 356968 URL: http://svnweb.freebsd.org/changeset/ports/356968 QAT: https://qat.redports.org/buildarchive/r356968/ Log: 1: Stagify. 2: use @sample on pkg-plist. 3: bump version. Modified: head/games/minecraft-server/Makefile head/games/minecraft-server/pkg-plist Modified: head/games/minecraft-server/Makefile ============================================================================== --- head/games/minecraft-server/Makefile Sun Jun 8 02:48:40 2014 (r356967) +++ head/games/minecraft-server/Makefile Sun Jun 8 03:11:56 2014 (r356968) @@ -3,6 +3,7 @@ PORTNAME= minecraft-server PORTVERSION= 1.4.7 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= http://assets.minecraft.net/${PORTVERSION:S|.|_|g}/ \ http://media-mcw.cursecdn.com/f/f7/:icon @@ -40,7 +41,6 @@ CONFIG_FILES= banned-ips.txt \ server.properties \ white-list.txt -NO_STAGE= yes .include .if ${PORT_OPTIONS:MX11} @@ -59,10 +59,10 @@ PLIST_SUB+= X11="@comment " .endif do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/minecraft_server.jar ${DATADIR}/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/minecraft_server.jar ${STAGEDIR}${DATADIR}/ .if ${PORT_OPTIONS:MX11} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Bookshelf.png ${PREFIX}/share/pixmaps/minecraft-server.png + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Bookshelf.png ${STAGEDIR}${PREFIX}/share/pixmaps/minecraft-server.png .endif echo "#!/bin/sh" > ${WRKDIR}/${PORTNAME} echo "if ! test -d ~/.minecraft-server ; then" >> ${WRKDIR}/${PORTNAME} @@ -73,22 +73,13 @@ do-install: echo "java -Xmx1024M -Xms1024M -jar ${DATADIR}/minecraft_server.jar" >> ${WRKDIR}/${PORTNAME} echo "java -Xmx1024M -Xms1024M -jar ${DATADIR}/minecraft_server.jar nogui" >> ${WRKDIR}/${PORTNAME}-nogui .if ${PORT_OPTIONS:MX11} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .endif - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-nogui ${PREFIX}/bin/ - ${MKDIR} ${ETCDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-nogui ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${ETCDIR} .for file in ${CONFIG_FILES} - ${INSTALL_DATA} ${FILESDIR}/${file}.sample ${DATADIR} - if [ ! -f ${ETCDIR}/${file} ]; then \ - ${CP} -p ${DATADIR}/${file}.sample ${ETCDIR}/${file} ; \ - fi - ${CHMOD} 644 ${DATADIR}/${file}* ${ETCDIR}/${file} - ${LN} -s ${ETCDIR}/${file} ${DATADIR}/${file} + ${INSTALL_DATA} ${FILESDIR}/${file}.sample ${STAGEDIR}${ETCDIR} + ${CHMOD} 644 ${STAGEDIR}${ETCDIR}/${file}.sample .endfor - ${CHOWN} -R ${USERS}:${GROUPS} ${DATADIR} - ${CHOWN} -R ${USERS}:${GROUPS} ${ETCDIR} - -post-install: - ${CAT} ${PKGMESSAGE} .include Modified: head/games/minecraft-server/pkg-plist ============================================================================== --- head/games/minecraft-server/pkg-plist Sun Jun 8 02:48:40 2014 (r356967) +++ head/games/minecraft-server/pkg-plist Sun Jun 8 03:11:56 2014 (r356968) @@ -1,28 +1,16 @@ @stopdaemon minecraft -%%DATADIR%%/minecraft_server.jar %%X11%%bin/minecraft-server bin/minecraft-server-nogui -@exec mkdir -p %D/etc/minecraft -@unexec if cmp -s %D/%%DATADIR%%/ops.txt.sample %D/etc/minecraft/ops.txt; then rm -f %D/etc/minecraft/ops.txt; fi -@unexec if cmp -s %D/%%DATADIR%%/banned-ips.txt.sample %D/etc/minecraft/banned-ips.txt; then rm -f %D/etc/minecraft/banned-ips.txt; fi -@unexec if cmp -s %D/%%DATADIR%%/banned-players.txt.sample %D/etc/minecraft/banned-players.txt; then rm -f %D/etc/minecraft/banned-players.txt; fi -@unexec if cmp -s %D/%%DATADIR%%/white-list.txt.sample %D/etc/minecraft/white-list.txt; then rm -f %D/etc/minecraft/white-list.txt; fi -@unexec if cmp -s %D/%%DATADIR%%/server.properties.sample %D/etc/minecraft/server.properties; then rm -f %D/etc/minecraft/server.properties; fi -%%DATADIR%%/server.properties -%%DATADIR%%/ops.txt -%%DATADIR%%/white-list.txt -%%DATADIR%%/banned-ips.txt -%%DATADIR%%/banned-players.txt -%%DATADIR%%/server.properties.sample -@exec if [ ! -f %D/etc/minecraft/server.properties ] ; then cp -p %D/%F %B/server.properties; fi -%%DATADIR%%/ops.txt.sample -@exec if [ ! -f %D/etc/minecraft/ops.txt ] ; then cp -p %D/%F %B/ops.txt; fi -%%DATADIR%%/white-list.txt.sample -@exec if [ ! -f %D/etc/minecraft/white-list.txt ] ; then cp -p %D/%F %B/white-list.txt; fi -%%DATADIR%%/banned-ips.txt.sample -@exec if [ ! -f %D/etc/minecraft/banned-ips.txt ] ; then cp -p %D/%F %B/banned-ips.txt; fi -%%DATADIR%%/banned-players.txt.sample -@exec if [ ! -f %D/etc/minecraft/banned-players.txt ] ; then cp -p %D/%F %B/banned-players.txt; fi +@owner mcserver +@group mcserver +@sample %%ETCDIR%%/banned-ips.txt.sample +@sample %%ETCDIR%%/banned-players.txt.sample +@sample %%ETCDIR%%/ops.txt.sample +@sample %%ETCDIR%%/server.properties.sample +@sample %%ETCDIR%%/white-list.txt.sample +%%DATADIR%%/minecraft_server.jar +@owner +@group %%X11%%share/pixmaps/minecraft-server.png @dirrmtry %%DATADIR%% -@dirrmtry etc/minecraft +@dirrmtry %%ETCDIR%%