diff options
author | Akinori MUSHA <knu@FreeBSD.org> | 2012-08-17 10:20:48 +0000 |
---|---|---|
committer | Akinori MUSHA <knu@FreeBSD.org> | 2012-08-17 10:20:48 +0000 |
commit | 28d9ae65c1b7cc58ccfaf9940a3f70cf6dbbb502 (patch) | |
tree | 09211855a0c54fff9edd7b1a6d352be3acd73ebf /games | |
parent | - Update to 0.032 [1] (diff) |
Update unnethack to 4.0.0.20120401.
Chagne the place for variable files from $PREFIX/share/unnethack to
$PREFIX/var/games/unnethack.
Notes
Notes:
svn path=/head/; revision=302674
Diffstat (limited to 'games')
-rw-r--r-- | games/unnethack/Makefile | 27 | ||||
-rw-r--r-- | games/unnethack/distinfo | 4 | ||||
-rw-r--r-- | games/unnethack/files/patch-config.h | 26 | ||||
-rw-r--r-- | games/unnethack/files/patch-makefile.src | 15 | ||||
-rw-r--r-- | games/unnethack/files/patch-makefile.utl | 15 | ||||
-rw-r--r-- | games/unnethack/files/patch-system.h | 13 | ||||
-rw-r--r-- | games/unnethack/files/pkg-deinstall.in | 4 | ||||
-rw-r--r-- | games/unnethack/pkg-plist | 25 |
8 files changed, 35 insertions, 94 deletions
diff --git a/games/unnethack/Makefile b/games/unnethack/Makefile index 01a956b10ad0..95ad7011f949 100644 --- a/games/unnethack/Makefile +++ b/games/unnethack/Makefile @@ -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} diff --git a/games/unnethack/distinfo b/games/unnethack/distinfo index 874a349e381e..d67173399aa0 100644 --- a/games/unnethack/distinfo +++ b/games/unnethack/distinfo @@ -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 diff --git a/games/unnethack/files/patch-config.h b/games/unnethack/files/patch-config.h index 2090e01a2172..da840fd56a91 100644 --- a/games/unnethack/files/patch-config.h +++ b/games/unnethack/files/patch-config.h @@ -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 - - /* diff --git a/games/unnethack/files/patch-makefile.src b/games/unnethack/files/patch-makefile.src deleted file mode 100644 index e8c61554a84b..000000000000 --- a/games/unnethack/files/patch-makefile.src +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- sys/autoconf/Makefile.src.orig 2010-01-10 23:51:59.000000000 +0900 -+++ sys/autoconf/Makefile.src 2010-01-19 14:57:58.042797577 +0900 -@@ -30,8 +30,8 @@ - CC = @CC@ -DAUTOCONF - WINDRES = @WINDRES@ - --CFLAGS = -Wall -I../include -I$(srcdir)/../include @CFLAGS@ #-fbounds-check #-fprofile-arcs -ftest-coverage --LFLAGS = @LFLAGS@ #-fbounds-check -+CFLAGS = -Wall -I../include -I$(srcdir)/../include -I$(LOCALBASE)/include @CFLAGS@ #-fbounds-check #-fprofile-arcs -ftest-coverage -+LFLAGS = -L$(LOCALBASE)/lib @LFLAGS@ #-fbounds-check - - # Only used for the Gnome interface. - GNOMEINC=`gnome-config gnome --cflags` -I$(srcdir)/../win/gnome diff --git a/games/unnethack/files/patch-makefile.utl b/games/unnethack/files/patch-makefile.utl deleted file mode 100644 index aa6c3f37bc88..000000000000 --- a/games/unnethack/files/patch-makefile.utl +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- sys/autoconf/Makefile.utl.orig 2010-01-10 23:51:59.000000000 +0900 -+++ sys/autoconf/Makefile.utl 2010-01-19 15:02:33.718921184 +0900 -@@ -96,8 +96,8 @@ - # flags for debugging: - # CFLAGS = -g -I../include -I$(srcdir)/../include - --CFLAGS = -O -I../include -I$(srcdir)/../include @CFLAGS@ --LFLAGS = @LFLAGS@ -+CFLAGS = -O -I../include -I$(srcdir)/../include -I$(LOCALBASE)/include @CFLAGS@ -+LFLAGS = -L$(LOCALBASE)/lib @LFLAGS@ - - LIBS = - diff --git a/games/unnethack/files/patch-system.h b/games/unnethack/files/patch-system.h deleted file mode 100644 index a0d6de8e40f0..000000000000 --- a/games/unnethack/files/patch-system.h +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- include/system.h.good Wed Nov 22 23:38:44 2000 -+++ include/system.h Wed Nov 22 23:41:03 2000 -@@ -522,7 +522,7 @@ - E time_t FDECL(time, (time_t *)); - # endif - # else --E long FDECL(time, (time_t *)); -+E time_t FDECL(time, (time_t *)); - # endif /* ULTRIX */ - - #ifdef VMS diff --git a/games/unnethack/files/pkg-deinstall.in b/games/unnethack/files/pkg-deinstall.in index 5e090e6da95f..d78f6e1fc0c3 100644 --- a/games/unnethack/files/pkg-deinstall.in +++ b/games/unnethack/files/pkg-deinstall.in @@ -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 diff --git a/games/unnethack/pkg-plist b/games/unnethack/pkg-plist index b56bcee341af..48424b6b3039 100644 --- a/games/unnethack/pkg-plist +++ b/games/unnethack/pkg-plist @@ -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%% |