- Update to 0.8.1

6 files changed, 39 insertions, 68 deletions

diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 7c47eb6f7c06..f4d6d59ed728 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -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>
diff --git a/games/supertuxkart/distinfo b/games/supertuxkart/distinfo
index 11aec56a31ad..e4bf309d486c 100644
--- a/games/supertuxkart/distinfo
+++ b/games/supertuxkart/distinfo
@@ -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
diff --git a/games/supertuxkart/files/patch-cmake-FindFribidi.cmake b/games/supertuxkart/files/patch-cmake-FindFribidi.cmake
new file mode 100644
index 000000000000..46b2cbaf9122
--- /dev/null
+++ b/games/supertuxkart/files/patch-cmake-FindFribidi.cmake
@@ -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()
diff --git a/games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile b/games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile
deleted file mode 100644
index 44820f01edf0..000000000000
--- a/games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- lib/irrlicht/source/Irrlicht/Makefile.orig	2012-11-02 05:34:43.000000000 +0400
-+++ lib/irrlicht/source/Irrlicht/Makefile	2012-12-24 23:41:14.396517819 +0400
-@@ -56,12 +56,11 @@
- EXTRAOBJ =
- LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
- 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
--	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
--	$(BZIP2OBJ) $(EXTRAOBJ)
-+	$(IRRGUIOBJ) $(LIBAESGM) $(BZIP2OBJ) $(EXTRAOBJ)
- 
- ###############
- #Compiler flags
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-+CXXINCS = -I../../include -I${LOCALBASE}/include
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
- CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
- ifndef NDEBUG
-@@ -72,7 +71,7 @@
- ifdef PROFILE
- CXXFLAGS += -pg
- endif
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-+CFLAGS += -O3 -fexpensive-optimizations
- 
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC
- sharedlib sharedlib_osx: CFLAGS += -fPIC
-@@ -89,7 +88,7 @@
- INSTALL_DIR = /usr/local/lib
- sharedlib install: SHARED_LIB = libIrrlicht.so
- sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
--staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
-+staticlib sharedlib: CXXINCS += -I${LOCALBASE}/include
- 
- #OSX specific options
- staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
diff --git a/games/supertuxkart/files/patch-src-utils-random__generator.hpp b/games/supertuxkart/files/patch-src-utils-random__generator.hpp
deleted file mode 100644
index 309fc9fee2a3..000000000000
--- a/games/supertuxkart/files/patch-src-utils-random__generator.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/utils/random_generator.hpp.orig	2011-12-06 22:43:36.000000000 +0400
-+++ src/utils/random_generator.hpp	2013-09-13 21:51:20.971227530 +0400
-@@ -21,6 +21,7 @@
- 
- #include <algorithm>
- #include <vector>
-+#include <cstdlib> // for rand()
- 
- /** A random number generator. Each objects that needs a random number uses
-     its own number random generator. They are all seeded with number provided
diff --git a/games/supertuxkart/pkg-plist b/games/supertuxkart/pkg-plist
index f38a9f3d6660..f2f571800396 100644
--- a/games/supertuxkart/pkg-plist
+++ b/games/supertuxkart/pkg-plist
@@ -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