- Update to version 0.4.0 RC4 (compatible with current allegro: version 4.2.0).

- Make symlink to make LIB_DEPENDS work (libagl.so -> libagl.so.4).
- Use SF macro in MASTER_SITES.
- Take maintainership.

6 files changed, 33 insertions, 102 deletions

diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile
index 83a87ea32449..5106064cbeda 100644
--- a/graphics/allegrogl/Makefile
+++ b/graphics/allegrogl/Makefile
@@ -6,49 +6,49 @@
 #
 
 PORTNAME=	allegrogl
-PORTVERSION=	0.2.4
-PORTREVISION=	1
+DISTVERSION=	0.4.0_rc4
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	alleggl-${PORTVERSION}
+MASTER_SITES=	SF
+DISTNAME=	alleggl-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	OpenGL inteface for Allegro library
 
 LIB_DEPENDS=	alleg.42:${PORTSDIR}/devel/allegro
 
 USE_BZIP2=	yes
+USE_GCC=	3.2+
 USE_GMAKE=	yes
 USE_GL=		yes
-USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	lib
-USE_LDCONFIG=	yes
-
 WRKSRC=		${WRKDIR}/alleggl
 
-ALLEGRO_CONFIG?=${LOCALBASE}/bin/allegro-config
+SHLIB_VER=	4
+PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%GMAKE%%|${GMAKE}|g; \
-			      s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure.in
-	@${REINPLACE_CMD} -e 's|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \
+	@${REINPLACE_CMD} -e \
+		's|^[[:blank:]]make |${GMAKE} |; \
+		 s|\.so|&.${SHLIB_VER}|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -Ee 's|(@INSTALL@) -D|\1|; s|(CFLAGS) =|\1 +=|' \
 		${WRKSRC}/make/makefile.unx
 
 post-install:
+	cd ${PREFIX}/lib && ${LN} -sf libagl.so.${SHLIB_VER} libagl.so
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examp/* ${EXAMPLESDIR}
-	@${PERL} -pi -e 's|%%CC%%|${CC}|g; \
-			 s|%%RM%%|${RM}|g; \
-			 s|%%CFLAGS%%|${CFLAGS}|g; \
-			 s|%%PREFIX%%|${PREFIX}|g; \
-			 s|%%X11BASE%%|${X11BASE}|g; \
-			 s|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \
-		<${PATCHDIR}/makefile.ex >${EXAMPLESDIR}/makefile
+	@${SED} -e \
+		's|%%CC%%|${CC}|g; \
+		 s|%%RM%%|${RM}|g; \
+		 s|%%CFLAGS%%|${CFLAGS}|g; \
+		 s|%%PREFIX%%|${PREFIX}|g; \
+		 s|%%X11BASE%%|${X11BASE}|g; \
+		 s|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \
+		 < ${FILESDIR}/makefile.ex > ${EXAMPLESDIR}/makefile
 
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/allegrogl/distinfo b/graphics/allegrogl/distinfo
index ed2dede7a479..1c10e023e95a 100644
--- a/graphics/allegrogl/distinfo
+++ b/graphics/allegrogl/distinfo
@@ -1,3 +1,3 @@
-MD5 (alleggl-0.2.4.tar.bz2) = c73127de9bb118f45f4f7d29de739eae
-SHA256 (alleggl-0.2.4.tar.bz2) = a93bc71ace51088df37a3f637b80db462355b352b93eecaffa7d71f96a1de052
-SIZE (alleggl-0.2.4.tar.bz2) = 312692
+MD5 (alleggl-0.4.0_rc4.tar.bz2) = 0cbe43f8fa2488a7e7d6e9807e5f0100
+SHA256 (alleggl-0.4.0_rc4.tar.bz2) = 8f6bdc6afbd3760b1b22a7e1e55783b9f05bd94ce5e07fae8ddcf2e5441636b5
+SIZE (alleggl-0.4.0_rc4.tar.bz2) = 580424
diff --git a/graphics/allegrogl/files/makefile.ex b/graphics/allegrogl/files/makefile.ex
index d57b505d15ad..0c32c4be6287 100644
--- a/graphics/allegrogl/files/makefile.ex
+++ b/graphics/allegrogl/files/makefile.ex
@@ -1,10 +1,10 @@
 CC=		%%CC%%
 RM=		%%RM%%
-CFLAGS=		%%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/
+CFLAGS=		%%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include
 LDFLAGS=	-L%%X11BASE%%/lib -L%%PREFIX%%/lib -lagl -lGL -lGLU
 
-ALLEGRO_CFLAGS!=%%ALLEGRO_CONFIG%% --cflags
-ALLEGRO_LFLAGS!=%%ALLEGRO_CONFIG%% --libs
+ALLEGRO_CFLAGS!=allegro-config --cflags
+ALLEGRO_LFLAGS!=allegro-config --libs
 CFLAGS+=	${ALLEGRO_CFLAGS}
 LDFLAGS+=	${ALLEGRO_LFLAGS}
 
@@ -37,6 +37,9 @@ exgui: exgui.o
 exmasked: exmasked.o
 	${CC} $> -o $@ ${LDFLAGS}
 
+exmipmaps: exmipmaps.o
+	${CC} $> -o $@ ${LDFLAGS}
+
 extext: extext.o
 	${CC} $> -o $@ ${LDFLAGS}
 
diff --git a/graphics/allegrogl/files/patch-configure.in b/graphics/allegrogl/files/patch-configure.in
deleted file mode 100644
index 7b6358d76661..000000000000
--- a/graphics/allegrogl/files/patch-configure.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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)
--AC_CHECK_LIB(pthread, pthread_create, LIBS="-lpthread $LIBS")
-+AC_CHECK_LIB(pthread, pthread_create, LIBS="%%PTHREAD_LIBS%% $LIBS")
- 
- 
- dnl Build Mesa generic driver
-@@ -171,14 +171,14 @@
- dnl the Mesa generic driver and the (hopefully) accelerated one
- if test -f makefile; then
- 	echo '# Remove older build'
--	make veryclean
-+	%%GMAKE%% veryclean
- 	agl_make_depend="yes";
- fi
- 
- 
- dnl If dependencies are not built yet then do it !
- if (test ! -f make/makefile.dep); then
--	echo '# Execute "make depend".' > make/makefile.dep
-+	echo '# Execute "%%GMAKE%% depend".' > make/makefile.dep
- 	agl_make_depend="yes";
- fi
- 
-@@ -189,5 +189,5 @@
- 
- dnl Run "make depend" if necessary
- if test -n "$agl_make_depend"; then
--	make depend
-+	%%GMAKE%% depend
- fi
diff --git a/graphics/allegrogl/files/patch-make-makefile.unx b/graphics/allegrogl/files/patch-make-makefile.unx
deleted file mode 100644
index f1117dbfaffb..000000000000
--- a/graphics/allegrogl/files/patch-make-makefile.unx
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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
--	CFLAGS = -g -W -Wall -Wno-unused
-+	CFLAGS += -g -W -Wall -Wno-unused
- 	CFLAGS += -DDEBUGMODE=$(DEBUGMODE)
- 	ifdef LOGLEVEL
- 		CFLAGS += -DLOGLEVEL=$(LOGLEVEL)
- 	endif
- else
--	CFLAGS = -O2 -Wall -ffast-math -fomit-frame-pointer
-+	CFLAGS += -O2 -Wall -ffast-math -fomit-frame-pointer
- endif
- 
- ifdef SHARED
-@@ -65,9 +65,9 @@
- endif
- 
- ifdef DEBUGALLEG
--	LDLIBS += `allegro-config --libs debug` $(LIBS)
-+	LDLIBS += `%%ALLEGRO_CONFIG%% --libs debug` $(LIBS)
- else
--	LDLIBS += `allegro-config --libs` $(LIBS)
-+	LDLIBS += `%%ALLEGRO_CONFIG%% --libs` $(LIBS)
- endif
- 
- ifdef MESABUILD
diff --git a/graphics/allegrogl/pkg-plist b/graphics/allegrogl/pkg-plist
index ee42f004f9e6..c4ffd4e76c42 100644
--- a/graphics/allegrogl/pkg-plist
+++ b/graphics/allegrogl/pkg-plist
@@ -13,6 +13,7 @@ include/allegrogl/GLext/glx_ext_list.h
 @dirrm include/allegrogl/GLext
 @dirrm include/allegrogl
 lib/libagl.so
+lib/libagl.so.%%SHLIB_VER%%
 %%EXAMPLESDIR%%/demofont.dat
 %%EXAMPLESDIR%%/dialog.c
 %%EXAMPLESDIR%%/dumbtest.c
@@ -22,6 +23,7 @@ lib/libagl.so
 %%EXAMPLESDIR%%/exext.c
 %%EXAMPLESDIR%%/exgui.c
 %%EXAMPLESDIR%%/exmasked.c
+%%EXAMPLESDIR%%/exmipmaps.c
 %%EXAMPLESDIR%%/extext.c
 %%EXAMPLESDIR%%/extextur.c
 %%EXAMPLESDIR%%/lucidia.dat