- Update to 1.4.1528

- Add LICENSE

5 files changed, 68 insertions, 46 deletions

diff --git a/games/goonies/Makefile b/games/goonies/Makefile
index 07f4a59b438..a29465c18b9 100644
--- a/games/goonies/Makefile
+++ b/games/goonies/Makefile
@@ -2,48 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	goonies
-PORTVERSION=	1.0.1
-PORTREVISION=	10
+PORTVERSION=	1.4.1528
 CATEGORIES=	games
-MASTER_SITES=	http://goonies.jorito.net/download/ \
+MASTER_SITES=	http://braingames.jorito.net/goonies/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
-DISTNAME=	${PORTNAME}_r${PORTVERSION:C/\./-/g}
+DISTNAME=	${PORTNAME}.src_${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Remake of the 8 bit classic game 'The Goonies'
 
-BROKEN_sparc64=	does not compile on sparc64
+LICENSE=	NONE
 
 USES=		gmake tar:tgz
 USE_SDL=	sdl mixer image
-USE_GL=		yes
+USE_GL=		gl glu
 
-BUILD_WRKSRC=	${WRKSRC}/src
-MAKEFILE=	../build/linux/Makefile
-MAKE_ARGS=	CC="${CXX}"
-MAKE_ENV=	DATADIR="${DATADIR}"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLIST_FILES=	bin/${PORTNAME}
-
-PORTDOCS=	*
 PORTDATA=	*
 
-OPTIONS_DEFINE=	DOCS
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|sound/|${DATADIR}/sound/|g' \
-		${WRKSRC}/src/SFXManager.cpp
-	@${REINPLACE_CMD} -e 's|graphics/|${DATADIR}/graphics/|g' \
+		${WRKSRC}/src/SoundManager.cpp
+	@${REINPLACE_CMD} -e 's|graphics/|${DATADIR}/graphics/|g; \
+		s|"graphics"|"${DATADIR}/graphics"|' \
 		${WRKSRC}/src/GLTManager.cpp ${WRKSRC}/src/TheGooniesApp.cpp
 	@${REINPLACE_CMD} -e 's|maps/|${DATADIR}/maps/|g' \
 		${WRKSRC}/src/TheGoonies.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/goonies ${STAGEDIR}${PREFIX}/bin/
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \
-		'sound graphics maps' ${STAGEDIR}${DATADIR}/
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} 'graphics maps sound' ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/build/linux/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/build/linux/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/games/goonies/distinfo b/games/goonies/distinfo
index 4487002b581..0a5f65c1d23 100644
--- a/games/goonies/distinfo
+++ b/games/goonies/distinfo
@@ -1,2 +1,3 @@
-SHA256 (goonies_r1-0-1.tgz) = f0e2e20707caacfbeb531561cd4421beb9007eb7c6aae6f0c5dffb2ec648ab86
-SIZE (goonies_r1-0-1.tgz) = 11708692
+TIMESTAMP = 1476028387
+SHA256 (goonies.src_1.4.1528.tgz) = 9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799
+SIZE (goonies.src_1.4.1528.tgz) = 11428239
diff --git a/games/goonies/files/patch-Makefile b/games/goonies/files/patch-Makefile
new file mode 100644
index 00000000000..a34017bebb8
--- /dev/null
+++ b/games/goonies/files/patch-Makefile
@@ -0,0 +1,49 @@
+--- Makefile.orig	2009-03-12 10:05:30 UTC
++++ Makefile
+@@ -1,11 +1,11 @@
+ EXE = goonies
+ SRC = src
+-PREFIX = /usr
++PREFIX ?= /usr
+ EXTRADIR = ./build/linux
+ 
+-GAMEDIR = $(PREFIX)/games
++GAMEDIR = $(PREFIX)/bin
+ STARTUP = $(GAMEDIR)/$(EXE)
+-BINDIR = $(PREFIX)/share/games/$(EXE)
++BINDIR = $(PREFIX)/share/$(EXE)
+ ICNDIR = $(PREFIX)/share/pixmaps
+ APPDIR = $(PREFIX)/share/applications
+ 
+@@ -56,24 +56,24 @@ OBJS = \
+ 	$(SRC)/Symbol.o			$(SRC)/TheGooniesApp.o \
+ 	$(SRC)/TheGoonies.o		$(SRC)/Vector.o
+ 
+-CC = gcc
+-CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
+-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
++CXX ?= gcc
++CXXFLAGS ?= -g3 -O3
++CXXFLAGS += -Wno-write-strings `sdl-config --cflags`
++LDFLAGS += `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lm
+ RM = rm -f
+ CP = cp -r
+ MD = mkdir -p
+ ECHO = echo
+ CHMOD = chmod
+-STRIP = strip
++STRIP ?= strip
+ 
+ all: $(EXE)
+ 
+ %.o: %.cpp
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(EXE): $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+-	@$(STRIP) $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
+ 	@$(ECHO) " o If there are no errors, the game compiled succesfully"
+ 
+ clean:
diff --git a/games/goonies/files/patch-build-linux-Makefile b/games/goonies/files/patch-build-linux-Makefile
deleted file mode 100644
index 092ac03be7e..00000000000
--- a/games/goonies/files/patch-build-linux-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/linux/Makefile.orig	Mon Aug 28 15:10:27 2006
-+++ build/linux/Makefile	Thu Sep  7 00:20:01 2006
-@@ -25,13 +25,13 @@
- 	TheGoonies.o			TheGooniesApp.o			main.o
- 
- EXE = goonies
--INSTDIR = /usr/local/games/$(EXE)
--STARTUP = /usr/local/bin/$(EXE)
-+INSTDIR = ${DATADIR}
-+STARTUP = ${PREFIX}/bin/$(EXE)
- DATA = ../graphics ../maps ../sound
- 
--CC = c++
--CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` -I/usr/local/include/SDL -I/usr/X11R6/include
--LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lGL -lGLU
-+CC ?= c++
-+CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
-+LDFLAGS += `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU -lm
- RM = rm -f
- CP = cp -r
- LN = ln -s
diff --git a/games/goonies/pkg-plist b/games/goonies/pkg-plist
new file mode 100644
index 00000000000..f37285ad32f
--- /dev/null
+++ b/games/goonies/pkg-plist
@@ -0,0 +1,3 @@
+bin/goonies
+share/applications/goonies.desktop
+share/pixmaps/goonies.png