svn commit: r333713 - in head: Mk graphics graphics/sdl2_gfx

[Marcus von Appen]

Author: mva
Date: Wed Nov 13 18:15:08 2013
New Revision: 333713
URL: http://svnweb.freebsd.org/changeset/ports/333713

Log:
  Version two of the SDL2_gfx library, compatible with SDL2.0.
  This also adds a new USE_SDL=gfx2 variable to add SDL2_gfx as
  LIB_DEPENDS other ports.
  
  The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided
  basic drawing routines such as lines, circles or polygons and SDL_rotozoom
  which implemented a interpolating rotozoomer for SDL surfaces.
  
  The current components of the SDL_gfx library are:
  
     - Graphic Primitives (SDL_gfxPrimitves.h)
     - Rotozoomer (SDL_rotozoom.h)
     - Framerate control (SDL_framerate.h)
     - MMX image filters (SDL_imageFilter.h)
  
  WWW: http://www.ferzkopp.net/Software/SDL_gfx-2.0/

Added:
  head/graphics/sdl2_gfx/
     - copied from r333478, head/graphics/sdl_gfx/
Modified:
  head/Mk/bsd.sdl.mk
  head/graphics/Makefile
  head/graphics/sdl2_gfx/Makefile
  head/graphics/sdl2_gfx/distinfo   (contents, props changed)
  head/graphics/sdl2_gfx/pkg-plist   (contents, props changed)

Modified: head/Mk/bsd.sdl.mk
==============================================================================
--- head/Mk/bsd.sdl.mk	Wed Nov 13 17:21:57 2013	(r333712)
+++ head/Mk/bsd.sdl.mk	Wed Nov 13 18:15:08 2013	(r333713)
@@ -41,7 +41,7 @@ _USE_SDL_ALL=	console gfx image mixer mm
 #
 # These are the current supported SDL2 modules
 #
-_USE_SDL_ALL+=	image2 mixer2 net2 sdl2 ttf2
+_USE_SDL_ALL+=	gfx2 image2 mixer2 net2 sdl2 ttf2
 
 #
 # Variables used to determine what is needed:
@@ -101,6 +101,11 @@ _PORTDIR_ttf=	sdl_ttf
 _LIB_ttf=	SDL_ttf-2.0
 _REQUIRES_ttf=	sdl
 
+_SUBDIR_gfx2=	graphics
+_PORTDIR_gfx2=	sdl2_gfx
+_LIB_gfx2=	SDL2_gfx
+_REQUIRES_gfx2=	sdl2
+
 _SUBDIR_image2=		graphics
 _PORTDIR_image2=	sdl2_image
 _LIB_image2=		SDL2_image

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Wed Nov 13 17:21:57 2013	(r333712)
+++ head/graphics/Makefile	Wed Nov 13 18:15:08 2013	(r333713)
@@ -948,6 +948,7 @@
     SUBDIR += scr2png
     SUBDIR += scrot
     SUBDIR += scwm-icons
+    SUBDIR += sdl2_gfx
     SUBDIR += sdl2_image
     SUBDIR += sdl2_ttf
     SUBDIR += sdl_gfx

Modified: head/graphics/sdl2_gfx/Makefile
==============================================================================
--- head/graphics/sdl_gfx/Makefile	Mon Nov 11 04:21:03 2013	(r333478)
+++ head/graphics/sdl2_gfx/Makefile	Wed Nov 13 18:15:08 2013	(r333713)
@@ -1,29 +1,26 @@
 # Created by: ijliao
 # $FreeBSD$
 
-PORTNAME=	sdl_gfx
-PORTVERSION=	2.0.24
+PORTNAME=	sdl2_gfx
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ferzkopp.net/Software/%SUBDIR%/
-MASTER_SITE_SUBDIR=	SDL_gfx-${PORTVERSION:R}
-DISTNAME=	SDL_gfx-${PORTVERSION}
+MASTER_SITE_SUBDIR=	SDL2_gfx
+DISTNAME=	SDL2_gfx-${PORTVERSION}
 
 MAINTAINER=	mva at FreeBSD.org
 COMMENT=	SDL graphics drawing primitives and other support functions
 
-USES=		pathfix
+LICENSE=	ZLIB
+
+USES=		pathfix gmake
 USE_AUTOTOOLS=	libtool
-USE_SDL=	sdl
-USE_GMAKE=	yes
+USE_SDL=	sdl2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include
-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE_i386=	MMX
+OPTIONS_DEFINE=	MMX
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMMX}

Modified: head/graphics/sdl2_gfx/distinfo
==============================================================================
--- head/graphics/sdl_gfx/distinfo	Mon Nov 11 04:21:03 2013	(r333478)
+++ head/graphics/sdl2_gfx/distinfo	Wed Nov 13 18:15:08 2013	(r333713)
@@ -1,2 +1,2 @@
-SHA256 (SDL_gfx-2.0.24.tar.gz) = 30ad38c3e17586e5212ce4a43955adf26463e69a24bb241f152493da28d59118
-SIZE (SDL_gfx-2.0.24.tar.gz) = 1767169
+SHA256 (SDL2_gfx-1.0.0.tar.gz) = 9843924d46eacbabba685a239cf2284b948766a20ef2caa48cb18462a3295caf
+SIZE (SDL2_gfx-1.0.0.tar.gz) = 1081660

Modified: head/graphics/sdl2_gfx/pkg-plist
==============================================================================
--- head/graphics/sdl_gfx/pkg-plist	Mon Nov 11 04:21:03 2013	(r333478)
+++ head/graphics/sdl2_gfx/pkg-plist	Wed Nov 13 18:15:08 2013	(r333713)
@@ -1,12 +1,9 @@
-include/SDL/SDL_framerate.h
-include/SDL/SDL_gfxBlitFunc.h
-include/SDL/SDL_gfxPrimitives.h
-include/SDL/SDL_gfxPrimitives_font.h
-include/SDL/SDL_imageFilter.h
-include/SDL/SDL_rotozoom.h
-lib/libSDL_gfx.a
-lib/libSDL_gfx.la
-lib/libSDL_gfx.so
-lib/libSDL_gfx.so.22
-libdata/pkgconfig/SDL_gfx.pc
- at dirrmtry include/SDL
+include/SDL2/SDL2_framerate.h
+include/SDL2/SDL2_gfxPrimitives.h
+include/SDL2/SDL2_imageFilter.h
+include/SDL2/SDL2_rotozoom.h
+lib/libSDL2_gfx-1.0.so
+lib/libSDL2_gfx-1.0.so.0
+lib/libSDL2_gfx.a
+lib/libSDL2_gfx.la
+lib/libSDL2_gfx.so