From owner-svn-ports-head@FreeBSD.ORG Fri Aug 17 10:20:48 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA5CA106564A; Fri, 17 Aug 2012 10:20:48 +0000 (UTC) (envelope-from knu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D46BE8FC0A; Fri, 17 Aug 2012 10:20:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7HAKmXL056113; Fri, 17 Aug 2012 10:20:48 GMT (envelope-from knu@svn.freebsd.org) Received: (from knu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7HAKmgO056106; Fri, 17 Aug 2012 10:20:48 GMT (envelope-from knu@svn.freebsd.org) Message-Id: <201208171020.q7HAKmgO056106@svn.freebsd.org> From: Akinori MUSHA Date: Fri, 17 Aug 2012 10:20:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302674 - in head: . games/unnethack games/unnethack/files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 17 Aug 2012 10:20:49 -0000 Author: knu Date: Fri Aug 17 10:20:48 2012 New Revision: 302674 URL: http://svn.freebsd.org/changeset/ports/302674 Log: Update unnethack to 4.0.0.20120401. Chagne the place for variable files from $PREFIX/share/unnethack to $PREFIX/var/games/unnethack. Deleted: head/games/unnethack/files/patch-makefile.src head/games/unnethack/files/patch-makefile.utl head/games/unnethack/files/patch-system.h Modified: head/UPDATING head/games/unnethack/Makefile head/games/unnethack/distinfo head/games/unnethack/files/patch-config.h head/games/unnethack/files/pkg-deinstall.in head/games/unnethack/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Aug 17 09:53:30 2012 (r302673) +++ head/UPDATING Fri Aug 17 10:20:48 2012 (r302674) @@ -5,6 +5,24 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20120817: + AFFECTS: users of games/unnethack + AUTHOR: knu@FreeBSD.org + + The place for variable files has changed from + $PREFIX/share/unnethack to $PREFIX/var/games/unnethack. To keep + your saved files and game records, please manually move the + following files and directories to the new directory after + upgrading. + + logfile + perm + record + xlogfile + bones/ + level/ + saves/ + 20120816: AFFECTS: users of sysutils/cfengine* AUTHOR: gjb@FreeBSD.org Modified: head/games/unnethack/Makefile ============================================================================== --- head/games/unnethack/Makefile Fri Aug 17 09:53:30 2012 (r302673) +++ head/games/unnethack/Makefile Fri Aug 17 10:20:48 2012 (r302674) @@ -6,7 +6,7 @@ # PORTNAME= unnethack -PORTVERSION= 3.5.3.20101010 +PORTVERSION= 4.0.0.20120401 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -17,28 +17,31 @@ COMMENT= A new variant of NetHack GNU_CONFIGURE= yes USE_GMAKE= yes +MAKE_JOBS_UNSAFE= yes + +VARDIR_REL= var/games/${PORTNAME} +VARDIR= ${PREFIX}/${VARDIR_REL} +CONFIGURE_ARGS= --datadir="${DATADIR:H}" --localstatedir="${VARDIR:H}" --docdir="${DOCSDIR:H}" \ + --with-owner=games --with-group=games \ + --enable-data-librarian +MAKE_ARGS= FILEPERM=0664 \ + VARFILEPERM=0664 \ + VARDIRPERM=0775 +INSTALL_TARGET= install manpages PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -SUB_FILES+= pkg-deinstall +SUB_FILES= pkg-deinstall +SUB_LIST= VARDIR="${VARDIR}" +PLIST_SUB= VARDIR="${VARDIR_REL}" # This port accually conflicts with other nethack variant ports on # these commands that are only significant for those who want to # "hack" the game in deep. MAN6= dgn_comp.6 dlb.6 lev_comp.6 recover.6 ${PORTNAME}.6 -MAKE_JOBS_UNSAFE= yes - -MAKE_ENV+= DATADIR="${DATADIR}" post-patch: - ${REINPLACE_CMD} -e \ - "s@%%DATADIR%%@${DATADIR}@g" ${WRKSRC}/include/config.h ${MV} ${WRKSRC}/doc/nethack.6 ${WRKSRC}/doc/${PORTNAME}.6 post-install: - @cd ${WRKSRC}/doc; ${CHMOD} 644 *.6 - @(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} manpages) .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${LN} -sf ${PREFIX}/share/${PORTNAME}/Guidebook.txt ${DOCSDIR}/ ${INSTALL_DATA} ${FILESDIR}/sample.unnethackrc ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} Modified: head/games/unnethack/distinfo ============================================================================== --- head/games/unnethack/distinfo Fri Aug 17 09:53:30 2012 (r302673) +++ head/games/unnethack/distinfo Fri Aug 17 10:20:48 2012 (r302674) @@ -1,2 +1,2 @@ -SHA256 (unnethack-3.5.3-20101010.tar.gz) = 50af40761316fcede4c93b816d6c3b910cf3ca39551c50c0c35d622a9af36543 -SIZE (unnethack-3.5.3-20101010.tar.gz) = 3875013 +SHA256 (unnethack-4.0.0-20120401.tar.gz) = b5ea9ba28f137b004f196c71f6548196b3595db214051d14a4145a4c3cb6c1c2 +SIZE (unnethack-4.0.0-20120401.tar.gz) = 5241359 Modified: head/games/unnethack/files/patch-config.h ============================================================================== --- head/games/unnethack/files/patch-config.h Fri Aug 17 09:53:30 2012 (r302673) +++ head/games/unnethack/files/patch-config.h Fri Aug 17 10:20:48 2012 (r302674) @@ -1,6 +1,8 @@ ---- include/config.h.orig 2010-10-10 21:46:00.000000000 +0900 -+++ include/config.h 2011-01-22 01:34:41.205152954 +0900 -@@ -188,7 +188,7 @@ +$FreeBSD$ + +--- include/config.h.orig 2012-04-01 23:34:10.000000000 +0900 ++++ include/config.h 2012-08-17 16:37:54.135991792 +0900 +@@ -191,7 +191,7 @@ /* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */ /* #define COMPRESS_EXTENSION ".Z" */ /* compress's extension */ /* An example of one alternative you might want to use: */ @@ -9,21 +11,3 @@ #define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif -@@ -202,7 +202,7 @@ - * a tar-like file, thus making a neater installation. See *conf.h - * for detailed configuration. - */ --/* #define DLB */ /* not supported on all platforms */ -+#define DLB /* not supported on all platforms */ - - /* - * Defining INSURANCE slows down level changes, but allows games that -@@ -221,7 +221,7 @@ - * otherwise it will be the current directory. - */ - # ifndef HACKDIR --# define HACKDIR "/usr/games/lib/unnethackdir" -+# define HACKDIR "%%DATADIR%%" - # endif - - /* Modified: head/games/unnethack/files/pkg-deinstall.in ============================================================================== --- head/games/unnethack/files/pkg-deinstall.in Fri Aug 17 09:53:30 2012 (r302673) +++ head/games/unnethack/files/pkg-deinstall.in Fri Aug 17 10:20:48 2012 (r302674) @@ -1,10 +1,10 @@ #!/bin/sh # $FreeBSD$ -if [ "$2" = "POST-DEINSTALL" -a -d "%%DATADIR%%" ]; then +if [ "$2" = "POST-DEINSTALL" -a -d "%%VARDIR%%" ]; then echo "" echo " If unnethack is being removed permanently, please remove" echo "" - echo " %%DATADIR%%" + echo " %%VARDIR%%" echo "" fi Modified: head/games/unnethack/pkg-plist ============================================================================== --- head/games/unnethack/pkg-plist Fri Aug 17 09:53:30 2012 (r302673) +++ head/games/unnethack/pkg-plist Fri Aug 17 10:20:48 2012 (r302674) @@ -1,19 +1,16 @@ bin/unnethack -%%DATADIR%%/Guidebook.txt -%%DATADIR%%/license -%%DATADIR%%/logfile %%DATADIR%%/nhdat -%%DATADIR%%/perm -%%DATADIR%%/record %%DATADIR%%/recover %%DATADIR%%/unnethack -%%DATADIR%%/xlogfile -@exec mkdir %D/%%DATADIR%%/save -@exec chmod -R 775 %D/%%DATADIR%% -@exec chmod 2755 %D/%%DATADIR%%/save -@exec chown games:games %D/%%DATADIR%%/save -@dirrmtry %%DATADIR%%/save -@dirrmtry %%DATADIR%% -%%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt +%%VARDIR%%/logfile +%%VARDIR%%/perm +%%VARDIR%%/record +%%VARDIR%%/xlogfile +@dirrmtry %%VARDIR%%/bones +@dirrmtry %%VARDIR%%/level +@dirrmtry %%VARDIR%%/saves +@unexec rmdir -p %D/%%VARDIR%% 2>/dev/null || true +%%DOCSDIR%%/Guidebook.txt +%%DOCSDIR%%/license %%PORTDOCS%%%%DOCSDIR%%/sample.unnethackrc -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DOCSDIR%%