Move allegro-devel to allegro; 4.4 is hardly a devel version any more.

Minor fix required in emulators/o2em.

Remove allegrogl, which is broken and included in allegro-4.4 anyway.

Update allegro-devel to 5.0.7 [1]

PR:		ports/172981 [1]
Submitted by:	nemysis <nemysis@gmx.ch> [1]

8 files changed, 1 insertions, 283 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 5d2ac5ad7aaf..c9c841dbf359 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -38,7 +38,6 @@
     SUBDIR += agave
     SUBDIR += agg
     SUBDIR += albumshaper
-    SUBDIR += allegrogl
     SUBDIR += alpng
     SUBDIR += amanith
     SUBDIR += amide
diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile
deleted file mode 100644
index bcf8b7b4a0fa..000000000000
--- a/graphics/allegrogl/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Created by: Igor Pokrovsky <tiamat@comset.net>
-# $FreeBSD$
-
-PORTNAME=	allegrogl
-PORTVERSION=	0.4.3
-CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/AllegroGL%20source/${PORTVERSION}
-DISTNAME=	alleggl-${PORTVERSION}
-
-MAINTAINER=	crees@FreeBSD.org
-COMMENT=	OpenGL interface for Allegro library
-
-LIB_DEPENDS=	alleg.42:${PORTSDIR}/devel/allegro
-
-CONFLICTS=	allegro-devel-[0-9]*
-
-BROKEN=		Does not build.  Use allegro-devel if you need this functionality
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GL=		glu
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-MAKEFILE=	makefile
-ALL_TARGET=	lib
-WRKSRC=		${WRKDIR}/alleggl
-
-post-extract:
-	@${RM} ${WRKSRC}/gpl.txt
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^[[:blank:]]make |${GMAKE} |' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examp/* ${EXAMPLESDIR}
-	@${SED} -e \
-		's|%%CC%%|${CC}|g; \
-		 s|%%RM%%|${RM}|g; \
-		 s|%%CFLAGS%%|${CFLAGS}|g; \
-		 s|%%PREFIX%%|${PREFIX}|g; \
-		 s|%%LOCALBASE%%|${LOCALBASE}|g; \
-		 s|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \
-		 < ${FILESDIR}/makefile.ex > ${EXAMPLESDIR}/makefile
-
-.ifndef (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/graphics/allegrogl/distinfo b/graphics/allegrogl/distinfo
deleted file mode 100644
index db548f762906..000000000000
--- a/graphics/allegrogl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (alleggl-0.4.3.tar.bz2) = 5409c4db81fcf5efed60bb280d5d15431361caf0dcede4a48167f0f0d48e7734
-SIZE (alleggl-0.4.3.tar.bz2) = 767377
diff --git a/graphics/allegrogl/files/makefile.ex b/graphics/allegrogl/files/makefile.ex
deleted file mode 100644
index 9880ad6e7962..000000000000
--- a/graphics/allegrogl/files/makefile.ex
+++ /dev/null
@@ -1,60 +0,0 @@
-CC=		%%CC%%
-RM=		%%RM%%
-CFLAGS=		%%CFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include
-LDFLAGS=	-L%%LOCALBASE%%/lib -L%%PREFIX%%/lib -lagl -lGL -lGLU
-
-ALLEGRO_CFLAGS!=allegro-config --cflags
-ALLEGRO_LFLAGS!=allegro-config --libs
-CFLAGS+=	${ALLEGRO_CFLAGS}
-LDFLAGS+=	${ALLEGRO_LFLAGS}
-
-TARGETS= dialog dumbtest exalleg exalpfnt excamera exext exgui exmasked \
-		extext extextur test tex
-
-all: ${TARGETS}
-
-dialog: dialog.o
-	${CC} $> -o $@ ${LDFLAGS}	
-
-dumbtest: dumbtest.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-exalleg: exalleg.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-exalpfnt: exalpfnt.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-excamera: excamera.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-exext: exext.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-exgui: exgui.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-exmasked: exmasked.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-exmipmaps: exmipmaps.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-extext: extext.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-extextur: extextur.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-test: test.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-tex: tex.o
-	${CC} $> -o $@ ${LDFLAGS}
-
-
-.c.o:
-	${CC} -c ${CFLAGS} $*.c
-
-clean:
-	${RM} -f *.o ${TARGETS}
diff --git a/graphics/allegrogl/files/patch-make-makefiles b/graphics/allegrogl/files/patch-make-makefiles
deleted file mode 100644
index 62d2777b3641..000000000000
--- a/graphics/allegrogl/files/patch-make-makefiles
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ruN allegrogl/work/alleggl/make/makefile.all make/makefile.all
---- allegrogl/work/alleggl/make/makefile.all	2007-01-06 20:39:09.000000000 +0000
-+++ make/makefile.all	2011-04-07 15:30:09.579220344 +0100
-@@ -31,10 +31,6 @@
- 	- rm -rf docs/rtf
- else
- 	- del $(LIB_PATH_D)
--   define RM_EXAMPLES
--      $(foreach file, $(wildcard $(subst /,\,$(EXAMPLES))), - del $(file)
--      )
--   endef
- 	- $(RM_EXAMPLES)
- 	- @echo Y|del docs\html\*.*
- 	- rd docs\html
-@@ -47,7 +43,6 @@
-   PROG_INSTALLER=cp
- endif
- 
--install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
- ifdef UNIX_TOOLS
-    define CP_INSTALL
-       $(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
-@@ -59,6 +54,7 @@
-       $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
-       )
-    endef
-+install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
-       ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),)
- 	mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl
-       endif
-@@ -87,33 +83,6 @@
- 	@echo -
- 	@echo AllegroGL is now installed.
- 
--uninstall:
--ifdef UNIX_TOOLS
--   define RM_UNINSTALL
--      $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
--      )
--      $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
--      )
--      $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
--      )
--   endef
--	- rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U))
--	- $(RM_UNINSTALL)
--	- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext
--	- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl
--else
--   define RM_UNINSTALL
--      $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
--      )
--      $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
--      )
--   endef
--	- $(RM_UNINSTALL)
--	- rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl
--	- del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U))
--endif
--	@echo -
--	@echo AllegroGL is uninstalled.
- 
- $(EXT_HEADERS_PATH_U)/gl_ext_alias.h: $(EXT_HEADERS_PATH_U)/gl_ext_api.h
- ifdef UNIX_TOOLS
-diff -ruN allegrogl/work/alleggl/make/makefile.unx make/makefile.unx
---- allegrogl/work/alleggl/make/makefile.unx	2007-11-10 19:33:06.000000000 +0000
-+++ make/makefile.unx	2011-04-07 15:31:41.631562520 +0100
-@@ -28,8 +28,8 @@
- # Programs
- CC = @CC@
- CXX = @CXX@
--DATA_INSTALLER = @INSTALL@ @INSTALL_DATA@ -D
--PROG_INSTALLER = @INSTALL@ @INSTALL_PROGRAM@ -D
-+DATA_INSTALLER = @INSTALL_DATA@
-+PROG_INSTALLER = @INSTALL_PROGRAM@
- 
- 
- # Where to install the library and header file
-@@ -67,13 +67,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
-@@ -149,11 +149,11 @@
- 
- include make/makefile.dep
- 
--$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
-    define MAKE_LINKS
- 	$(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link)
- 	)
-    endef
-+$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
- 	$(LIB_BUILDER) $@ $^
- 	- $(MAKE_LINKS)
- 
diff --git a/graphics/allegrogl/pkg-descr b/graphics/allegrogl/pkg-descr
deleted file mode 100644
index d5cfcb933fad..000000000000
--- a/graphics/allegrogl/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The library mostly provides functions to allow you to use OpenGL alongside
-Allegro -- you use OpenGL for your rendering to the screen, and Allegro
-for miscellaneous tasks like gathering input, doing timers, getting
-cross-platform portability, loading data, playing samples and drawing your
-textures. So this library fills the same hole that things like GLUT do.
-
-WWW:	http://allegrogl.sourceforge.net/
diff --git a/graphics/allegrogl/pkg-plist b/graphics/allegrogl/pkg-plist
deleted file mode 100644
index db7e1f85c165..000000000000
--- a/graphics/allegrogl/pkg-plist
+++ /dev/null
@@ -1,53 +0,0 @@
-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
-@dirrm include/allegrogl/GLext
-@dirrm include/allegrogl
-lib/libagl.so
-lib/libagl.so.0
-lib/libagl.so.0.4
-lib/libagl.so.0.4.3
-%%EXAMPLESDIR%%/a1.bmp
-%%EXAMPLESDIR%%/a24.tga
-%%EXAMPLESDIR%%/a32.tga
-%%EXAMPLESDIR%%/a8.bmp
-%%EXAMPLESDIR%%/fonttest.c
-%%EXAMPLESDIR%%/demofont.dat
-%%EXAMPLESDIR%%/dialog.c
-%%EXAMPLESDIR%%/dumbtest.c
-%%EXAMPLESDIR%%/exalleg.c
-%%EXAMPLESDIR%%/exalpfnt.c
-%%EXAMPLESDIR%%/exblend.c
-%%EXAMPLESDIR%%/excamera.c
-%%EXAMPLESDIR%%/exext.c
-%%EXAMPLESDIR%%/exgui.c
-%%EXAMPLESDIR%%/exmasked.c
-%%EXAMPLESDIR%%/exmipmaps.c
-%%EXAMPLESDIR%%/extext.c
-%%EXAMPLESDIR%%/extextur.c
-%%EXAMPLESDIR%%/lucidia.dat
-%%EXAMPLESDIR%%/makefile
-%%EXAMPLESDIR%%/mysha.pcx
-%%EXAMPLESDIR%%/running.dat
-%%EXAMPLESDIR%%/running.h
-%%EXAMPLESDIR%%/test.c
-%%EXAMPLESDIR%%/tex.c
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/bugs.txt
-%%PORTDOCS%%%%DOCSDIR%%/extensions.txt
-%%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/quickstart.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/todo.txt
-%%PORTDOCS%%%%DOCSDIR%%/zlib.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/graphics/alpng/Makefile b/graphics/alpng/Makefile
index ca80f98378e0..be40b14ce293 100644
--- a/graphics/alpng/Makefile
+++ b/graphics/alpng/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}13
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Library for display PNG images in programs
 
-LIB_DEPENDS+=	alleg.42:${PORTSDIR}/devel/allegro
+LIB_DEPENDS+=	alleg:${PORTSDIR}/devel/allegro
 
 HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}