- Update to version 2.2 (now using Qt4)

- Remove patches that are no longer needed
- Adopt port

5 files changed, 13 insertions, 67 deletions

diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 2eb732a192fd..5f8b8d69752d 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -6,40 +6,28 @@
 #
 
 PORTNAME=	tuxcards
-PORTVERSION=	1.2
-PORTREVISION=	3
+PORTVERSION=	2.2
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.tifskom.de/tux/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	http://www.tuxcards.de/src/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@stack.nl
 COMMENT=	Tool for managing notes within a hierarchical tree
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_QT_VER=	4
+QT_COMPONENTS=	gui xml qmake_build moc_build uic_build rcc_build
 
-USE_QT_VER=	3
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
+PLIST_FILES=	bin/tuxcards
 
 .include <bsd.port.pre.mk>
 
-# Add this condititonal while people might still have old versions
-# of qmake, living in LOCALBASE, installed. This should go away eventually.
-
-.if exists(${LOCALBASE}/share/qt/mkspecs/freebsd-g++)
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-.else
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-.endif
-
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-		-spec ${QMAKESPEC} tuxcards.pro
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${QMAKE} -spec ${QMAKESPEC} tuxcards.pro
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/en/*.* ${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/tuxcards/distinfo b/deskutils/tuxcards/distinfo
index cf465447ffa5..40f7869c13c4 100644
--- a/deskutils/tuxcards/distinfo
+++ b/deskutils/tuxcards/distinfo
@@ -1,3 +1,3 @@
-MD5 (tuxcards-1.2.tar.gz) = ee85e2e5c23425fd031c62a5e2f6f248
-SHA256 (tuxcards-1.2.tar.gz) = 0ec17333370a5ca2e2d798f29fbe9b5127cf4956ec8ac091c14cd2b974c21aee
-SIZE (tuxcards-1.2.tar.gz) = 203129
+MD5 (tuxcards-2.2.tar.gz) = fb65fa066389a586a7698ced30530d74
+SHA256 (tuxcards-2.2.tar.gz) = 0dcb37ab22a08c66d9d9b19e29299748bce007a4980869a37f6844b97f973735
+SIZE (tuxcards-2.2.tar.gz) = 225376
diff --git a/deskutils/tuxcards/files/patch-src::information::CInformationElementHistory.cpp b/deskutils/tuxcards/files/patch-src::information::CInformationElementHistory.cpp
deleted file mode 100644
index ea97b21039a8..000000000000
--- a/deskutils/tuxcards/files/patch-src::information::CInformationElementHistory.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/information/CInformationElementHistory.cpp.orig	Fri Dec  5 07:22:09 2003
-+++ src/information/CInformationElementHistory.cpp	Tue Jul 13 22:32:26 2004
-@@ -156,7 +156,7 @@
- 
-       CInformationElement* pIE = mList.at(i);
-       std::cout<<i<<sSeparator<<pIE<<"\t";
--      sDesc =  (NULLPTR != pIE) ? pIE->getDescription() : "NULLPTR";
-+      sDesc =  (NULLPTR != pIE) ? pIE->getDescription() : QString("NULLPTR");
-       std::cout<<sDesc<<std::endl;
-    }
- 
diff --git a/deskutils/tuxcards/files/patch-src_gui_dialogs_optionsDialog-IOptionsDialog.ui b/deskutils/tuxcards/files/patch-src_gui_dialogs_optionsDialog-IOptionsDialog.ui
deleted file mode 100644
index fcac1b6b82d5..000000000000
--- a/deskutils/tuxcards/files/patch-src_gui_dialogs_optionsDialog-IOptionsDialog.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/dialogs/optionsDialog/IOptionsDialog.ui.orig	Tue Sep 27 16:59:36 2005
-+++ src/gui/dialogs/optionsDialog/IOptionsDialog.ui	Tue Sep 27 17:01:36 2005
-@@ -1399,7 +1399,4 @@
-     <slot access="protected">changeTextColor()</slot>
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>ccolorbar.h</includehint>
--</includehints>
- </UI>
diff --git a/deskutils/tuxcards/pkg-plist b/deskutils/tuxcards/pkg-plist
deleted file mode 100644
index 167bb39cbf4c..000000000000
--- a/deskutils/tuxcards/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/tuxcards
-%%PORTDOCS%%%%DOCSDIR%%/TuxCardsBunt.gif
-%%PORTDOCS%%%%DOCSDIR%%/addKnoten.gif
-%%PORTDOCS%%%%DOCSDIR%%/changeProberty.gif
-%%PORTDOCS%%%%DOCSDIR%%/deleteKnoten.gif
-%%PORTDOCS%%%%DOCSDIR%%/index-1.html
-%%PORTDOCS%%%%DOCSDIR%%/index-2.html
-%%PORTDOCS%%%%DOCSDIR%%/index-3.html
-%%PORTDOCS%%%%DOCSDIR%%/index-4.html
-%%PORTDOCS%%%%DOCSDIR%%/index-5.html
-%%PORTDOCS%%%%DOCSDIR%%/index-6.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.nif
-%%PORTDOCS%%%%DOCSDIR%%/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/logotp3.png
-%%PORTDOCS%%%%DOCSDIR%%/new.gif
-%%PORTDOCS%%%%DOCSDIR%%/open.gif
-%%PORTDOCS%%%%DOCSDIR%%/save.gif
-%%PORTDOCS%%%%DOCSDIR%%/search.gif
-%%PORTDOCS%%%%DOCSDIR%%/whatis.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%