Fix build with gcc-3.4

Support PORTDOCS

PR:		ports/70866
Submitted by:	Ports Fury

3 files changed, 51 insertions, 22 deletions

diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 9961834f2ad0..7764a58e25a0 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -15,11 +15,11 @@ DISTNAME=	Maelstrom-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Asteroids-style game for X Window System
 
-USE_SDL=	sdl net
 USE_X_PREFIX=	yes
+USE_SDL=	sdl net
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--program-transform-name=\'\'
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET=	install install_gamedocs
diff --git a/games/maelstrom/files/patch-buttonlist.h b/games/maelstrom/files/patch-buttonlist.h
new file mode 100644
index 000000000000..6dac7bc82a6c
--- /dev/null
+++ b/games/maelstrom/files/patch-buttonlist.h
@@ -0,0 +1,29 @@
+--- buttonlist.h.orig	Wed Jan 26 01:41:32 2000
++++ buttonlist.h	Sun Aug 22 19:24:13 2004
+@@ -16,7 +16,7 @@
+ 
+ 	void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, 
+ 						void (*callback)(void)) {
+-		struct button *belem;
++		button *belem;
+ 		
+ 		for ( belem=&button_list; belem->next; belem=belem->next );
+ 		belem->next = new button;
+@@ -30,7 +30,7 @@
+ 	}
+ 
+ 	void Activate_Button(Uint16 x, Uint16 y) {
+-		struct button *belem;
++		button *belem;
+ 
+ 		for ( belem=button_list.next; belem; belem=belem->next ) {
+ 			if ( (x >= belem->x1) && (x <= belem->x2) &&
+@@ -42,7 +42,7 @@
+ 	}
+ 
+ 	void Delete_Buttons(void) {
+-		struct button *belem, *btemp;
++		button *belem, *btemp;
+ 
+ 		for ( belem=button_list.next; belem; ) {
+ 			btemp = belem;
diff --git a/games/maelstrom/pkg-plist b/games/maelstrom/pkg-plist
index ac3ac7843d63..6219fef25314 100644
--- a/games/maelstrom/pkg-plist
+++ b/games/maelstrom/pkg-plist
@@ -1,24 +1,24 @@
 bin/Maelstrom
 bin/Maelstrom-netd
-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
+%%PORTDOCS%%share/doc/Maelstrom/Ambrosia_Software,_Inc._FAQ
+%%PORTDOCS%%share/doc/Maelstrom/COPYING
+%%PORTDOCS%%share/doc/Maelstrom/COPYING.GPL
+%%PORTDOCS%%share/doc/Maelstrom/Maelstrom-Announce
+%%PORTDOCS%%share/doc/Maelstrom/Maelstrom.FAQ
+%%PORTDOCS%%share/doc/Maelstrom/MaelstromGPL_press_release
+%%PORTDOCS%%share/doc/Maelstrom/Makefile
+%%PORTDOCS%%share/doc/Maelstrom/Makefile.in
+%%PORTDOCS%%share/doc/Maelstrom/Networking.Paper
+%%PORTDOCS%%share/doc/Maelstrom/Porting.Paper
+%%PORTDOCS%%share/doc/Maelstrom/Quotes
+%%PORTDOCS%%share/doc/Maelstrom/README
+%%PORTDOCS%%share/doc/Maelstrom/README.joystick
+%%PORTDOCS%%share/doc/Maelstrom/README.network
+%%PORTDOCS%%share/doc/Maelstrom/README.options
+%%PORTDOCS%%share/doc/Maelstrom/RSA.README
+%%PORTDOCS%%share/doc/Maelstrom/Technical_Notes-v1.0
+%%PORTDOCS%%share/doc/Maelstrom/Technical_Notes-v1.1
+%%PORTDOCS%%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
@@ -55,4 +55,4 @@ share/Maelstrom/icon.bmp
 share/Maelstrom/icon.xpm
 @dirrm share/Maelstrom/Images
 @dirrm share/Maelstrom
-@dirrm share/doc/Maelstrom
+%%PORTDOCS%%@dirrm share/doc/Maelstrom