5 files changed, 41 insertions, 80 deletions

diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index d3da955f9b64..3ddf2e254443 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	adgali
-PORTVERSION=	0.2.2
+PORTVERSION=	0.2.3
 CATEGORIES=	games devel
 MASTER_SITES=	http://savannah.nongnu.org/download/adgali/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,21 +15,18 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open source game library useful for 2D games programmation
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	yes
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
diff --git a/games/adgali/distinfo b/games/adgali/distinfo
index 504651e1c864..bd596f6805d8 100644
--- a/games/adgali/distinfo
+++ b/games/adgali/distinfo
@@ -1 +1 @@
-MD5 (adgali-0.2.2.tar.gz) = 941207803fc4772c34889bf68fb77373
+MD5 (adgali-0.2.3.tar.gz) = 34e051864e5b7f1ed5c3bfd436f9bd48
diff --git a/games/adgali/files/patch-src::core::agl_subr.c b/games/adgali/files/patch-src::core::agl_subr.c
deleted file mode 100644
index c32474ee5037..000000000000
--- a/games/adgali/files/patch-src::core::agl_subr.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/core/agl_subr.c.orig	Sun May  4 07:20:06 2003
-+++ src/core/agl_subr.c	Sat Jun 21 14:56:41 2003
-@@ -103,8 +103,7 @@
- 					type = NUMBER_TOKEN;
- 					break;
- 				default:
--					if isdigit
--						(c)
-+					if (isdigit(c))
- 					{
- 						type = INT_TOKEN;
- 						uval = c - '0';
-@@ -120,8 +119,7 @@
- 				}
- 				else
- 				{
--					if isdigit
--						(c)
-+					if (isdigit(c))
- 					{
- 						type = INT_TOKEN;
- 						uval = c - '0';
diff --git a/games/adgali/files/patch-src::manage::agl_gramcode.c b/games/adgali/files/patch-src::manage::agl_gramcode.c
deleted file mode 100644
index e47d1ef5e902..000000000000
--- a/games/adgali/files/patch-src::manage::agl_gramcode.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/manage/agl_gramcode.c.orig	Thu Apr 17 06:15:13 2003
-+++ src/manage/agl_gramcode.c	Sat Jun 21 14:55:49 2003
-@@ -465,8 +465,7 @@
- 					type = SKIP_TOKEN;
- 					break;
- 				default:
--					if isdigit
--						(c)
-+					if (isdigit(c))
- 					{
- 						type = INT_TOKEN;
- 						uval = c - '0';
-@@ -600,8 +599,7 @@
- 				}
- 				else
- 				{
--					if isdigit
--						(c)
-+					if (isdigit(c))
- 					{
- 						type = INT_TOKEN;
- 						uval = c - '0';
diff --git a/games/adgali/pkg-plist b/games/adgali/pkg-plist
index 8b0ddbf46dd7..b603e8c11a69 100644
--- a/games/adgali/pkg-plist
+++ b/games/adgali/pkg-plist
@@ -1,5 +1,6 @@
 bin/adgali-config
 bin/agl_bfont
+bin/agl_imglist
 include/agl.h
 include/agl_endian.h
 include/agl_gui.h
@@ -10,31 +11,38 @@ lib/libagl.a
 lib/libagl.so
 lib/libagl.so.0
 share/aclocal/adgali.m4
-%%PORTDOCS%%share/doc/adgali/adgali025.png
-%%PORTDOCS%%share/doc/adgali/adgali150.png
-%%PORTDOCS%%share/doc/adgali/agl_8h.html
-%%PORTDOCS%%share/doc/adgali/agl__ios_8h.html
-%%PORTDOCS%%share/doc/adgali/agl__video_8h.html
-%%PORTDOCS%%share/doc/adgali/annotated.html
-%%PORTDOCS%%share/doc/adgali/classes.html
-%%PORTDOCS%%share/doc/adgali/doxygen.css
-%%PORTDOCS%%share/doc/adgali/doxygen.png
-%%PORTDOCS%%share/doc/adgali/files.html
-%%PORTDOCS%%share/doc/adgali/functions.html
-%%PORTDOCS%%share/doc/adgali/globals.html
-%%PORTDOCS%%share/doc/adgali/graph_legend.dot
-%%PORTDOCS%%share/doc/adgali/graph_legend.gif
-%%PORTDOCS%%share/doc/adgali/graph_legend.html
-%%PORTDOCS%%share/doc/adgali/index.hhc
-%%PORTDOCS%%share/doc/adgali/index.hhk
-%%PORTDOCS%%share/doc/adgali/index.hhp
-%%PORTDOCS%%share/doc/adgali/index.html
-%%PORTDOCS%%share/doc/adgali/structagl__channel.html
-%%PORTDOCS%%share/doc/adgali/structagl__channel__coll__graph.gif
-%%PORTDOCS%%share/doc/adgali/structagl__ios.html
-%%PORTDOCS%%share/doc/adgali/structagl__pix.html
-%%PORTDOCS%%share/doc/adgali/structagl__pix__coll__graph.gif
-%%PORTDOCS%%share/doc/adgali/structagl__pos.html
-%%PORTDOCS%%share/doc/adgali/structagl__rect.html
-%%PORTDOCS%%share/doc/adgali/structagl__size.html
-%%PORTDOCS%%@dirrm share/doc/adgali
+%%PORTDOCS%%%%DOCSDIR%%/adgali025.png
+%%PORTDOCS%%%%DOCSDIR%%/adgali150.png
+%%PORTDOCS%%%%DOCSDIR%%/agl_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/agl_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/agl__ios_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/agl__ios_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/agl__video_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/agl__video_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/files.html
+%%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/graph_legend.dot
+%%PORTDOCS%%%%DOCSDIR%%/graph_legend.gif
+%%PORTDOCS%%%%DOCSDIR%%/graph_legend.html
+%%PORTDOCS%%%%DOCSDIR%%/index.hhc
+%%PORTDOCS%%%%DOCSDIR%%/index.hhk
+%%PORTDOCS%%%%DOCSDIR%%/index.hhp
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/structagl__channel.html
+%%PORTDOCS%%%%DOCSDIR%%/structagl__channel__coll__graph.gif
+%%PORTDOCS%%%%DOCSDIR%%/structagl__ios.html
+%%PORTDOCS%%%%DOCSDIR%%/structagl__pix.html
+%%PORTDOCS%%%%DOCSDIR%%/structagl__pix__coll__graph.gif
+%%PORTDOCS%%%%DOCSDIR%%/structagl__pos.html
+%%PORTDOCS%%%%DOCSDIR%%/structagl__rect.html
+%%PORTDOCS%%%%DOCSDIR%%/structagl__size.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%