Date: Mon, 13 Mar 2000 21:48:05 +0200 (EET) From: sobomax@altavista.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17362: [PATCH] Update of the Maelstrom (games/maelstrom) port to the new 3.0.1 version Message-ID: <200003131948.VAA13948@vega.vega.com>
next in thread | raw e-mail | index | archive | help
>Number: 17362 >Category: ports >Synopsis: [PATCH] Update of the Maelstrom (games/maelstrom) port to the new 3.0.1 version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 13 11:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Maxim Sobolev >Release: FreeBSD 3.4-STABLE i386 >Organization: Vega International Capital >Environment: >Description: Update of the Maelstrom (games/maelstrom) port to the new 3.0.1 version >How-To-Repeat: >Fix: diff -ruN /usr/ports/games/maelstrom/Makefile maelstrom/Makefile --- /usr/ports/games/maelstrom/Makefile Sat Mar 11 11:38:39 2000 +++ maelstrom/Makefile Mon Mar 13 21:23:55 2000 @@ -1,46 +1,26 @@ # New ports collection makefile for: Maelstrom -# Version required: 2.0.6 +# Version required: 3.0.1 # Date created: 13 May 1998 # Whom: Andrey Zakhvatov # # $FreeBSD: ports/games/maelstrom/Makefile,v 1.10 2000/03/11 06:25:29 kris Exp $ # -DISTNAME= Maelstrom-1.4.3-L2.0.6-src -PKGNAME= maelstrom-2.0.6 +DISTNAME= Maelstrom-3.0.1 +PKGNAME= maelstrom-3.0.1 CATEGORIES= games -MASTER_SITES= ftp://ftp.devolution.com/pub/maelstrom/ +MASTER_SITES= http://www.devolution.com/~slouken/projects/Maelstrom/src/ MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ + SDL-1.0.2:${PORTSDIR}/devel/sdl USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/Maelstrom -MAKE_ENV= CFLAGS="${CFLAGS} -pedantic" CXXFLAGS="${CXXFLAGS} -pedantic" - -do-configure: - @ ${CP} ${FILESDIR}/Makeflags ${WRKSRC} - -do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/Maelstrom ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/Maelstrom_sound ${PREFIX}/bin - @ ${MKDIR} ${PREFIX}/share/Maelstrom -.for file in Fonts Sounds Sprites - @ ${INSTALL_DATA} ${WRKSRC}/Maelstrom\ ${file} ${PREFIX}/share/Maelstrom -.endfor - @ ${INSTALL_DATA} ${WRKSRC}/Maelstrom-Scores ${PREFIX}/share/Maelstrom - @ ${CHOWN} root:games ${PREFIX}/share/Maelstrom/Maelstrom-Scores - @ ${CHMOD} 666 ${PREFIX}/share/Maelstrom/Maelstrom-Scores - @ ${MKDIR} ${PREFIX}/share/Maelstrom/Images - @ ${INSTALL_DATA} ${WRKSRC}/Images/*n ${PREFIX}/share/Maelstrom/Images +GNU_CONFIGURE= yes .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/Maelstrom -.for file in Ambrosia.URL BUGS Changelog Copyright README README.Options README.network - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/Maelstrom -.endfor - @ ${INSTALL_DATA} ${WRKSRC}/Doc/* ${PREFIX}/share/doc/Maelstrom +INSTALL_TARGET= install install_gamedocs .endif .include <bsd.port.mk> diff -ruN /usr/ports/games/maelstrom/files/md5 maelstrom/files/md5 --- /usr/ports/games/maelstrom/files/md5 Mon Nov 16 14:42:43 1998 +++ maelstrom/files/md5 Mon Mar 13 20:39:49 2000 @@ -1 +1 @@ -MD5 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 350806a4fa46e7aae76f089dba4b1861 +MD5 (Maelstrom-3.0.1.tar.gz) = 88f80726771766285b1397d1b73205b2 diff -ruN /usr/ports/games/maelstrom/patches/patch-aa maelstrom/patches/patch-aa --- /usr/ports/games/maelstrom/patches/patch-aa Mon Nov 16 14:42:43 1998 +++ maelstrom/patches/patch-aa Mon Mar 13 20:53:11 2000 @@ -1,15 +1,11 @@ ---- mixer.cpp Thu Dec 5 13:14:44 1996 -+++ /home/andy/tmp/wrk/mixer.cpp Wed May 13 23:06:18 1998 -@@ -283,10 +283,12 @@ - #endif /* linux */ +--- netlogic/netplay.cpp.orig Mon Mar 13 20:51:15 2000 ++++ netlogic/netplay.cpp Mon Mar 13 20:52:10 2000 +@@ -39,7 +39,7 @@ + #define RESET_ERRNO() errno = 0 + #endif /* WIN32 */ - /* This is necessary so that the sound server stays in sync */ -+#ifndef __FreeBSD__ - long flags; - flags = fcntl(dsp_fd, F_GETFL, 0); - flags |= O_SYNC; - (void) fcntl(dsp_fd, F_SETFL, flags); -+#endif +-#if !defined(linux) && !defined(__SVR4) ++#if !defined(linux) && !defined(__SVR4) && !defined(__FreeBSD__) + typedef int socklen_t; + #endif - return(0); - } diff -ruN /usr/ports/games/maelstrom/patches/patch-ab maelstrom/patches/patch-ab --- /usr/ports/games/maelstrom/patches/patch-ab Mon Nov 16 14:42:43 1998 +++ maelstrom/patches/patch-ab Mon Mar 13 20:58:22 2000 @@ -1,11 +1,12 @@ ---- mixer.h Sun May 25 21:18:10 1997 -+++ /home/andy/tmp/wrk/mixer.h Thu May 14 00:25:17 1998 -@@ -41,7 +41,7 @@ - }; - - #define _PATH_DEV_AUDIO "/dev/audio" --#ifdef linux -+#if (defined(linux) || defined(__FreeBSD__)) - #define _PATH_DEV_DSP "/dev/dsp" - #else - #define _PATH_DEV_DSP _PATH_DEV_AUDIO +--- configure.orig Mon Mar 13 20:58:01 2000 ++++ configure Mon Mar 13 20:58:05 2000 +@@ -1633,6 +1633,9 @@ + ac_default_prefix=/boot/beos + GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" + ;; ++ *-*-freebsd*) ++ GAME_INSTALLDIR="\$(prefix)/share/$PACKAGE" ++ ;; + *) + GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" + ;; diff -ruN /usr/ports/games/maelstrom/patches/patch-ac maelstrom/patches/patch-ac --- /usr/ports/games/maelstrom/patches/patch-ac Mon Nov 16 14:42:43 1998 +++ maelstrom/patches/patch-ac Mon Mar 13 21:38:59 2000 @@ -1,9 +1,13 @@ ---- netlogic/Makefile.orig Sun May 17 01:28:58 1998 -+++ netlogic/Makefile Sun May 17 01:29:05 1998 -@@ -1,5 +1,5 @@ +--- Makefile.in.orig Mon Mar 13 21:21:22 2000 ++++ Makefile.in Mon Mar 13 21:34:53 2000 +@@ -446,8 +446,8 @@ + chmod 666 $(target)/Maelstrom-Scores --CFLAGS = $(OPTIMIZE) -I.. $(INCLUDES) -DNETPLAY -+CFLAGS += $(OPTIMIZE) -I.. $(INCLUDES) -DNETPLAY - OBJS = about.o blit.o game.o logic.o make.o netplay.o object.o player.o + install_gamedocs: +- sh mkinstalldirs $(target)/ +- cp -rv README* COPYING* Docs* $(target)/ ++ sh mkinstalldirs $(prefix)/share/doc/Maelstrom/ ++ cp -rv README* COPYING* Docs/* $(prefix)/share/doc/Maelstrom/ - netlogic.o: $(OBJS) + # Rule to build tar-gzipped distribution package + $(PACKAGE)-$(VERSION).tar.gz: dist diff -ruN /usr/ports/games/maelstrom/patches/patch-ad maelstrom/patches/patch-ad --- /usr/ports/games/maelstrom/patches/patch-ad Mon Jan 31 05:43:44 2000 +++ maelstrom/patches/patch-ad Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- myerror.cpp.orig Sun Jan 30 19:35:18 2000 -+++ myerror.cpp Sun Jan 30 19:35:39 2000 -@@ -59,6 +59,8 @@ - - #endif /* Win95 */ - -+extern "C" char *strerror(int errnum); -+ - void myperror(char *msg) - { - char buffer[BUFSIZ]; diff -ruN /usr/ports/games/maelstrom/patches/patch-ae maelstrom/patches/patch-ae --- /usr/ports/games/maelstrom/patches/patch-ae Mon Jan 31 05:43:45 2000 +++ maelstrom/patches/patch-ae Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- Makefile.orig Sun Jan 30 19:36:49 2000 -+++ Makefile Sun Jan 30 19:38:19 2000 -@@ -81,7 +81,7 @@ - $(LOGIC)/$(LOGIC).o: - if [ "$(LOGIC)" != "" ]; then \ - cd "$(LOGIC)" && \ -- make "CXX=$(CXX)" "OPTIMIZE=$(OPTIMIZE)" "INCLUDES=$(INCLUDES)"; \ -+ make "CXX=$(CXX) -pedantic" "OPTIMIZE=$(OPTIMIZE)" "INCLUDES=$(INCLUDES)"; \ - fi - - macres: macres.o Mac_Resource.o Mac_Resource.h diff -ruN /usr/ports/games/maelstrom/pkg/DESCR maelstrom/pkg/DESCR --- /usr/ports/games/maelstrom/pkg/DESCR Tue May 4 09:58:20 1999 +++ maelstrom/pkg/DESCR Mon Mar 13 21:18:57 2000 @@ -2,4 +2,4 @@ Mac game Maelstrom originally written by Ambrosia Software. Unique to this port is a kick-butt network play mode. -WWW: http://www.devolution.com/~slouken/Maelstrom +WWW: http://www.devolution.com/~slouken/projects/Maelstrom/ diff -ruN /usr/ports/games/maelstrom/pkg/PLIST maelstrom/pkg/PLIST --- /usr/ports/games/maelstrom/pkg/PLIST Mon Nov 16 14:42:44 1998 +++ maelstrom/pkg/PLIST Mon Mar 13 21:38:17 2000 @@ -1,9 +1,27 @@ bin/Maelstrom -bin/Maelstrom_sound -share/Maelstrom/Maelstrom Fonts -share/Maelstrom/Maelstrom Sounds -share/Maelstrom/Maelstrom Sprites -share/Maelstrom/Maelstrom-Scores +bin/Maelstrom-netd +bin/macres +bin/playwave +bin/snd2wav +share/doc/Maelstrom/Ambrosia_Software,_Inc._FAQ +share/doc/Maelstrom/COPYING +share/doc/Maelstrom/COPYING.GPL +share/doc/Maelstrom/Maelstrom-Announce +share/doc/Maelstrom/Maelstrom.FAQ +share/doc/Maelstrom/MaelstromGPL_press_release +share/doc/Maelstrom/Makefile +share/doc/Maelstrom/Makefile.in +share/doc/Maelstrom/Networking.Paper +share/doc/Maelstrom/Porting.Paper +share/doc/Maelstrom/Quotes +share/doc/Maelstrom/README +share/doc/Maelstrom/README.joystick +share/doc/Maelstrom/README.network +share/doc/Maelstrom/README.options +share/doc/Maelstrom/RSA.README +share/doc/Maelstrom/Technical_Notes-v1.0 +share/doc/Maelstrom/Technical_Notes-v1.1 +share/doc/Maelstrom/Technical_Notes-v2.0 share/Maelstrom/Images/Maelstrom_Icon#100.cicn share/Maelstrom/Images/Maelstrom_Icon#101.cicn share/Maelstrom/Images/Maelstrom_Icon#102.cicn @@ -20,34 +38,24 @@ share/Maelstrom/Images/Maelstrom_Icon#135.cicn share/Maelstrom/Images/Maelstrom_Icon#136.cicn share/Maelstrom/Images/Maelstrom_Icon#137.cicn -share/Maelstrom/Images/Maelstrom_Sprites#128.icon -share/Maelstrom/Images/Maelstrom_Titles#100.icon -share/Maelstrom/Images/Maelstrom_Titles#101.icon -share/Maelstrom/Images/Maelstrom_Titles#102.icon -share/Maelstrom/Images/Maelstrom_Titles#128.icon -share/Maelstrom/Images/Maelstrom_Titles#129.icon -share/Maelstrom/Images/Maelstrom_Titles#130.icon -share/Maelstrom/Images/Maelstrom_Titles#133.icon -share/Maelstrom/Images/Maelstrom_Titles#134.icon -share/Maelstrom/Images/Maelstrom_Titles#135.icon -share/Maelstrom/Images/Maelstrom_Titles#999.icon -share/doc/Maelstrom/Ambrosia.FAQ -share/doc/Maelstrom/Ambrosia.URL -share/doc/Maelstrom/BUGS -share/doc/Maelstrom/Changelog -share/doc/Maelstrom/Copyright -share/doc/Maelstrom/Maelstrom-Announce -share/doc/Maelstrom/Maelstrom.FAQ -share/doc/Maelstrom/Networking.Paper -share/doc/Maelstrom/Porting.Paper -share/doc/Maelstrom/Quotes -share/doc/Maelstrom/README -share/doc/Maelstrom/README.Options -share/doc/Maelstrom/README.network -share/doc/Maelstrom/RSA.README -share/doc/Maelstrom/Technical_Notes-v1.0 -share/doc/Maelstrom/Technical_Notes-v1.1 -share/doc/Maelstrom/Technical_Notes-v2.0 +share/Maelstrom/Images/Maelstrom_Titles#100.bmp +share/Maelstrom/Images/Maelstrom_Titles#101.bmp +share/Maelstrom/Images/Maelstrom_Titles#102.bmp +share/Maelstrom/Images/Maelstrom_Titles#128.bmp +share/Maelstrom/Images/Maelstrom_Titles#129.bmp +share/Maelstrom/Images/Maelstrom_Titles#130.bmp +share/Maelstrom/Images/Maelstrom_Titles#133.bmp +share/Maelstrom/Images/Maelstrom_Titles#134.bmp +share/Maelstrom/Images/Maelstrom_Titles#135.bmp +share/Maelstrom/Images/Maelstrom_Titles#999.bmp +share/Maelstrom/Images/Makefile +share/Maelstrom/Images/Makefile.in +share/Maelstrom/Maelstrom-Scores +share/Maelstrom/Maelstrom_Fonts +share/Maelstrom/Maelstrom_Sounds +share/Maelstrom/Maelstrom_Sprites +share/Maelstrom/icon.bmp +share/Maelstrom/icon.xpm @dirrm share/Maelstrom/Images @dirrm share/Maelstrom @dirrm share/doc/Maelstrom >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003131948.VAA13948>