From c4823e883be563337dde9dde23949cde6c3fce0f Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Sun, 18 May 2003 09:43:17 +0000 Subject: Fix build: Remove an ill-formed REINPLACE, and use a proper patch instead. Take an explicit "${WRKSRC}" out of a displayed message, and replace it with the value of ${WRKSRC} instead. Drop maintainership. --- games/mythserver/Makefile | 10 ++-------- games/mythserver/files/patch-users_new::main.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 games/mythserver/files/patch-users_new::main.c (limited to 'games/mythserver') diff --git a/games/mythserver/Makefile b/games/mythserver/Makefile index fcab38b5c7eb..873a015d6957 100644 --- a/games/mythserver/Makefile +++ b/games/mythserver/Makefile @@ -11,28 +11,22 @@ CATEGORIES= games MASTER_SITES= http://support.bungie.com/ftp/pub/win/misc/ DISTNAME= metaserver2open -MAINTAINER= adamw@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Bungie.net MythII Metaserver Open Source -BROKEN= "Does not compile" - USE_ZIP= yes USE_GMAKE= yes -USE_REINPLACE= yes WRKSRC= ${WRKDIR}/metaserver2open/spaghetti pre-everything:: @${ECHO_CMD} "#############################################" @${ECHO_CMD} " IMPORTANT!" @${ECHO_CMD} " Please: Edit and modify environment.h" - @${ECHO_CMD} " located at $$\{WRKSRC\}/utils/" + @${ECHO_CMD} " located at ${WRKSRC}/utils/" @${ECHO_CMD} " after running make patch but" @${ECHO_CMD} " before compiling this port." @${ECHO_CMD} "#############################################" -post-patch: - @${REINPLACE_CMD} -e 's@\r@@g' ${WRKSRC}/users_new/main.c - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/bin/game_search_server_new ${PREFIX}/bin @${INSTALL_PROGRAM} ${WRKSRC}/bin/roomd_new ${PREFIX}/bin diff --git a/games/mythserver/files/patch-users_new::main.c b/games/mythserver/files/patch-users_new::main.c new file mode 100644 index 000000000000..83ab178b2afa --- /dev/null +++ b/games/mythserver/files/patch-users_new::main.c @@ -0,0 +1,20 @@ +--- users_new/main.c.orig Sun May 18 02:36:43 2003 ++++ users_new/main.c Sun May 18 02:37:47 2003 +@@ -97,16 +97,7 @@ + NUMBER_OF_CLIENT_TYPES + }; + +-#define CLIENT_DATA_HEADER \ +- int socket; \ +- long host; \ +- short port; \ +- short type; \ +- char buffer[MAXIMUM_PACKET_LENGTH]; \ +- short state; \ +- void *next; \ +- struct circular_queue incoming; \ +- struct circular_queue outgoing; ++#define CLIENT_DATA_HEADER int socket; long host; short port; short type; char buffer[MAXIMUM_PACKET_LENGTH]; short state; void *next; struct circular_queue incoming; struct circular_queue outgoing; + + struct client_data { + CLIENT_DATA_HEADER -- cgit v1.2.3