4 files changed, 35 insertions, 42 deletions

diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
index 60019cebf3c2..85cd2c408027 100644
--- a/games/bubble-chains/Makefile
+++ b/games/bubble-chains/Makefile
@@ -3,34 +3,27 @@
 
 PORTNAME=	bubble-chains
 PORTVERSION=	0.1.1
-DISTVERSIONSUFFIX=	-src
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
-MASTER_SITES=	http://bubble-chains.sintegrial.com/files/ \
-		SF/nemysisfreebsdp/${CATEGORIES}/:icons
-DISTFILES=	chains-${DISTVERSIONFULL}${EXTRACT_SUFX} \
-		${PORTNAME}.png:icons
-EXTRACT_ONLY=	${DISTFILES:N*\:icons:C/:.*//}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The aim is to remove all of the targets on each level
+COMMENT=	2D arcade-puzzle game based on Qt/SDL
 
 LICENSE=	GPLv2
 
-BROKEN=		unfetchable
-DEPRECATED=	does not fetch
-EXPIRATION_DATE=2016-04-23
+BUILD_DEPENDS=	icotool:graphics/icoutils
 
-WRKSRC=		${WRKDIR}/chains-${DISTVERSION}-src
+USE_GITHUB=	yes
+GH_ACCOUNT=	SanskritFritz
 
-USES=		7z dos2unix qmake
-DOS2UNIX_GLOB=	*.pro *.cpp  *.h *.ui *.ui *.rc *.htm *.dat *.css
-USE_SDL=	sdl image mixer
-USE_GL=		glut glew glu
+USES=		dos2unix qmake
+DOS2UNIX_GLOB=	*.pro *.cpp  *.h *.ui *.rc *.htm *.dat *.css
+USE_SDL=	mixer sdl
+USE_GL=		gl
 USE_XORG=	xrandr
 USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib svg xml opengl network
-LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lSDL
+QMAKE_SOURCE_PATH=	${WRKSRC}/Game.pro
 
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
@@ -39,24 +32,25 @@ DESKTOP_ENTRIES="Bubble Chains" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/games/chains|${DATADIR}|' \
-		${WRKSRC}/main.cpp ${WRKSRC}/Game.pro
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|CFLAGS        =|CFLAGS        ?=|; \
-		s|CXXFLAGS      =|CXXFLAGS     ?=|' \
-		${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/chains \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR})
-
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_DATA} ${WRKSRC}/icon.ico \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
-
+	@${REINPLACE_CMD} -e 's|bin/chains|bin/bubble-chains|; \
+		 s|/usr/bin|${PREFIX}/bin|; \
+		 s|/usr/share/chains|${DATADIR}|' \
+		${WRKSRC}/Game.pro
+	@${REINPLACE_CMD} -e 's|/usr/share/chains|${DATADIR}|' \
+		${WRKSRC}/main.cpp
+
+post-build:
+.for i in 16 32 48
+	@${MKDIR} ${WRKDIR}/icons/hicolor/${i}x${i}/apps
+	${LOCALBASE}/bin/icotool -x -b 32 -w ${i} \
+		-o ${WRKDIR}/icons/hicolor/${i}x${i}/apps/bubble-chains.png \
+		${WRKSRC}/icon.ico
+.endfor
+
+post-install:
+	cd ${WRKDIR} && ${COPYTREE_SHARE} icons ${STAGEDIR}${PREFIX}/share
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/games/bubble-chains/distinfo b/games/bubble-chains/distinfo
index 99c4b643f4c3..324a4aacaff6 100644
--- a/games/bubble-chains/distinfo
+++ b/games/bubble-chains/distinfo
@@ -1,4 +1,2 @@
-SHA256 (chains-0.1.1-src.7z) = c1c487c51e8cba1640a49497debe5962f692e17df1272994c5dfaee9d6eb304f
-SIZE (chains-0.1.1-src.7z) = 3282431
-SHA256 (bubble-chains.png) = 7976b8b0dd6b37abcfeb4743580ba570faffe53f862547c37cd2f3e21682f8f4
-SIZE (bubble-chains.png) = 4918
+SHA256 (SanskritFritz-bubble-chains-0.1.1_GH0.tar.gz) = a84a28094d891029c0dbfabaa40fed14dbe15907c79e2b1131f058348ac2eeff
+SIZE (SanskritFritz-bubble-chains-0.1.1_GH0.tar.gz) = 4033960
diff --git a/games/bubble-chains/pkg-descr b/games/bubble-chains/pkg-descr
index ca91ccfc51e5..41d4648f554b 100644
--- a/games/bubble-chains/pkg-descr
+++ b/games/bubble-chains/pkg-descr
@@ -3,4 +3,4 @@ and to do this before the time
 (indicated with the blue-colored bar at the right) runs out.
 Keep doing this until you have passed the last level and won the game. 
 
-WWW: http://bubble-chains.sintegrial.com/
+WWW: https://github.com/SanskritFritz/bubble-chains
diff --git a/games/bubble-chains/pkg-plist b/games/bubble-chains/pkg-plist
index b8edf21514e0..b3fbd10fcfe9 100644
--- a/games/bubble-chains/pkg-plist
+++ b/games/bubble-chains/pkg-plist
@@ -67,5 +67,6 @@ bin/bubble-chains
 %%DATADIR%%/data/tools/random.png
 %%DATADIR%%/data/tools/star.png
 %%DATADIR%%/data/tools/twins.png
-share/pixmaps/bubble-chains.ico
-share/pixmaps/bubble-chains.png
+share/icons/hicolor/16x16/apps/bubble-chains.png
+share/icons/hicolor/32x32/apps/bubble-chains.png
+share/icons/hicolor/48x48/apps/bubble-chains.png