8 files changed, 81 insertions, 34 deletions

diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index a9c2d6b314bc..d3da955f9b64 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -7,33 +7,30 @@
 #
 
 PORTNAME=	adgali
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	games devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://savannah.nongnu.org/download/adgali/
 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:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff \
-		png:${PORTSDIR}/graphics/png \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+		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_GNOME=	gnometarget
 USE_REINPLACE=	yes
-USE_FREETYPE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ENV=	SDL_CONFIG=${SDL_CONFIG} \
-		CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-			  -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-compile-type=optim
 INSTALLS_SHLIB=	yes
 
 post-patch:
@@ -42,7 +39,8 @@ post-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/html/*.* ${DOCSDIR}
+	cd ${WRKSRC}/doc/html && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/adgali/distinfo b/games/adgali/distinfo
index 1bb6f98ea236..504651e1c864 100644
--- a/games/adgali/distinfo
+++ b/games/adgali/distinfo
@@ -1 +1 @@
-MD5 (adgali-0.1.0.tar.gz) = 3b2da9d88437260710623c37111812de
+MD5 (adgali-0.2.2.tar.gz) = 941207803fc4772c34889bf68fb77373
diff --git a/games/adgali/files/patch-configure b/games/adgali/files/patch-configure
new file mode 100644
index 000000000000..c3a0f42b90b8
--- /dev/null
+++ b/games/adgali/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri May 23 02:22:11 2003
++++ configure	Sat Jun 21 15:20:22 2003
+@@ -7893,6 +7893,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/games/adgali/files/patch-src::core::agl_subr.c b/games/adgali/files/patch-src::core::agl_subr.c
new file mode 100644
index 000000000000..c32474ee5037
--- /dev/null
+++ b/games/adgali/files/patch-src::core::agl_subr.c
@@ -0,0 +1,22 @@
+--- 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
new file mode 100644
index 000000000000..e47d1ef5e902
--- /dev/null
+++ b/games/adgali/files/patch-src::manage::agl_gramcode.c
@@ -0,0 +1,22 @@
+--- 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/files/patch-tools::agl_bfont.c b/games/adgali/files/patch-tools::agl_bfont.c
new file mode 100644
index 000000000000..97aaaf0d548a
--- /dev/null
+++ b/games/adgali/files/patch-tools::agl_bfont.c
@@ -0,0 +1,10 @@
+--- tools/agl_bfont.c.orig	Sun May 11 02:44:58 2003
++++ tools/agl_bfont.c	Sat Jun 21 15:18:43 2003
+@@ -40,7 +40,6 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+-#include <getopt.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include "../config.h"
diff --git a/games/adgali/pkg-descr b/games/adgali/pkg-descr
index 4885d6a4f8b3..a776f766b68b 100644
--- a/games/adgali/pkg-descr
+++ b/games/adgali/pkg-descr
@@ -6,4 +6,4 @@ This library tends to provide useful functions for bitmap and sprite display,
 game GUI, sound events and music, generic AI engine, network management and
 video streaming. 
 
-WWW: http://adgali.sourceforge.net/
+WWW: http://www.nongnu.org/adgali/
diff --git a/games/adgali/pkg-plist b/games/adgali/pkg-plist
index e168e33874b8..8b0ddbf46dd7 100644
--- a/games/adgali/pkg-plist
+++ b/games/adgali/pkg-plist
@@ -1,9 +1,10 @@
 bin/adgali-config
-bin/create_font
-bin/create_imglist
+bin/agl_bfont
 include/agl.h
+include/agl_endian.h
 include/agl_gui.h
 include/agl_ios.h
+include/agl_object.h
 include/agl_video.h
 lib/libagl.a
 lib/libagl.so
@@ -17,20 +18,8 @@ share/aclocal/adgali.m4
 %%PORTDOCS%%share/doc/adgali/annotated.html
 %%PORTDOCS%%share/doc/adgali/classes.html
 %%PORTDOCS%%share/doc/adgali/doxygen.css
-%%PORTDOCS%%share/doc/adgali/doxygen.gif
+%%PORTDOCS%%share/doc/adgali/doxygen.png
 %%PORTDOCS%%share/doc/adgali/files.html
-%%PORTDOCS%%share/doc/adgali/ftv2blank.gif
-%%PORTDOCS%%share/doc/adgali/ftv2doc.gif
-%%PORTDOCS%%share/doc/adgali/ftv2folderclosed.gif
-%%PORTDOCS%%share/doc/adgali/ftv2folderopen.gif
-%%PORTDOCS%%share/doc/adgali/ftv2lastnode.gif
-%%PORTDOCS%%share/doc/adgali/ftv2link.gif
-%%PORTDOCS%%share/doc/adgali/ftv2mlastnode.gif
-%%PORTDOCS%%share/doc/adgali/ftv2mnode.gif
-%%PORTDOCS%%share/doc/adgali/ftv2node.gif
-%%PORTDOCS%%share/doc/adgali/ftv2plastnode.gif
-%%PORTDOCS%%share/doc/adgali/ftv2pnode.gif
-%%PORTDOCS%%share/doc/adgali/ftv2vertline.gif
 %%PORTDOCS%%share/doc/adgali/functions.html
 %%PORTDOCS%%share/doc/adgali/globals.html
 %%PORTDOCS%%share/doc/adgali/graph_legend.dot
@@ -40,7 +29,6 @@ share/aclocal/adgali.m4
 %%PORTDOCS%%share/doc/adgali/index.hhk
 %%PORTDOCS%%share/doc/adgali/index.hhp
 %%PORTDOCS%%share/doc/adgali/index.html
-%%PORTDOCS%%share/doc/adgali/main.html
 %%PORTDOCS%%share/doc/adgali/structagl__channel.html
 %%PORTDOCS%%share/doc/adgali/structagl__channel__coll__graph.gif
 %%PORTDOCS%%share/doc/adgali/structagl__ios.html
@@ -49,7 +37,4 @@ share/aclocal/adgali.m4
 %%PORTDOCS%%share/doc/adgali/structagl__pos.html
 %%PORTDOCS%%share/doc/adgali/structagl__rect.html
 %%PORTDOCS%%share/doc/adgali/structagl__size.html
-%%PORTDOCS%%share/doc/adgali/tree.html
-%%PORTDOCS%%share/doc/adgali/tree.js
-%%PORTDOCS%%share/doc/adgali/treeview.js
 %%PORTDOCS%%@dirrm share/doc/adgali