- Update to 0.8

svn path=/head/; revision=309567

games/supertuxkart/Makefile

@@ -1,13 +1,8 @@
-# New ports collection makefile for:	supertuxkart
-# Date created:		21 Mar 2008
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	supertuxkart
-PORTVERSION=	0.7
-PORTREVISION=	4
+PORTVERSION=	0.8
 CATEGORIES=	games
 MASTER_SITES=	SF/supertuxkart/SuperTuxKart/${PORTVERSION}
 EXTRACT_SUFX=	-src.tar.bz2
@@ -15,42 +10,43 @@ EXTRACT_SUFX=	-src.tar.bz2
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free 3D kart racing game
 
-LIB_DEPENDS=	vorbisfile.6:${PORTSDIR}/audio/libvorbis \
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	vorbisfile:${PORTSDIR}/audio/libvorbis \
 		ogg:${PORTSDIR}/audio/libogg \
-		fribidi.3:${PORTSDIR}/converters/fribidi
-BUILD_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
-RUN_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+		fribidi:${PORTSDIR}/converters/fribidi \
+		curl:${PORTSDIR}/ftp/curl \
+		jpeg.11:${PORTSDIR}/graphics/jpeg \
+		png15:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_GL=		gl glu glut
 USE_OPENAL=	al alut
+USE_CMAKE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_SDL=	sdl
 USE_GETTEXT=	yes
+USE_DOS2UNIX=	lib/irrlicht/source/Irrlicht/Makefile
 MAKE_JOBS_SAFE=	yes
 
+WRKSRC=		${WRKDIR}/SuperTuxKart-${PORTVERSION}
+
 PORTDOCS=	*
 
-# Using LIBS instead of LDFLAGS, otherwise will break when
-# there's devel/bullet port installed
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--with-irrlicht="${LOCALBASE}"
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+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_
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(datadir)/games|$$(datadir)|g; \
-		 s|$$(prefix)/games|$$(prefix)/bin|g'
-	@${REINPLACE_CMD} -e 's|PREFIX/games|PREFIX/bin|' \
-		${WRKSRC}/data/supertuxkart_desktop.template
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_pkgdataDATA||' \
-		${WRKSRC}/Makefile.in
-.endif
+	@${REINPLACE_CMD} -e 's|libIrrlicht.a|& -L${LOCALBASE}/lib -lpng -ljpeg|' ${WRKSRC}/CMakeLists.txt
+
+pre-build:
+	cd ${WRKSRC}/lib/irrlicht/source/Irrlicht/ && \
+		${SETENV} ${MAKE_ENV} CPPFLAGS="${CPPFLAGS} ${IRR_CPPFLAGS}" \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS}
 
 .include <bsd.port.pre.mk>
 

games/supertuxkart/distinfo

@@ -1,2 +1,2 @@
-SHA256 (supertuxkart-0.7-src.tar.bz2) = 18543c4b0c48c4952efe076cf9cdb13bdfc381bc2f249eb9b41b611970350006
-SIZE (supertuxkart-0.7-src.tar.bz2) = 110770427
+SHA256 (supertuxkart-0.8-src.tar.bz2) = b99f3d2311457a34db3c42ba2195662f2993a48eae4f6b1f175dbcce09ad4b8b
+SIZE (supertuxkart-0.8-src.tar.bz2) = 171184279

games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile

@@ -0,0 +1,35 @@
+--- 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