diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-roguelike/mangband | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-roguelike/mangband')
-rw-r--r-- | games-roguelike/mangband/Manifest | 5 | ||||
-rw-r--r-- | games-roguelike/mangband/files/mangband-1.1.3-paths.patch | 118 | ||||
-rw-r--r-- | games-roguelike/mangband/files/mangband-1.1.3-strchr.patch | 22 | ||||
-rw-r--r-- | games-roguelike/mangband/mangband-1.1.3.ebuild | 83 | ||||
-rw-r--r-- | games-roguelike/mangband/metadata.xml | 11 |
5 files changed, 239 insertions, 0 deletions
diff --git a/games-roguelike/mangband/Manifest b/games-roguelike/mangband/Manifest new file mode 100644 index 000000000000..055753970400 --- /dev/null +++ b/games-roguelike/mangband/Manifest @@ -0,0 +1,5 @@ +AUX mangband-1.1.3-paths.patch 3029 BLAKE2B d073607fede89e5b244f85c95cf465734aee4b503683ee60cd6331000fe4833fea297bdc56eeb74857dad0525fe9b4eb5534bc518bf68ac2c4537527556e7deb SHA512 3dc510a04e339f06a654d8c5b6b5c7059e451a4d7669a4709d4efbdf9bd667993d67411b8338cbfe837c9b7e4ce9123d72a2eafb0ac86daaa68161bc061483c4 +AUX mangband-1.1.3-strchr.patch 371 BLAKE2B ba51408069784b0fc165b98e1f9da6539955c68bc438cab74175471b924ffb395d30a4c9202e63a2d2420831e77e96642cef835dbfee0b0071b427041e10e740 SHA512 f6bef0974416ff6f2036fe6a08db85b1353234a88f38134bc9ab739d26c44a914150044cd2ca80c141b7fd111c3b3f5f1acca1d111ec5d6c6586ac438bb5dcc3 +DIST mangband-1.1.3.tar.gz 1497078 BLAKE2B 69f00c9ae4d2600dd9705103dbc753d385015a81f7467e44e38c86cd6f3168474a3832a4c9e8efc353ef75b923362d35e50f49da7752adf43c37d4df015c0e18 SHA512 5efda352607953e94a433bf9aabb496419a22c984dc9e054cebc90623682da23a90fb6cb910fcc950010d469571f2af515bfa7740c921add44ac9ea95e723130 +EBUILD mangband-1.1.3.ebuild 2048 BLAKE2B 63d351965b5859dbef83f067b12b9630418d51673fd4dd5a808c7cf275cf416ccf060d5105309f089d0b7e111d29d6880c547a4c9fa92b3af64eb42fef6f2573 SHA512 8f1b2a0afb6f3b600730b64aaf79ed9834397c8ce5d7f85279b5b481a258b0f35493e00258d38880bf0e7c37ba149d5e2765862a1aa4e2469dd0fda66434e4f7 +MISC metadata.xml 338 BLAKE2B 872d2540905bff82e2d594a966e84b47a58c764d38383665740c0aed4e1803b961c6de5a3ec8427a67a9d3bb5b4d144eab71d1ae83bda144354c006b1e5a495b SHA512 4c12708346e37f2b3763b5e5967ba40b572932c1147acc0b5830341fca6107d041750f6b05e5983f9dda8125aac58254fbbedd694f2a15305afad78d9d198abb diff --git a/games-roguelike/mangband/files/mangband-1.1.3-paths.patch b/games-roguelike/mangband/files/mangband-1.1.3-paths.patch new file mode 100644 index 000000000000..dd9551570196 --- /dev/null +++ b/games-roguelike/mangband/files/mangband-1.1.3-paths.patch @@ -0,0 +1,118 @@ +diff --git a/src/config.h.in b/src/config.h.in +index e8efdca..9a6290a 100644 +--- a/config.h.in ++++ a/config.h.in +@@ -473,6 +473,9 @@ + #ifndef DEFAULT_PATH + # define DEFAULT_PATH "./lib/" + #endif ++#ifndef DEFAULT_PATH_W ++# define DEFAULT_PATH_W DEFAULT_PATH ++#endif + + + /* +diff --git a/src/server/externs.h b/src/server/externs.h +index 249e41b..e1a5c4f 100644 +--- a/server/externs.h ++++ a/server/externs.h +@@ -644,7 +644,7 @@ extern errr init_e_info_txt(FILE *fp, char *buf); + extern errr init_r_info_txt(FILE *fp, char *buf); + + /* init.c */ +-extern void init_file_paths(char *path); ++extern void init_file_paths(char *path, char *path2); + extern void init_some_arrays(void); + extern void load_server_cfg(void); + +diff --git a/src/server/init2.c b/src/server/init2.c +index 00d8a01..27fd2b7 100644 +--- a/server/init2.c ++++ a/server/init2.c +@@ -63,10 +63,11 @@ + * to succeed even if the strings have not been allocated yet, + * as long as the variables start out as "NULL". + */ +-void init_file_paths(char *path) ++void init_file_paths(char *path, char *path2) + { + char *tail; +- ++ char *tail2; ++ char *tmp; + + /*** Free everything ***/ + +@@ -103,6 +104,10 @@ void init_file_paths(char *path) + /* Prepare to append to the Base Path */ + tail = path + strlen(path); + ++ tmp = string_make(path2); ++ ++ /* Prepare to append to the Base Path */ ++ tail2 = path2 + strlen(path2); + + #ifdef VM + +@@ -123,8 +128,8 @@ void init_file_paths(char *path) + /*** Build the sub-directory names ***/ + + /* Build a path name */ +- strcpy(tail, "data"); +- ANGBAND_DIR_DATA = string_make(path); ++ strcpy(tail2, "data"); ++ ANGBAND_DIR_DATA = string_make(path2); + + /* Build a path name */ + strcpy(tail, "edit"); +@@ -147,16 +152,16 @@ void init_file_paths(char *path) + ANGBAND_DIR_PREF = string_make(path); + #endif + /* Build a path name */ +- strcpy(tail, "save"); +- ANGBAND_DIR_SAVE = string_make(path); ++ strcpy(tail2, "save"); ++ ANGBAND_DIR_SAVE = string_make(path2); + + /* Build a path name */ + strcpy(tail, "text"); + ANGBAND_DIR_TEXT = string_make(path); + + /* Build a path name */ +- strcpy(tail, "user"); +- ANGBAND_DIR_USER = string_make(path); ++ strcpy(tail2, "user"); ++ ANGBAND_DIR_USER = string_make(path2); + #if 0 + /* Build a path name */ + strcpy(tail, "apex"); +diff --git a/src/server/main.c b/src/server/main.c +index 4260b8d..7884b2f 100644 +--- a/server/main.c ++++ a/server/main.c +@@ -142,6 +142,7 @@ extern unsigned _ovrbuffer = 0x1500; + static void init_stuff(void) + { + char path[1024]; ++ char path2[1024]; + + #if defined(AMIGA) || defined(VM) + +@@ -161,10 +162,16 @@ static void init_stuff(void) + /* Hack -- Add a path separator (only if needed) */ + if (!suffix(path, PATH_SEP)) strcat(path, PATH_SEP); + ++ /* Use the angband_path, or a default */ ++ strcpy(path2, tail ? tail : DEFAULT_PATH_W); ++ ++ /* Hack -- Add a path separator (only if needed) */ ++ if (!suffix(path2, PATH_SEP)) strcat(path2, PATH_SEP); ++ + #endif /* AMIGA / VM */ + + /* Initialize */ +- init_file_paths(path); ++ init_file_paths(path, path2); + } + + /* diff --git a/games-roguelike/mangband/files/mangband-1.1.3-strchr.patch b/games-roguelike/mangband/files/mangband-1.1.3-strchr.patch new file mode 100644 index 000000000000..f1fa19e1191e --- /dev/null +++ b/games-roguelike/mangband/files/mangband-1.1.3-strchr.patch @@ -0,0 +1,22 @@ +diff --git a/src/common/h-system.h b/src/common/h-system.h +index f60bbc1..0294dd3 100644 +--- a/common/h-system.h ++++ a/common/h-system.h +@@ -104,17 +104,6 @@ + + #ifdef SET_UID + +-# ifdef USG +-# include <string.h> +-# else +-# include <strings.h> +-extern char *strstr(); +-extern char *strchr(); +-extern char *strrchr(); +-# endif +- +-#else +- + # include <string.h> + + #endif diff --git a/games-roguelike/mangband/mangband-1.1.3.ebuild b/games-roguelike/mangband/mangband-1.1.3.ebuild new file mode 100644 index 000000000000..880306d0d6c0 --- /dev/null +++ b/games-roguelike/mangband/mangband-1.1.3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils flag-o-matic user + +DESCRIPTION="Online multiplayer real-time roguelike game, derived from Angband." +HOMEPAGE="http://www.mangband.org" +SRC_URI="http://www.mangband.org/download/${P}.tar.gz" + +#RESTRICT=nomirror # for ebuild debugging + +LICENSE="Moria" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ncurses sdl X" + +# Remove this once we hit MAngband 1.2: +S="${WORKDIR}/${P}"/src + +RDEPEND=" + ncurses? ( sys-libs/ncurses:= ) + sdl? ( media-libs/libsdl ) + X? ( x11-libs/libX11 )" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-strchr.patch" + "${FILESDIR}/${P}-paths.patch" ) + +MY_DATADIR=/usr/share/"${PN}" +MY_STATEDIR=/var/lib/"${PN}" +MY_SYSCONFDIR=/etc + +src_configure() { + append-cflags "-DDEFAULT_PATH='\"${MY_DATADIR}\"' -DDEFAULT_PATH_W='\"${MY_STATEDIR}\"'" + econf \ + $(use_with ncurses gcu) \ + $(use_with X x11) \ + $(use_with sdl) +} + +pkg_setup() { + # mangband server uses own user/group: + enewgroup mangband + enewuser mangband -1 -1 -1 "mangband" +} + +src_install() { +# Newer versions of MAngband have "make install", so we could use.. +# emake DESTDIR="${D}" install +# dodoc NEWS README INSTALL AUTHORS +#..but not yet + + dobin mangband mangclient + + # Read-only data + insinto "${MY_DATADIR}" + doins -r "${WORKDIR}/${P}"/lib/{edit,file,help,text,xtra,user} + + # Server config + insinto "${MY_SYSCONFDIR}" + doins "${WORKDIR}/${P}"/mangband.cfg + + # Read-write data + insinto "${MY_STATEDIR}" + doins -r "${WORKDIR}/${P}"/lib/{data,save,user} + + fowners -R mangband:mangband "${MY_STATEDIR}"/{data,save,user} + fperms -R 2664 "${MY_STATEDIR}"/{data,save,user} + fperms 2775 "${MY_STATEDIR}"/{data,save,user} + + # Docs + #dodoc ${WORKDIR}/${P}/LICENSE +} + +pkg_postinst() { + echo + elog "Make sure LibDir is either unset in ~/.mangrc or points to" + elog " ${MY_DATADIR} for 'mangclient' to pick it up." + elog "Server binary is called 'mangband', and must be run under user" + elog " mangband, i.e. 'sudo -u mangband mangband' " + echo +} diff --git a/games-roguelike/mangband/metadata.xml b/games-roguelike/mangband/metadata.xml new file mode 100644 index 000000000000..3891204b9a67 --- /dev/null +++ b/games-roguelike/mangband/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>flambard@mangband.org</email> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> +</pkgmetadata> |