7 files changed, 33 insertions, 142 deletions

diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile
index dc800f35e798..721304f6ac9f 100644
--- a/graphics/allegrogl/Makefile
+++ b/graphics/allegrogl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	allegrogl
-PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,6 +26,7 @@ USE_AUTOCONF_VER=253
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	lib
+INSTALLS_SHLIB=	yes
 
 WRKSRC=		${WRKDIR}/alleggl
 
@@ -39,17 +39,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \
 		${WRKSRC}/make/makefile.unx
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/unix/libagl.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/include/alleggl.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/include/alleggl_config.h ${PREFIX}/include
-	@${MKDIR} ${PREFIX}/include/allegrogl
-	${INSTALL_DATA} ${WRKSRC}/include/allegrogl/*.h \
-		${PREFIX}/include/allegrogl
-	@${MKDIR} ${PREFIX}/include/allegrogl/GLext
-	${INSTALL_DATA} ${WRKSRC}/include/allegrogl/GLext/*.h \
-		${PREFIX}/include/allegrogl/GLext
-
+post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examp/* ${EXAMPLESDIR}
 	@${PERL} -pi -e 's|%%CC%%|${CC}|g; \
diff --git a/graphics/allegrogl/distinfo b/graphics/allegrogl/distinfo
index 16f37aea97af..3e9f20771809 100644
--- a/graphics/allegrogl/distinfo
+++ b/graphics/allegrogl/distinfo
@@ -1 +1,2 @@
-MD5 (alleggl-0.2.0.tar.bz2) = 54080f3f549bbf25ba04be7c3e8a42a5
+MD5 (alleggl-0.2.2.tar.bz2) = 39e0f482c895ba97381f64c5a5d79f7d
+SIZE (alleggl-0.2.2.tar.bz2) = 307967
diff --git a/graphics/allegrogl/files/patch-configure.in b/graphics/allegrogl/files/patch-configure.in
index ff1197277843..7b6358d76661 100644
--- a/graphics/allegrogl/files/patch-configure.in
+++ b/graphics/allegrogl/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Sat Sep  6 21:26:48 2003
-+++ configure.in	Thu Jan 22 14:58:15 2004
-@@ -50,7 +50,7 @@
+--- configure.in.orig	Sat Feb 21 19:38:28 2004
++++ configure.in	Sat Mar 20 07:14:42 2004
+@@ -52,7 +52,7 @@
  
  dnl Check for pthread support, which GL libs may require (e.g. FreeBSD)
  AC_CHECK_HEADER(pthread.h, , dontcare=y)
@@ -9,29 +9,7 @@
  
  
  dnl Build Mesa generic driver
-@@ -96,14 +96,15 @@
- 	fi
- 
- 
-+dnl We don't need this check in FreeBSD
- dnl Check if the dynamic loading library (libdl.so) is available
--	AH_TEMPLATE([ALLEGROGL_HAVE_DYNAMIC_LINK], [Define if dynamic linking is supported.])
--	AC_CHECK_HEADER(dlfcn.h,
--		AC_CHECK_LIB(dl, dlsym, 
--			LIBS="-ldl $LIBS"
-+dnl	AH_TEMPLATE([ALLEGROGL_HAVE_DYNAMIC_LINK], [Define if dynamic linking is supported.])
-+dnl	AC_CHECK_HEADER(dlfcn.h,
-+dnl		AC_CHECK_LIB(dl, dlsym, 
-+dnl			LIBS="-ldl $LIBS"
- 			AC_DEFINE(ALLEGROGL_HAVE_DYNAMIC_LINK)
--		)
--	)
-+dnl		)
-+dnl	)
- fi
- 
- 
-@@ -155,14 +156,14 @@
+@@ -171,14 +171,14 @@
  dnl the Mesa generic driver and the (hopefully) accelerated one
  if test -f makefile; then
  	echo '# Remove older build'
@@ -48,7 +26,7 @@
  	agl_make_depend="yes";
  fi
  
-@@ -173,5 +174,5 @@
+@@ -189,5 +189,5 @@
  
  dnl Run "make depend" if necessary
  if test -n "$agl_make_depend"; then
diff --git a/graphics/allegrogl/files/patch-include-allegrogl-gl_ext.h b/graphics/allegrogl/files/patch-include-allegrogl-gl_ext.h
deleted file mode 100644
index eeb691616d61..000000000000
--- a/graphics/allegrogl/files/patch-include-allegrogl-gl_ext.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/allegrogl/gl_ext.h.orig	Sun Dec 14 01:19:34 2003
-+++ include/allegrogl/gl_ext.h	Thu Jan 22 14:46:25 2004
-@@ -12,7 +12,7 @@
- #include "allegrogl/GLext/gl_ext_defs.h"
- #ifdef ALLEGRO_WINDOWS
- #include "allegrogl/GLext/wgl_ext_defs.h"
--#elif defined ALLEGRO_LINUX
-+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
- #include "allegrogl/GLext/glx_ext_defs.h"
- #endif
- 
-@@ -27,7 +27,7 @@
- #	include "allegrogl/GLext/gl_ext_api.h"
- #ifdef ALLEGRO_WINDOWS
- #	include "allegrogl/GLext/wgl_ext_api.h"
--#elif defined ALLEGRO_LINUX
-+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
- #	include "allegrogl/GLext/glx_ext_api.h"
- #endif
- #undef AGL_API
-@@ -46,7 +46,7 @@
- #define AGL_API(type, name, args) extern AGL_##name##_t wgl##name;
- #	include "allegrogl/GLext/wgl_ext_api.h"
- #undef AGL_API
--#elif defined ALLEGRO_LINUX
-+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
- #define AGL_API(type, name, args) extern AGL_##name##_t glX##name;
- #	include "allegrogl/GLext/glx_ext_api.h"
- #undef AGL_API
diff --git a/graphics/allegrogl/files/patch-make-makefile.unx b/graphics/allegrogl/files/patch-make-makefile.unx
index d3ba6bb20cb6..ac4626c8cfde 100644
--- a/graphics/allegrogl/files/patch-make-makefile.unx
+++ b/graphics/allegrogl/files/patch-make-makefile.unx
@@ -1,6 +1,15 @@
---- make/makefile.unx.orig	Thu Jan 22 14:15:30 2004
-+++ make/makefile.unx	Thu Jan 22 14:17:05 2004
-@@ -46,20 +46,20 @@
+--- make/makefile.unx.orig	Sat Feb 21 18:25:06 2004
++++ make/makefile.unx	Fri Mar 26 20:55:17 2004
+@@ -18,7 +18,7 @@
+ # Programs
+ CC = @CC@
+ CXX = @CXX@
+-INSTALLER = @INSTALL@ -D -m 644
++INSTALLER = @INSTALL@ -m 644
+ 
+ 
+ # Where to install the library and header file
+@@ -49,13 +49,13 @@
  # --- Compiler optimizations ---#
  
  ifdef DEBUGMODE
@@ -13,15 +22,18 @@
  else
 -	CFLAGS = -O2 -Wall -ffast-math -fomit-frame-pointer
 +	CFLAGS += -O2 -Wall -ffast-math -fomit-frame-pointer
- 	SHARED = @SHARED@
+ endif
+ 
+ ifdef SHARED
+@@ -65,9 +65,9 @@
  endif
  
  ifdef DEBUGALLEG
--	LDLIBS = -l$(LIB_NAME) `allegro-config --libs debug` $(LIBS)
-+	LDLIBS = -l$(LIB_NAME) `%%ALLEGRO_CONFIG%% --libs debug` $(LIBS)
+-	LDLIBS += `allegro-config --libs debug` $(LIBS)
++	LDLIBS += `/usr/local/bin/allegro-config --libs debug` $(LIBS)
  else
--	LDLIBS = -l$(LIB_NAME) `allegro-config --libs` $(LIBS)
-+	LDLIBS = -l$(LIB_NAME) `%%ALLEGRO_CONFIG%% --libs` $(LIBS)
+-	LDLIBS += `allegro-config --libs` $(LIBS)
++	LDLIBS += `/usr/local/bin/allegro-config --libs` $(LIBS)
  endif
  
  ifdef MESABUILD
diff --git a/graphics/allegrogl/files/patch-src-glext.c b/graphics/allegrogl/files/patch-src-glext.c
deleted file mode 100644
index 0010d599dad0..000000000000
--- a/graphics/allegrogl/files/patch-src-glext.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/glext.c.orig	Thu Jan  8 01:04:04 2004
-+++ src/glext.c	Thu Jan 22 16:32:43 2004
-@@ -20,7 +20,7 @@
- #	include "allegrogl/GLext/gl_ext_api.h"
- #ifdef ALLEGRO_WINDOWS
- #	include "allegrogl/GLext/wgl_ext_api.h"
--#elif defined ALLEGRO_LINUX
-+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
- #	include "allegrogl/GLext/glx_ext_api.h"
- #endif
- } AGL_EXT;
-@@ -105,7 +105,7 @@
- #define AGL_API(type, name, args) AGL_##name##_t wgl##name = NULL;
- #	include "allegrogl/GLext/wgl_ext_api.h"
- #undef AGL_API
--#elif defined ALLEGRO_LINUX
-+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
- #define AGL_API(type, name, args) AGL_##name##_t glX##name = NULL;
- #	include "allegrogl/GLext/glx_ext_api.h"
- #undef AGL_API
-@@ -153,7 +153,7 @@
- 		if (ext->name) { AGL_LOG(2,"wgl" #name " successfully loaded\n"); }
- #	include "allegrogl/GLext/wgl_ext_api.h"
- #	undef AGL_API
--#	elif defined ALLEGRO_LINUX
-+#	elif defined ALLEGRO_LINUX || defined __FreeBSD__
- #	define AGL_API(type, name, args) \
- 		ext->name = (AGL_##name##_t)aglXGetProcAddress("gl" #name); \
- 		if (ext->name) { AGL_LOG(2,"gl" #name " successfully loaded\n"); }
-@@ -197,7 +197,7 @@
- #define AGL_API(type, name, args) wgl##name = ext->name;
- #	include "allegrogl/GLext/wgl_ext_api.h"
- #undef AGL_API
--#elif defined ALLEGRO_LINUX
-+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
- #define AGL_API(type, name, args) glX##name = ext->name;
- #	include "allegrogl/GLext/glx_ext_api.h"
- #undef AGL_API
-@@ -344,7 +344,7 @@
- 		 * we try to find the symbol into the dynamic libs
- 		 * that are already loaded (e.g. in libGL.so)
- 		 */
--		symbol = dlsym(0, name);
-+		symbol = dlsym(RTLD_NEXT, name);
- 	}
- #elif defined ALLEGRO_MACOSX
- 	function = CFStringCreateWithCString(kCFAllocatorDefault, name,
-@@ -439,10 +439,10 @@
- 
- 	/* Get glXGetProcAddress entry */
- #ifdef ALLEGROGL_HAVE_DYNAMIC_LINK
--	aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(0,
-+	aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(RTLD_NEXT,
- 	                                                    "glXGetProcAddressARB");
- 	if (!aglXGetProcAddress) {
--		aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(0,
-+		aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(RTLD_NEXT,
- 	                                                       "glXGetProcAddress");
- 	}
- 	TRACE("glXGetProcAddress Extension: %s\n",
diff --git a/graphics/allegrogl/pkg-plist b/graphics/allegrogl/pkg-plist
index 439dde88a422..ee42f004f9e6 100644
--- a/graphics/allegrogl/pkg-plist
+++ b/graphics/allegrogl/pkg-plist
@@ -2,18 +2,17 @@ include/alleggl.h
 include/alleggl_config.h
 include/allegrogl/gl_ext.h
 include/allegrogl/gl_header_detect.h
+include/allegrogl/GLext/gl_ext_alias.h
 include/allegrogl/GLext/gl_ext_api.h
 include/allegrogl/GLext/gl_ext_defs.h
 include/allegrogl/GLext/gl_ext_list.h
+include/allegrogl/GLext/glx_ext_alias.h
 include/allegrogl/GLext/glx_ext_api.h
 include/allegrogl/GLext/glx_ext_defs.h
 include/allegrogl/GLext/glx_ext_list.h
-include/allegrogl/GLext/wgl_ext_api.h
-include/allegrogl/GLext/wgl_ext_defs.h
-include/allegrogl/GLext/wgl_ext_list.h
 @dirrm include/allegrogl/GLext
 @dirrm include/allegrogl
-lib/libagl.a
+lib/libagl.so
 %%EXAMPLESDIR%%/demofont.dat
 %%EXAMPLESDIR%%/dialog.c
 %%EXAMPLESDIR%%/dumbtest.c