- Fix sdl-net dependency: do not build own version of SDL_net, but use

devel/sdl-net which was additionally picked up if installed
- Fix CONFIGURE_STYLE, "gnu" instead of "autoconf"

games/castle-combat/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/02/28 23:31:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2003/03/06 01:09:27 pvalchev Exp $
 
 COMMENT=	"Rampart arcade game clone for X11" 
 
@@ -18,12 +18,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 LIB_DEPENDS=	SDL::devel/sdl \
 		SDL_mixer::devel/sdl-mixer \
+		SDL_net::devel/sdl-net \
 		png.2::graphics/png
 
 MASTER_SITES=	http://user.cs.tu-berlin.de/~karlb/castle-combat/
 
 USE_X11= Yes
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= --with-png
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

games/castle-combat/patches/patch-configure

@@ -0,0 +1,28 @@
+$OpenBSD: patch-configure,v 1.1 2003/03/06 01:09:28 pvalchev Exp $
+--- configure.orig	Wed Mar  5 17:58:58 2003
++++ configure	Wed Mar  5 17:58:51 2003
+@@ -2033,7 +2033,7 @@ fi
+ 
+ ######## Set compiler flags and libraries
+ CFLAGS="$CFLAGS $SDL_CFLAGS -DDATADIR=\"\\\"$datadir/castle-combat\\\"\" -Wall"
+-LIBS="-LSDL_net -lSDL_net $SDL_LIBS $LIBS $INETLIB"
++LIBS="-lSDL_net $SDL_LIBS $LIBS $INETLIB"
+ 
+ 
+ 
+@@ -2154,7 +2154,6 @@ ac_given_INSTALL="$INSTALL"
+ trap 'rm -fr `echo "
+ Makefile
+ src/Makefile
+-src/SDL_net/Makefile
+ data/Makefile
+ data/gfx/Makefile
+ data/sound/Makefile
+@@ -2274,7 +2273,6 @@ cat >> $CONFIG_STATUS <<EOF
+ 
+ CONFIG_FILES=\${CONFIG_FILES-"Makefile
+ src/Makefile
+-src/SDL_net/Makefile
+ data/Makefile
+ data/gfx/Makefile
+ data/sound/Makefile

games/castle-combat/patches/patch-src_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2003/03/06 01:09:28 pvalchev Exp $
+--- src/Makefile.in.orig	Wed Mar  5 18:01:41 2003
++++ src/Makefile.in	Wed Mar  5 18:01:30 2003
+@@ -77,7 +77,7 @@ install_sh = @install_sh@
+ 
+ bin_PROGRAMS = castle-combat castle-combat-server
+ 
+-SUBDIRS = SDL_net
++SUBDIRS = 
+ 
+ castle_combat_LDADD = -lz -lpng @SOUND@
+ 

games/castle-combat/patches/patch-src_main_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_main_c,v 1.1 2003/03/06 01:09:28 pvalchev Exp $
+--- src/main.c.orig	Wed Mar  6 07:05:39 2002
++++ src/main.c	Wed Mar  5 18:02:28 2003
+@@ -24,8 +24,8 @@
+ #include "main.h"
+ #include "options.h"
+ #include "time.h"
+-#include "SDL_net/SDL_net.h"
+ #include "server.h"
++#include <SDL/SDL_net.h>
+ 
+     int fullscreen=1, CityDestroyed[6]={0,0,0,0,0,0},
+ 	CannonDestroyed[3]={0,0,0}, Score=0, HWCursor=0, NetworkOpen=0;

games/castle-combat/patches/patch-src_net_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_net_c,v 1.1 2003/03/06 01:09:28 pvalchev Exp $
+--- src/net.c.orig	Wed Mar  6 10:17:42 2002
++++ src/net.c	Wed Mar  5 18:02:41 2003
+@@ -1,7 +1,7 @@
+-#include "SDL_net/SDL_net.h"
+ #include "main.h"
+ #include "server.h"
+ #include "string.h"
++#include <SDL/SDL_net.h>
+ 
+ static TCPsocket tcpsock = NULL;
+ static SDLNet_SocketSet socketset = NULL;