fix DevIL support and other things

bump PORTREVISION

PR:		120178
Submitted by:	Dmitry Marakasov <amdmi3@amdmi3.ru>

2 files changed, 38 insertions, 27 deletions

diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 64d2e29fe251..ebc09092e353 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	cegui
 PORTVERSION=	0.5.0b
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=crayzedsgui
 DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
@@ -20,16 +20,25 @@ LIB_DEPENDS=	IL.1:${PORTSDIR}/graphics/devil \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/0b/0/}
-CONFIGURE_ARGS=	--without-xerces-c --enable-toluacegui
-CONFIGURE_ENV+=	Lua_LIBS="-L${PREFIX}/lib/lua50 -llua -llualib -lm" \
-		Lua_CFLAGS="-I${PREFIX}/include/lua50"
-GNU_CONFIGURE=	YES
-INSTALLS_SHLIB=	YES
-USE_GL=		YES
+CONFIGURE_ARGS=	--enable-toluacegui --disable-irrlicht-renderer \
+		--disable-corona --enable-devil --disable-freeimage --disable-silly \
+		--disable-libxml --disable-xerces-c --disable-expat
+
+CONFIGURE_ENV+=	Lua_LIBS="-L${LOCALBASE}/lib/lua50 -llua -llualib -lm" \
+		Lua_CFLAGS="-I${LOCALBASE}/include/lua50" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/lua50" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/lua50"
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_GL=		yes
 USE_LUA=	5.0
-USE_XLIB=	YES
+USE_XLIB=	yes
 USE_GNOME=	gnomehack
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README COPYING AUTHORS ChangeLog TODO
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e ' \
 		s|"-lILU.*"|"-lm -L${LOCALBASE}/lib -lILU -lIL $$LIBS"|g; \
@@ -45,11 +54,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|INCLUDES = |&-I${LOCALBASE}/include/lua50 |' \
 		${WRKSRC}/ScriptingModules/CEGUILua/tolua++bin/Makefile.in \
 		${WRKSRC}/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|ILvoid|void|g' \
+		${WRKSRC}/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docfile in README COPYING AUTHORS ChangeLog TODO
+.for docfile in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 .endif
diff --git a/graphics/cegui/pkg-plist b/graphics/cegui/pkg-plist
index 1536009a2e1d..a804c91d45bd 100644
--- a/graphics/cegui/pkg-plist
+++ b/graphics/cegui/pkg-plist
@@ -1,4 +1,5 @@
 bin/tolua++cegui
+include/CEGUI/CEGUI.h
 include/CEGUI/CEGUIBase.h
 include/CEGUI/CEGUIBoundSlot.h
 include/CEGUI/CEGUIColourRect.h
@@ -76,7 +77,8 @@ include/CEGUI/CEGUIXMLHandler.h
 include/CEGUI/CEGUIXMLParser.h
 include/CEGUI/CEGUIXMLSerializer.h
 include/CEGUI/CEGUIcolour.h
-include/CEGUI/CEGUI.h
+include/CEGUI/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.h
+include/CEGUI/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodecModule.h
 include/CEGUI/ImageCodecModules/TGAImageCodec/CEGUITGAImageCodec.h
 include/CEGUI/ImageCodecModules/TGAImageCodec/CEGUITGAImageCodecModule.h
 include/CEGUI/RendererModules/OpenGLGUIRenderer/openglrenderer.h
@@ -171,9 +173,15 @@ include/CEGUI/tolua++.h
 lib/libCEGUIBase.la
 lib/libCEGUIBase.so
 lib/libCEGUIBase.so.1
+lib/libCEGUIDevILImageCodec.la
+lib/libCEGUIDevILImageCodec.so
+lib/libCEGUIDevILImageCodec.so.0
 lib/libCEGUIFalagardWRBase.la
 lib/libCEGUIFalagardWRBase.so
 lib/libCEGUIFalagardWRBase.so.1
+lib/libCEGUILuaScriptModule.la
+lib/libCEGUILuaScriptModule.so
+lib/libCEGUILuaScriptModule.so.1
 lib/libCEGUIOpenGLRenderer.la
 lib/libCEGUIOpenGLRenderer.so
 lib/libCEGUIOpenGLRenderer.so.0
@@ -184,25 +192,17 @@ lib/libCEGUITinyXMLParser.la
 lib/libCEGUITinyXMLParser.so
 lib/libCEGUITinyXMLParser.so.0
 lib/libCEGUItoluapp.la
-lib/libCEGUItoluapp.so 
+lib/libCEGUItoluapp.so
 lib/libCEGUItoluapp.so.1
-lib/libCEGUILuaScriptModule.la
-lib/libCEGUILuaScriptModule.so
-lib/libCEGUILuaScriptModule.so.1
 libdata/pkgconfig/CEGUI-OPENGL.pc
 libdata/pkgconfig/CEGUI.pc
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm include/CEGUI/ImageCodecModules/TGAImageCodec
-@dirrm include/CEGUI/ImageCodecModules
-@dirrm include/CEGUI/RendererModules/OpenGLGUIRenderer
-@dirrm include/CEGUI/RendererModules
+@dirrm include/CEGUI/falagard
+@dirrm include/CEGUI/elements
 @dirrm include/CEGUI/XMLParserModules/TinyXMLParser
 @dirrm include/CEGUI/XMLParserModules
-@dirrm include/CEGUI/elements
-@dirrm include/CEGUI/falagard
+@dirrm include/CEGUI/RendererModules/OpenGLGUIRenderer
+@dirrm include/CEGUI/RendererModules
+@dirrm include/CEGUI/ImageCodecModules/TGAImageCodec
+@dirrm include/CEGUI/ImageCodecModules/DevILImageCodec
+@dirrm include/CEGUI/ImageCodecModules
 @dirrm include/CEGUI
-%%PORTDOCS%%@dirrm %%DOCSDIR%%