Date: Sun, 27 Dec 2015 20:15:42 +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: r404593 - in head/games/xsokoban: . files Message-ID: <201512272015.tBRKFgpU080358@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Dec 27 20:15:42 2015 New Revision: 404593 URL: https://svnweb.freebsd.org/changeset/ports/404593 Log: - Move highscores and saves to /var/games - Modernize plist - Regenerate patches Added: head/games/xsokoban/files/patch-config__local.h - copied, changed from r404592, head/games/xsokoban/files/patch-config_local.h Deleted: head/games/xsokoban/files/patch-config_local.h head/games/xsokoban/pkg-message Modified: head/games/xsokoban/Makefile head/games/xsokoban/files/patch-Imakefile head/games/xsokoban/files/patch-config.h head/games/xsokoban/files/patch-externs.h head/games/xsokoban/pkg-plist Modified: head/games/xsokoban/Makefile ============================================================================== --- head/games/xsokoban/Makefile Sun Dec 27 19:45:58 2015 (r404592) +++ head/games/xsokoban/Makefile Sun Dec 27 20:15:42 2015 (r404593) @@ -3,7 +3,7 @@ PORTNAME= xsokoban PORTVERSION= 3.3c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.cs.cornell.edu/andru/release/ \ ftp://ftp.pmg.lcs.mit.edu/pub/xsokoban/ @@ -20,14 +20,15 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/scores \ - ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/bitmaps/defaults \ - ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/saves \ - ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/screens - @${CHMOD} 777 ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/scores - @${CHMOD} 775 ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/saves + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/screens + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/bitmaps/defaults ${INSTALL_DATA} ${WRKSRC}/screens/* ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/screens ${INSTALL_DATA} ${WRKSRC}/bitmaps/defaults/* \ ${STAGEDIR}${PREFIX}/lib/X11/xsokoban/bitmaps/defaults + @${MKDIR} ${STAGEDIR}/var/games/xsokoban/scores + @${MKDIR} ${STAGEDIR}/var/games/xsokoban/saves +# may be created by xsokoban -c + @${PRINTF} "xs02\0\0" > ${STAGEDIR}/var/games/xsokoban/scores/scores.sample + .include <bsd.port.mk> Modified: head/games/xsokoban/files/patch-Imakefile ============================================================================== --- head/games/xsokoban/files/patch-Imakefile Sun Dec 27 19:45:58 2015 (r404592) +++ head/games/xsokoban/files/patch-Imakefile Sun Dec 27 20:15:42 2015 (r404593) @@ -1,19 +1,12 @@ -*** Imakefile.orig Wed Aug 28 02:34:41 1996 ---- Imakefile Sat Jan 15 00:00:00 2000 -*************** -*** 1,7 **** - DEFINES= -DNDEBUG -! EXTRA_INCLUDES= -I/usr/local/include - -! SYS_LIBRARIES= -L/usr/local/lib -lXpm $(XLIB) - # -lXpm is only needed if you are using Xpm. - - SRCS= display.c main.c resources.c play.c score.c screen.c \ ---- 1,7 ---- - DEFINES= -DNDEBUG -! EXTRA_INCLUDES= -I$(INCDIR)/X11 - -! SYS_LIBRARIES= -lXpm $(XLIB) - # -lXpm is only needed if you are using Xpm. - - SRCS= display.c main.c resources.c play.c score.c screen.c \ +--- Imakefile.orig 1996-08-27 17:34:41 UTC ++++ Imakefile +@@ -1,7 +1,7 @@ + DEFINES= -DNDEBUG +-EXTRA_INCLUDES= -I/usr/local/include ++EXTRA_INCLUDES= -I$(INCDIR)/X11 + +-SYS_LIBRARIES= -L/usr/local/lib -lXpm $(XLIB) ++SYS_LIBRARIES= -lXpm $(XLIB) + # -lXpm is only needed if you are using Xpm. + + SRCS= display.c main.c resources.c play.c score.c screen.c \ Modified: head/games/xsokoban/files/patch-config.h ============================================================================== --- head/games/xsokoban/files/patch-config.h Sun Dec 27 19:45:58 2015 (r404592) +++ head/games/xsokoban/files/patch-config.h Sun Dec 27 20:15:42 2015 (r404593) @@ -1,53 +1,55 @@ -*** config.h.orig Tue Aug 27 21:41:47 1996 ---- config.h Mon Nov 18 18:25:14 1996 -*************** -*** 30,36 **** - variable in the installed version, but you know best... - */ - #ifndef ROOTDIR -! #define ROOTDIR "." - #endif - - /* ---- 30,36 ---- - variable in the installed version, but you know best... - */ - #ifndef ROOTDIR -! #define ROOTDIR "%%PREFIX%%/lib/X11/xsokoban" - #endif - - /* -*************** -*** 95,101 **** - OWNER: defines the name of the local game owner. - */ - #ifndef OWNER -! #define OWNER "andru" - #endif - - /* ---- 95,101 ---- - OWNER: defines the name of the local game owner. - */ - #ifndef OWNER -! #define OWNER "root" - #endif - - /* -*************** -*** 147,153 **** - */ - - #ifndef WWW -! #define WWW 1 - #endif - - #define DEBUG_SERVER(x) ---- 147,153 ---- - */ - - #ifndef WWW -! #define WWW 0 - #endif - - #define DEBUG_SERVER(x) +--- config.h.orig 1997-07-17 16:27:58 UTC ++++ config.h +@@ -30,7 +30,7 @@ + variable in the installed version, but you know best... + */ + #ifndef ROOTDIR +-#define ROOTDIR "." ++#define ROOTDIR "%%PREFIX%%/lib/X11/xsokoban" + #endif + + /* +@@ -46,7 +46,7 @@ + the name <username>.sav + */ + #ifndef SAVEPATH +-#define SAVEPATH ROOTDIR "/saves" ++#define SAVEPATH "/var/games/xsokoban/saves" + #endif + + /* +@@ -62,14 +62,14 @@ + in the same directory as the score file. + */ + #ifndef LOCKFILE +-#define LOCKFILE ROOTDIR "/scores/lock" ++#define LOCKFILE "/var/games/xsokoban/scores/lock" + #endif + + /* + SCOREFILE: the full pathname of the score file + */ + #ifndef SCOREFILE +-#define SCOREFILE ROOTDIR "/scores/scores" ++#define SCOREFILE "/var/games/xsokoban/scores/scores" + #endif + + /* +@@ -95,7 +95,7 @@ + OWNER: defines the name of the local game owner. + */ + #ifndef OWNER +-#define OWNER "andru" ++#define OWNER "root" + #endif + + /* +@@ -147,7 +147,7 @@ + */ + + #ifndef WWW +-#define WWW 1 ++#define WWW 0 + #endif + + #define DEBUG_SERVER(x) Copied and modified: head/games/xsokoban/files/patch-config__local.h (from r404592, head/games/xsokoban/files/patch-config_local.h) ============================================================================== --- head/games/xsokoban/files/patch-config_local.h Sun Dec 27 19:45:58 2015 (r404592, copy source) +++ head/games/xsokoban/files/patch-config__local.h Sun Dec 27 20:15:42 2015 (r404593) @@ -1,19 +1,11 @@ -*** config_local.h.orig Sun Apr 16 00:50:16 1995 ---- config_local.h Mon Nov 18 18:33:14 1996 -*************** -*** 61,67 **** - #define LOCALTIME_PROTO 1 - - /* Is there a nl_langinfo() call? */ -! #define HAVE_NL_LANGINFO 1 - - /* Is there a working <sys/param.h> */ - #define HAVE_SYS_PARAM_H 1 ---- 61,67 ---- - #define LOCALTIME_PROTO 1 - - /* Is there a nl_langinfo() call? */ -! #undef HAVE_NL_LANGINFO - - /* Is there a working <sys/param.h> */ - #define HAVE_SYS_PARAM_H 1 +--- config_local.h.orig 1996-10-29 19:44:31 UTC ++++ config_local.h +@@ -61,7 +61,7 @@ + #define LOCALTIME_PROTO 1 + + /* Is there a nl_langinfo() call? */ +-#define HAVE_NL_LANGINFO 1 ++#undef HAVE_NL_LANGINFO + + /* Is there a working <sys/param.h> */ + #define HAVE_SYS_PARAM_H 1 Modified: head/games/xsokoban/files/patch-externs.h ============================================================================== --- head/games/xsokoban/files/patch-externs.h Sun Dec 27 19:45:58 2015 (r404592) +++ head/games/xsokoban/files/patch-externs.h Sun Dec 27 20:15:42 2015 (r404593) @@ -1,14 +1,12 @@ -*** externs.h.orig Sun Apr 16 07:46:14 1995 ---- externs.h Sat Jan 15 00:00:00 2000 -*************** -*** 5,11 **** ---- 5,13 ---- - #include <X11/Xresource.h> - #include <sys/stat.h> - #include <sys/types.h> -+ #ifndef __STDC__ - #include <malloc.h> -+ #endif - - #ifdef NEED_NETINET_IN - #include <netinet/in.h> +--- externs.h.orig 1995-04-15 22:46:14 UTC ++++ externs.h +@@ -5,7 +5,9 @@ + #include <X11/Xresource.h> + #include <sys/stat.h> + #include <sys/types.h> ++#ifndef __STDC__ + #include <malloc.h> ++#endif + + #ifdef NEED_NETINET_IN + #include <netinet/in.h> Modified: head/games/xsokoban/pkg-plist ============================================================================== --- head/games/xsokoban/pkg-plist Sun Dec 27 19:45:58 2015 (r404592) +++ head/games/xsokoban/pkg-plist Sun Dec 27 20:15:42 2015 (r404593) @@ -1,4 +1,4 @@ -bin/xsokoban +@(,games,2555) bin/xsokoban man/man1/xsokoban.1.gz lib/X11/xsokoban/bitmaps/defaults/centerwall.xbm lib/X11/xsokoban/bitmaps/defaults/centerwall.xpm @@ -136,10 +136,7 @@ lib/X11/xsokoban/screens/screen.88 lib/X11/xsokoban/screens/screen.89 lib/X11/xsokoban/screens/screen.9 lib/X11/xsokoban/screens/screen.90 -@unexec rm -f %D/lib/X11/xsokoban/scores/scores 2>/dev/null || true -@dirrm lib/X11/xsokoban/bitmaps/defaults -@dirrm lib/X11/xsokoban/bitmaps -@dirrm lib/X11/xsokoban/saves -@dirrm lib/X11/xsokoban/scores -@dirrm lib/X11/xsokoban/screens -@dirrm lib/X11/xsokoban +@sample(,games,664) /var/games/xsokoban/scores/scores.sample +@dir(,games,775) /var/games/xsokoban/scores +@dir(,games,775) /var/games/xsokoban/saves +@dir /var/games/xsokoban
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512272015.tBRKFgpU080358>