- Update to 0.5-0

3 files changed, 13 insertions, 62 deletions

diff --git a/games/love/Makefile b/games/love/Makefile
index 8c03eb30e3d2..1116e2cc5b50 100644
--- a/games/love/Makefile
+++ b/games/love/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	love
-DISTVERSION=	0.4-0
+DISTVERSION=	0.5-0
 CATEGORIES=	games devel
 MASTER_SITES=	SF
 
@@ -23,32 +23,24 @@ USE_GMAKE=	yes
 USE_SDL=	sdl mixer
 USE_GL=		gl glu
 USE_LUA=	5.1+
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+		-I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}"
+CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --libdir=${PREFIX}/lib
 
-ALL_TARGET=	default
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/love lib/liblove.a
+PLIST_FILES=	bin/love
 
 PORTDOCS=	*
-PORTEXAMPLES=	*
-
-post-extract:
-	cd ${WRKSRC} && ${FIND} . -name "*.o" -delete
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|ILvoid|void|' ${WRKSRC}/src/opengl/Image.cpp \
 		${WRKSRC}/src/opengl/love_opengl.cpp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/love ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/bin/liblove.a ${PREFIX}/lib
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/demos/*.love ${EXAMPLESDIR}
-.endif
+	@${REINPLACE_CMD} -e '/^prefix=/ d; /^bindir=/ d; /^libdir=/ d' \
+		${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
+post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in changes.txt readme.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/games/love/distinfo b/games/love/distinfo
index 99a43ff681e0..932e8c97a77c 100644
--- a/games/love/distinfo
+++ b/games/love/distinfo
@@ -1,3 +1,3 @@
-MD5 (love-0.4-0.tar.bz2) = b77ed79c7d2aedc0e7c79c8631db0681
-SHA256 (love-0.4-0.tar.bz2) = 287f0f16ac419fd2339ed5c0eef9123745c3ef9424086a3365b3d2468969156d
-SIZE (love-0.4-0.tar.bz2) = 846487
+MD5 (love-0.5-0.tar.bz2) = 7b11e8409238ea46d7255d6b02b8d02e
+SHA256 (love-0.5-0.tar.bz2) = 0f325fb92f032d089b6b77e1d1410e227631cac9b7c902869ab88441ba2c826b
+SIZE (love-0.5-0.tar.bz2) = 739252
diff --git a/games/love/files/patch-Makefile b/games/love/files/patch-Makefile
deleted file mode 100644
index f7243aaff534..000000000000
--- a/games/love/files/patch-Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.orig	2008-08-29 03:42:40.000000000 +0400
-+++ Makefile	2008-08-29 18:09:43.000000000 +0400
-@@ -3,20 +3,19 @@
- # You may need to modify parts of this makefile for your system.
- ######################################################################
- 
--CC = g++
--CFLAGS = -g0 -O3 -Wall
--CFLAGS_MOD = -g0 -O3
-+CFLAGS += -Wall
-+CFLAGS_MOD = $(CFLAGS)
- BINDIR = bin
- 
- # Inclusion paths.
--INCLUDE_SDL = -I/usr/include/SDL
--INCLUDE_LUA = -I/usr/include/lua5.1
-+INCLUDE_SDL = `$(SDL_CONFIG) --cflags`
-+INCLUDE_LUA = -I$(LOCALBASE)/include/lua51
- INCLUDE_LIBLOVE = -Isrc/liblove/include
--INCLUDE_FREETYPE = -I/usr/include/freetype2
-+INCLUDE_FREETYPE = -I$(LOCALBASE)/include/freetype2
- 
- # Linker flags.
--LD_LUA = -llua5.1
--LD_SDL = -lSDL
-+LD_LUA = -L$(LOCALBASE)/lib/lua51 -llua
-+LD_SDL = `$(SDL_CONFIG) --libs`
- LD_PHYSFS = -lphysfs
- LD_FREETYPE = -lfreetype
- LD_GL = -lGL -lGLU
-@@ -27,8 +26,8 @@
- 
- default: prep $(BINDIR)/liblove.a love
- 
--INCLUDE_COMMON = $(INCLUDE_LUA) $(INCLUDE_SDL) $(INCLUDE_LIBLOVE)
--LD_COMMON = $(LD_LUA) $(LD_SDL)
-+INCLUDE_COMMON = -I$(LOCALBASE)/include $(INCLUDE_LUA) $(INCLUDE_SDL) $(INCLUDE_LIBLOVE)
-+LD_COMMON = -L$(LOCALBASE)/lib $(LD_LUA) $(LD_SDL)
- 
- #
- # liblove