Date: Sun, 18 May 2014 09:32:45 GMT From: driedfruit <flambard@mangband.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189907: Update games/mangband to support Staging Message-ID: <201405180932.s4I9WjaV066291@cgiserv.freebsd.org> Resent-Message-ID: <201405180940.s4I9e0td072783@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189907
>Category: ports
>Synopsis: Update games/mangband to support Staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 18 09:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: driedfruit
>Release: 10.0-RELEASE
>Organization:
mangband.org
>Environment:
FreeBSD mangdev 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
In September 2013, the Ports framework learned how to Stage ports.
The attached patch updates to port to support it.
>How-To-Repeat:
>Fix:
Apply the attached patch.
Patch attached with submission follows:
diff -ruN /usr/ports/games/mangband/Makefile ./mangband/Makefile
--- /usr/ports/games/mangband/Makefile 2014-05-18 09:34:57.000000000 +0400
+++ ./mangband/Makefile 2014-05-18 13:24:44.000000000 +0400
@@ -1,5 +1,5 @@
# Created by: driedfruit
-# $FreeBSD: head/games/mangband/Makefile 342588 2014-02-04 18:58:58Z pawel $
+# $FreeBSD$
PORTNAME= mangband
PORTVERSION= 1.1.2
@@ -18,12 +18,11 @@
MAKE_ARGS= "DATADIR=${DATADIR}"
OPTIONS_DEFINE= GCU X11 SDL
-OPTIONS_DEFAULT= GCU X11 SDL
-GCU_DESC= Display module GCU
+OPTIONS_DEFAULT= GCU
+GCU_DESC= Display module GCU (curses)
X11_DESC= Display module X11
SDL_DESC= Display module SDL
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGCU}
@@ -47,26 +46,19 @@
.endif
do-install:
- @${INSTALL_PROGRAM} -o root -g games -m 2550 \
- ${WRKSRC}/mangband ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/mangclient ${PREFIX}/bin
- @${CP} ${WRKDIR}/${DISTNAME}/mangband.cfg ${PREFIX}/etc
-
- @echo "# FreeBSD Hacks" >> ${PREFIX}/etc/mangband.cfg
- @echo "EDIT_DIR = \"${DATADIR}/edit\"" >> ${PREFIX}/etc/mangband.cfg
- @echo "SAVE_DIR = \"${DATADIR}/save\"" >> ${PREFIX}/etc/mangband.cfg
- @echo "DATA_DIR = \"${DATADIR}/data\"" >> ${PREFIX}/etc/mangband.cfg
-
- @${MKDIR} ${EXAMPLESDIR}
- @echo "[MAngband]" >> ${EXAMPLESDIR}/mangrc
- @echo "LibDir ${DATADIR}" >> ${EXAMPLESDIR}/mangrc
-
- @${MKDIR} ${DATADIR}
- @cd ${WRKSRC}/../lib && ${PAX} -rw * ${DATADIR}
- @${CHMOD} 750 ${DATADIR}/*
- @${CHMOD} 755 ${DATADIR}/user
- @${CHMOD} 755 ${DATADIR}/xtra
- @${CHOWN} -R root:games ${DATADIR}/*
- @${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+ @${INSTALL_PROGRAM} ${WRKSRC}/mangband ${STAGEDIR}${PREFIX}/bin
+ @${INSTALL_PROGRAM} ${WRKSRC}/mangclient ${STAGEDIR}${PREFIX}/bin
+
+ @${CP} ${WRKDIR}/${DISTNAME}/mangband.cfg ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
+ @echo "# FreeBSD Hacks" >> ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
+ @echo "EDIT_DIR = \"${DATADIR}/edit\"" >> ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
+ @echo "SAVE_DIR = \"${DATADIR}/save\"" >> ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
+ @echo "DATA_DIR = \"${DATADIR}/data\"" >> ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
+
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ @echo "[MAngband]" >> ${STAGEDIR}${EXAMPLESDIR}/mangrc
+ @echo "LibDir ${DATADIR}/" >> ${STAGEDIR}${EXAMPLESDIR}/mangrc
+
+ @(cd ${WRKDIR}/${DISTNAME}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
.include <bsd.port.mk>
diff -ruN /usr/ports/games/mangband/files/patch-ac ./mangband/files/patch-ac
--- /usr/ports/games/mangband/files/patch-ac 2014-01-22 21:40:44.000000000 +0400
+++ ./mangband/files/patch-ac 2014-05-18 13:24:52.000000000 +0400
@@ -1,6 +1,6 @@
--- server/save.c.bak Sat May 9 21:38:56 1998
+++ server/save.c Wed Dec 30 13:33:13 1998
-@@ -2305,7 +2305,7 @@
+@@ -944,7 +944,7 @@
#ifdef VERIFY_SAVEFILE
/* Lock on savefile */
diff -ruN /usr/ports/games/mangband/pkg-message ./mangband/pkg-message
--- /usr/ports/games/mangband/pkg-message 1970-01-01 03:00:00.000000000 +0300
+++ ./mangband/pkg-message 2014-05-18 13:24:52.000000000 +0400
@@ -0,0 +1,12 @@
+ The following mangclient directories could be copied to a user-writable
+ location:
+share/mangband/user
+share/mangband/xtra
+
+ To provide a path for those directories ${HOME}/.mangrc should be used.
+ An example is available at:
+share/examples/mangband/mangrc
+
+ To run mangband server as an unpriviliged user, such user must be added
+ to the games group. For example:
+pw usermod <user> -G games
diff -ruN /usr/ports/games/mangband/pkg-plist ./mangband/pkg-plist
--- /usr/ports/games/mangband/pkg-plist 2014-01-22 19:16:56.000000000 +0400
+++ ./mangband/pkg-plist 2014-05-18 13:24:52.000000000 +0400
@@ -1,7 +1,13 @@
bin/mangclient
+@mode 2550
+@group games
bin/mangband
-etc/mangband.cfg
+@group
+@mode
+@sample etc/mangband.cfg.sample
%%EXAMPLESDIR%%/mangrc
+@group games
+@mode 0660
%%DATADIR%%/data/scores.raw
%%DATADIR%%/edit/artifact.txt
%%DATADIR%%/edit/ego_item.txt
@@ -33,6 +39,8 @@
%%DATADIR%%/text/news.txt
%%DATADIR%%/text/option.txt
%%DATADIR%%/text/version.txt
+@mode
+@mode 0660
%%DATADIR%%/user/font-ami.prf
%%DATADIR%%/user/font-ibm.prf
%%DATADIR%%/user/font-sdl.prf
@@ -87,11 +95,15 @@
%%DATADIR%%/xtra/font/nethack10x19-10.hex
%%DATADIR%%/xtra/graf/16x16.bmp
%%DATADIR%%/xtra/graf/mask.bmp
+@mode
+@group
@dirrm %%DATADIR%%/xtra/graf
@dirrm %%DATADIR%%/xtra/font
@dirrm %%DATADIR%%/xtra/Sound
@dirrm %%DATADIR%%/xtra
@dirrm %%DATADIR%%/user
+@group games
+@mode 0770
@dirrm %%DATADIR%%/text
@dirrm %%DATADIR%%/save
@dirrm %%DATADIR%%/help
@@ -99,4 +111,6 @@
@dirrm %%DATADIR%%/edit
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
+@mode
+@group
@dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405180932.s4I9WjaV066291>