3 files changed, 30 insertions, 32 deletions

diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index e4891c32e3f5..b3fd6d9b5b36 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	dixit
-PORTVERSION=	1.0.1
-PORTREVISION=	6
-CATEGORIES=	textproc # this should/will be romanian ;)
-MASTER_SITES=	SF
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz ${_DB_D}
+PORTVERSION=	10.4.4
+CATEGORIES=	textproc
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/10.4/:dixit \
+		SF/${PORTNAME}/${PORTNAME}_qdb/:db
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:${PORTNAME} \
+		${_DB_D}:db
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Romanian dictionaries databases and query application
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		qmake:${PORTSDIR}/devel/qmake
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_SUB=	_DB=${_DB} DB_DIR=${DB_DIR} _DB_F=${_DB_F}
@@ -30,14 +28,17 @@ DB_MODE?=	0664
 # DB_DATE is the time of the file in the zip archive, not the time of the last
 # update of the database (which is a little earlier, but TZ makes it appear to
 # be later), but it's all we can do in a makefile.
-DB_DATE=200412121653
-_DB_D=	${PORTNAME}_qdb.zip
+DB_DATE=201004010000
+_DB_D=	${PORTNAME}.qdb.tar.bz2
 _DB_F=	${PORTNAME}.qdb
 _DB=	${DB_DIR}/${_DB_F}
 
-USE_QT_VER=	3
-USE_GMAKE=	yes
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} QTDIR="${QT_PREFIX}"
+HAS_CONFIGURE=	yes
+
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui network moc_build qmake_build rcc_build
+#USE_GMAKE=	yes
+#MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} QTDIR="${QT_PREFIX}"
 
 pre-everything::
 	@${ECHO_CMD}
@@ -58,9 +59,11 @@ pre-everything::
 	@${ECHO_CMD}
 
 do-configure:
-	@${REINPLACE_CMD} -e "s^dixit.qdb^${_DB}^" ${WRKSRC}/src/dixit_strings.h
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro
+	@${REINPLACE_CMD} -e "s^dixit.qdb^${_DB}^" ${WRKSRC}/src/dixit.h
+#	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
+#		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro
+	cd ${WRKSRC} && \
+	${SETENV} ${CONFIGURE_ENV} ${QMAKE} -unix PREFIX=${PREFIX} ${PORTNAME}.pro
 
 do-install:
 	@${MKDIR} ${DB_DIR}
@@ -68,23 +71,17 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}  ${PREFIX}/bin/${PORTNAME}
 	@${ECHO_CMD} "	===> Installing database ... .. ."
 .ifndef(DB_OVERWRITE)
-	@if [ ! -e "${_DB}" -o "${_DB}" -ot "${WRKSRC}/${_DB_F}" ];\
-		then	${UNZIP_CMD} -qou ${DISTDIR}/${_DB_D} -d ${DB_DIR} && \
+	@if [ ! -e "${_DB}" -o "${_DB}" -ot "${WRKSRC}/${_DB_F}" ]; \
+		then	${TAR} -C ${DB_DIR:S/${PORTNAME}//} -xf ${DISTDIR}/${_DB_D} && \
 			${ECHO_CMD} "	===> ... Done."; \
 		else	${ECHO_CMD} "	===> Exisitng database is newer, skiping";\
 	fi
 .else
 	@${ECHO_CMD} "	===> DB_OVERWRITE is set, installing database ... .. ."
-	@${UNZIP_CMD} -qou ${DISTDIR}/${_DB_D} -d ${DB_DIR}
+	${TAR} -C ${DB_DIR:S/${PORTNAME}//} -xf ${DISTDIR}/${_DB_D}
 	@${ECHO_CMD} "	===> ... Done."
 .endif
 	@${CHOWN} ${DB_OWNER}:${DB_GROUP} ${_DB}
 	@${CHMOD} ${DB_MODE} ${_DB}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/dixit/distinfo b/textproc/dixit/distinfo
index cacd7619c86d..26a32cc1213d 100644
--- a/textproc/dixit/distinfo
+++ b/textproc/dixit/distinfo
@@ -1,6 +1,6 @@
-MD5 (dixit-1.0.1.tgz) = e9e030f3ec1f4a8aae38001fcd22bb4e
-SHA256 (dixit-1.0.1.tgz) = 60bcb22bb4efe241147f69abb14ccff15408b3a28c1fdc2665970693ae4cb33e
-SIZE (dixit-1.0.1.tgz) = 93460
-MD5 (dixit_qdb.zip) = f7e0da23e6d981785f8db8d6d719b9ca
-SHA256 (dixit_qdb.zip) = a394d6f82520810ede8c71eea9378033d4f9659627c55733a0d9bd4206a89218
-SIZE (dixit_qdb.zip) = 17225751
+MD5 (dixit-10.4.4.tgz) = 2eba875a9c7891554f93e6e56d50f40e
+SHA256 (dixit-10.4.4.tgz) = faca66127afead896136091632d5ae92bd5c4981b5a11103f0a7d14e41529f6f
+SIZE (dixit-10.4.4.tgz) = 146242
+MD5 (dixit.qdb.tar.bz2) = d5dd5d45c5dfbdccc3f8d18bf69a444d
+SHA256 (dixit.qdb.tar.bz2) = 729bf5a6142ce47f116b857bd3cd47a5c9ce58e16ab4cee8cd30a79af9bb2503
+SIZE (dixit.qdb.tar.bz2) = 21620776
diff --git a/textproc/dixit/pkg-plist b/textproc/dixit/pkg-plist
index 2a51255c0faa..4c849c72db21 100644
--- a/textproc/dixit/pkg-plist
+++ b/textproc/dixit/pkg-plist
@@ -1,5 +1,6 @@
 bin/dixit
 @cwd %%DB_DIR%%
 %%_DB_F%%
+LICENSE.GPL3
 @cwd /
 @dirrm %%DB_DIR%%