3 files changed, 41 insertions, 23 deletions

diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile
index 969c6daa8730..e8466aa98bb7 100644
--- a/games/kardsgt/Makefile
+++ b/games/kardsgt/Makefile
@@ -6,27 +6,46 @@
 #
 
 PORTNAME=	kardsgt
-PORTVERSION=	0.6.4
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	games
-MASTER_SITES=	SAVANNAH CENKES
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Card game suite
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+USE_QT_VER=	4
+QT_COMPONENTS=	assistantclient corelib gui network \
+		moc_build qmake_build rcc_build uic_build
+ALL_TARGET=	qmake release
 
-USE_QT_VER=	3
-MAKE_ENV=	DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} QTDIR="${QT_PREFIX}"
-MAKE_ARGS=	bindir=${PREFIX}/bin mandir=${MANPREFIX}/man\
-		datadir=${PREFIX}/share
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-MAN6=	${PORTNAME}.6
+MAN6=		kardsgt.6
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${datadir}/kardsgt|$${DATADIR}|;\
-		s|$${docdir}/kardsgt|$${DOCSDIR}|;\
-		s|qmake|${SETENV} ${MAKE_ENV} qmake -spec ${QMAKESPEC}|;\
-		s|--parents|-p|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|^QT +=|#QT +=|g' \
+		${WRKSRC}/src/src.pro
+	@${REINPLACE_CMD} -e 's|/usr/share/kardsgt/|${DATADIR}/|g' \
+		${WRKSRC}/src/kardsgtinterface.cpp
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
+		-spec ${QMAKESPEC} kardsgt.pro
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/release/kardsgt ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/doc/kardsgt.6 ${MAN6PREFIX}/man/man6
+	@${MKDIR} ${PREFIX}/share/icons
+	${INSTALL_DATA} ${WRKSRC}/src/images/kardsgt.png ${PREFIX}/share/icons
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/src/doc/*.dcf ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/src/doc/*.html ${DATADIR}
+	@${MKDIR} ${DATADIR}/images
+	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.jpg ${DATADIR}/images
+	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.png ${DATADIR}/images
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in CREDITS ChangeLog README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/kardsgt/distinfo b/games/kardsgt/distinfo
index eb5fbf29cd2f..83625ff338d5 100644
--- a/games/kardsgt/distinfo
+++ b/games/kardsgt/distinfo
@@ -1,3 +1,3 @@
-MD5 (kardsgt-0.6.4.tar.gz) = a954e27206c13ed7634908d89071bba2
-SHA256 (kardsgt-0.6.4.tar.gz) = 10f231b6809eae3652614fba48df6c61948edc490bbb2860c7bbc9b8725594bc
-SIZE (kardsgt-0.6.4.tar.gz) = 2865696
+MD5 (kardsgt-0.7.1.tar.gz) = e2cb00dfea3fc8351ea5d0339514d2cc
+SHA256 (kardsgt-0.7.1.tar.gz) = 8bd93a56aa565df70734fb5e5c2634d7939e17dd7248b55d8af96e8caeefe008
+SIZE (kardsgt-0.7.1.tar.gz) = 2425432
diff --git a/games/kardsgt/pkg-plist b/games/kardsgt/pkg-plist
index ddb4c3aec241..3a83f5581d2e 100644
--- a/games/kardsgt/pkg-plist
+++ b/games/kardsgt/pkg-plist
@@ -1,17 +1,16 @@
 bin/kardsgt
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CREDITS
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/icons/kardsgt.png
 %%DATADIR%%/abigail.html
+%%DATADIR%%/crazyeights.html
 %%DATADIR%%/credits.html
 %%DATADIR%%/cribbage.html
 %%DATADIR%%/euchre.html
 %%DATADIR%%/fdl.html
 %%DATADIR%%/games.html
 %%DATADIR%%/hearts.html
-%%DATADIR%%/images/NOTICE
 %%DATADIR%%/images/abigail.png
 %%DATADIR%%/images/cribbageboard.jpg
 %%DATADIR%%/images/jack.png
@@ -29,7 +28,7 @@ share/icons/kardsgt.png
 %%DATADIR%%/toc.html
 %%DATADIR%%/wally.html
 %%DATADIR%%/war.html
-@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
 @dirrmtry share/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%