svn commit: r335582 - in head/games/supertuxkart: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Dec  3 17:16:36 2013
New Revision: 335582
URL: http://svnweb.freebsd.org/changeset/ports/335582

Log:
  - Update to 0.8.1

Added:
  head/games/supertuxkart/files/patch-cmake-FindFribidi.cmake   (contents, props changed)
Deleted:
  head/games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile
  head/games/supertuxkart/files/patch-src-utils-random__generator.hpp
Modified:
  head/games/supertuxkart/Makefile
  head/games/supertuxkart/distinfo
  head/games/supertuxkart/pkg-plist

Modified: head/games/supertuxkart/Makefile
==============================================================================
--- head/games/supertuxkart/Makefile	Tue Dec  3 17:13:50 2013	(r335581)
+++ head/games/supertuxkart/Makefile	Tue Dec  3 17:16:36 2013	(r335582)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	supertuxkart
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 CATEGORIES=	games
 MASTER_SITES=	SF/supertuxkart/SuperTuxKart/${PORTVERSION}
 EXTRACT_SUFX=	-src.tar.bz2
@@ -15,10 +14,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libogg.so:${PORTSDIR}/audio/libogg \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	yes
 USE_GL=		gl glu glut
@@ -26,29 +22,30 @@ USE_OPENAL=	al alut
 USES=		cmake gettext gmake pkgconfig
 USE_SDL=	sdl
 USE_DOS2UNIX=	lib/irrlicht/source/Irrlicht/Makefile
+CMAKE_ARGS=	-DUSE_WIIUSE=NO
 
 WRKSRC=		${WRKDIR}/SuperTuxKart-${PORTVERSION}
 
 PORTDATA=	*
 
-IRR_CPPFLAGS=	-DNO_IRR_USE_NON_SYSTEM_JPEG_LIB_ \
-		-DNO_IRR_USE_NON_SYSTEM_LIB_PNG_ \
-		-DNO_IRR_USE_NON_SYSTEM_ZLIB_ \
-		-DNO_IRR_COMPILE_WITH_BZIP2_ \
-		-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+CXXFLAGS+=	-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_ \
+		-D__FREE_BSD_
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|libIrrlicht.a|& -L${LOCALBASE}/lib -lpng -ljpeg|' ${WRKSRC}/CMakeLists.txt
+OPTIONS_DEFINE=	FRIBIDI
+OPTIONS_DEFAULT=FRIBIDI
 
-pre-build:
-	cd ${WRKSRC}/lib/irrlicht/source/Irrlicht/ && \
-		${SETENV} ${MAKE_ENV} CPPFLAGS="${CPPFLAGS} ${IRR_CPPFLAGS}" \
-		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS}
+FRIBIDI_CMAKE_ON=	-DUSE_FRIBIDI=YES
+FRIBIDI_CMAKE_OFF=	-DUSE_FRIBIDI=NO
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "powerpc"
 BROKEN=		Does not configure on powerpc
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/X11R6/include|${LOCALBASE}/include|' \
+		${WRKSRC}/lib/irrlicht/CMakeLists.txt
+
+.include <bsd.port.mk>

Modified: head/games/supertuxkart/distinfo
==============================================================================
--- head/games/supertuxkart/distinfo	Tue Dec  3 17:13:50 2013	(r335581)
+++ head/games/supertuxkart/distinfo	Tue Dec  3 17:16:36 2013	(r335582)
@@ -1,2 +1,2 @@
-SHA256 (supertuxkart-0.8-src.tar.bz2) = b99f3d2311457a34db3c42ba2195662f2993a48eae4f6b1f175dbcce09ad4b8b
-SIZE (supertuxkart-0.8-src.tar.bz2) = 171184279
+SHA256 (supertuxkart-0.8.1-src.tar.bz2) = 335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6
+SIZE (supertuxkart-0.8.1-src.tar.bz2) = 229944480

Added: head/games/supertuxkart/files/patch-cmake-FindFribidi.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/supertuxkart/files/patch-cmake-FindFribidi.cmake	Tue Dec  3 17:16:36 2013	(r335582)
@@ -0,0 +1,19 @@
+--- cmake/FindFribidi.cmake.orig	2013-03-13 08:03:26.000000000 +0400
++++ cmake/FindFribidi.cmake	2013-11-28 09:33:04.134268507 +0400
+@@ -18,7 +18,15 @@
+     set(FRIBIDI_FOUND 1)
+ elseif(UNIX)
+     include(FindPkgConfig)
+-    pkg_check_modules(FRIBIDI fribidi)
++    pkg_check_modules(PC_FRIBIDI fribidi)
++    find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h HINTS ${PC_FRIBIDI_INCLUDE_DIRS})
++    find_library(FRIBIDI_LIBRARY NAMES fribidi HINTS ${PC_FRIBIDI_LIBRARY_DIRS})
++
++    include(FindPackageHandleStandardArgs)
++    find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
++
++    set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
++    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
+ else()
+     set(FRIBIDI_FOUND 0)
+ endif()

Modified: head/games/supertuxkart/pkg-plist
==============================================================================
--- head/games/supertuxkart/pkg-plist	Tue Dec  3 17:13:50 2013	(r335581)
+++ head/games/supertuxkart/pkg-plist	Tue Dec  3 17:16:36 2013	(r335582)
@@ -1,4 +1,4 @@
 bin/supertuxkart
 share/applications/supertuxkart.desktop
-share/pixmaps/supertuxkart_32.xpm
-share/pixmaps/supertuxkart_64.xpm
+share/pixmaps/supertuxkart_128.png
+share/pixmaps/supertuxkart_32.png