4 files changed, 31 insertions, 41 deletions

diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index a4aaae0ac376..e3c416dd5bbc 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	dgen-sdl
-PORTVERSION=	1.20a
+PORTVERSION=	1.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://pknet.com/~joe/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl
+LIB_DEPENDS=	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel
 
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
+
+USE_MESA=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
-MAN1=		dgen.1
+MAN1=		dgen.1 tobin.1
 MAN5=		dgenrc.5
 
 .include <bsd.port.mk>
diff --git a/emulators/dgen-sdl/distinfo b/emulators/dgen-sdl/distinfo
index 5b9f742360cb..844b6364d4c5 100644
--- a/emulators/dgen-sdl/distinfo
+++ b/emulators/dgen-sdl/distinfo
@@ -1 +1 @@
-MD5 (dgen-sdl-1.20a.tar.gz) = 31b4c83aa67d1affe479a1cd668f252e
+MD5 (dgen-sdl-1.22.tar.gz) = 2f6ef8ce77f6ac4912d81ff53bfb085a
diff --git a/emulators/dgen-sdl/files/Makeflags b/emulators/dgen-sdl/files/Makeflags
deleted file mode 100644
index de83567d2f66..000000000000
--- a/emulators/dgen-sdl/files/Makeflags
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file contains the template for Makeflags
-
-SYSTEM = FreeBSD
-FEATURES =  -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS -DUNSIGNED_AUDIO_DATA -DFORCE_XSHM -DNETPLAY
-
-LOGIC = netlogic
-
-XPMINCLUDE = 
-XPMLINKDIR = 
-
-BINDIR = ${PREFIX}/bin
-LIBDIR = ${PREFIX}/share/Maelstrom
-DATAFILES = Images/*.icon Images/*.cicn "Maelstrom Fonts" \
-            "Maelstrom Sounds" "Maelstrom Sprites"
-
-OBJS = main.o framebuf.o v_framebuf.o x11_framebuf.o vga_framebuf.o \
-       dga_framebuf.o fontserv.o sound.o Mac_Resource.o imagedump.o \
-       init.o $(LOGIC)/$(LOGIC).o \
-       controls.o scores.o dialog.o fastrand.o netscore.o checksum.o \
-       Utils.o shared.o myerror.o
-SOUNDOBJS = Maelstrom_sound.o Mac_Resource.o soundres.o mixer.o shared.o myerror.o
-
-X11INCLUDE = -I${X11BASE}/include
-INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE)
-CFLAGS += $(INCLUDES) $(FEATURES) \
-                       -pedantic -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\"
-EXTRALIBS = 
-X11LINKDIR = -L${X11BASE}/lib
-X11LIBS = -lXpm $(XPMLINKDIR) -lX11 -lXext $(X11LINKDIR)
-CSUMLIB = 
-LIBS = $(EXTRALIBS) $(X11LIBS) $(CSUMLIB)
-SOUNDLIBS = 
-
-INSTALL = install
-
-all: $(MAELSTROM)
-
diff --git a/emulators/dgen-sdl/files/patch-configure b/emulators/dgen-sdl/files/patch-configure
new file mode 100644
index 000000000000..1a1bb3b19be0
--- /dev/null
+++ b/emulators/dgen-sdl/files/patch-configure
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- configure	2001/02/23 11:37:15	1.1
++++ configure	2001/02/23 11:37:28
+@@ -1779,7 +1779,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <SDL/SDL.h>
++#include <SDL.h>
+ 
+ char*
+ my_strdup (char *str)
+@@ -1872,7 +1872,7 @@
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+-#include <SDL/SDL.h>
++#include <SDL.h>
+ 
+ int main() {
+  return 0;