Update to 1.0.b2.1

PR:		46431
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 37 insertions, 22 deletions

diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 241bb2a4a7d2..132d7c091821 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -6,34 +6,32 @@
 #
 
 PORTNAME=	tuxcards
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	1.0.b2.1
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.arved.de/bsd/src/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-ohneCactus
+MASTER_SITES=	http://www.stud.uni-karlsruhe.de/~ut3c/
+DISTNAME=	${PORTNAME}-${PORTVERSION:R:S/.b/beta/}_${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
-USE_QT_VER=	2
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+QTDIR?=		${X11BASE}
+USE_QT_VER=	3
 USE_REINPLACE=	yes
+MAKE_ENV=	QTDIR="${QTDIR}"
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|warn_on|warn_on thread|g' ${WRKSRC}/tuxcards.pro
 
-.if ${OSVERSION} > 500038
-BROKEN=		"Does not build with gcc 3.1"
-.endif
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
+		-spec ${X11BASE}/mkspecs/freebsd-g++ tuxcards.pro
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|[$$](prefix)/doc|\$$\(prefix\)/share/doc|' \
-		${WRKSRC}/tuxcards/docs/en/Makefile.in
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
-.ifdef(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|install-data-am\: install-data-local||' \
-		${WRKSRC}/tuxcards/docs/en/Makefile.in
-.endif #NOPORTDOCS
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/en/*.* ${DOCSDIR}
+.endif
+	${CAT} pkg-message
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/tuxcards/distinfo b/deskutils/tuxcards/distinfo
index 44918bb13af8..d4b1f38ee3f2 100644
--- a/deskutils/tuxcards/distinfo
+++ b/deskutils/tuxcards/distinfo
@@ -1 +1 @@
-MD5 (tuxcards-0.8-ohneCactus.tar.gz) = d83c5ff630fececca3975724facc8d65
+MD5 (tuxcards-1.0beta2_1.tar.gz) = 473dbff9accbceb8222f91c7c10f758f
diff --git a/deskutils/tuxcards/pkg-message b/deskutils/tuxcards/pkg-message
new file mode 100644
index 000000000000..bb4fa846c65a
--- /dev/null
+++ b/deskutils/tuxcards/pkg-message
@@ -0,0 +1,5 @@
+-----------------------------------------------------
+PLEASE NOTE: the current version of tuxcards dumps 
+core on exit. This does not affect functionality,
+but leaves a tuxcards.core files on your harddisk.
+-----------------------------------------------------
diff --git a/deskutils/tuxcards/pkg-plist b/deskutils/tuxcards/pkg-plist
index 6ca465cf72d5..884308ac603e 100644
--- a/deskutils/tuxcards/pkg-plist
+++ b/deskutils/tuxcards/pkg-plist
@@ -1,4 +1,8 @@
 bin/tuxcards
+%%PORTDOCS%%share/doc/tuxcards/TuxCardsBunt.gif
+%%PORTDOCS%%share/doc/tuxcards/addKnoten.gif
+%%PORTDOCS%%share/doc/tuxcards/changeProberty.gif
+%%PORTDOCS%%share/doc/tuxcards/deleteKnoten.gif
 %%PORTDOCS%%share/doc/tuxcards/index-1.html
 %%PORTDOCS%%share/doc/tuxcards/index-2.html
 %%PORTDOCS%%share/doc/tuxcards/index-3.html
@@ -6,4 +10,12 @@ bin/tuxcards
 %%PORTDOCS%%share/doc/tuxcards/index-5.html
 %%PORTDOCS%%share/doc/tuxcards/index-6.html
 %%PORTDOCS%%share/doc/tuxcards/index.html
+%%PORTDOCS%%share/doc/tuxcards/index.nif
+%%PORTDOCS%%share/doc/tuxcards/index.sgml
+%%PORTDOCS%%share/doc/tuxcards/logotp3.png
+%%PORTDOCS%%share/doc/tuxcards/new.gif
+%%PORTDOCS%%share/doc/tuxcards/open.gif
+%%PORTDOCS%%share/doc/tuxcards/save.gif
+%%PORTDOCS%%share/doc/tuxcards/search.gif
+%%PORTDOCS%%share/doc/tuxcards/whatis.gif
 %%PORTDOCS%%@dirrm share/doc/tuxcards