Index: head/deskutils/cdcat/Makefile
===================================================================
--- head/deskutils/cdcat/Makefile	(revision 297074)
+++ head/deskutils/cdcat/Makefile	(revision 297075)
@@ -1,125 +1,122 @@
 # New ports collection makefile for:	cdcat
 # Date created: 			04 May 2006
 # Whom: 				Aren Tyr <aren.tyr@gawab.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cdcat
-PORTVERSION=	1.9
+PORTVERSION=	2.0
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		GOOGLE_CODE:lib7zip
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${L7Z_DISTFILE}:lib7zip
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A QT based tool for offline CD/DVD/disk catalogs
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \
 		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build
 LIB_DEPENDS=	tar.0:${PORTSDIR}/devel/libtar \
 		exif.12:${PORTSDIR}/graphics/libexif
 
 BUILD_WRKSRC=	${WRKSRC}/src
 
 PROJECTHOST=	lib7zip
 USE_BZIP2=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qt3support xml \
+QT_COMPONENTS=	corelib gui xml \
 		linguist_build moc_build qmake_build uic_build
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
 QMAKEFLAGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		INCLUDEPATH+="${MIF_WRKSRC}/MediaInfoLib/Source" \
 		INCLUDEPATH+="${MIF_WRKSRC}/ZenLib/Source" \
 		LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a" \
 		LIBS+="${MIF_WRKSRC}/MediaInfoLib/Project/GNU/Library/.libs/libmediainfo.a" \
 		LIBS+="${MIF_WRKSRC}/ZenLib/Project/GNU/Library/.libs/libzen.a" \
-		DEFINES+="MEDIAINFO_STATIC"
+		LIBS+="-lz -lbz2 -ltar -lexif" \
+		DEFINES+="MEDIAINFO_STATIC" \
+		DEFINES+="MEDIAINFO_UNICODE" \
+		DEFINES+="USE_LIBEXIF"
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
 # spoof tinderbox: build deps for multimedia/mediainfo
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 PORTDOCS=	Authors ChangeLog README TRANSLATORS_README
 PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/${PORTNAME}.png
 .for lang in cz de el es fr hu id it pl pt sk sr
 PLIST_FILES+=	%%DATADIR%%/translations/${PORTNAME}_${lang}.qm
 .endfor
 .for size in 16 22 32 48 64
 PLIST_FILES+=	share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png
 .endfor
 PLIST_FILES+=	share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
 PLIST_DIRS=	%%DATADIR%%/translations %%DATADIR%%
 
 L7Z_NAME=	lib7zip
 L7Z_VERSION=	1.4.1
 L7Z_DISTFILE=	${L7Z_NAME}-${L7Z_VERSION}.tar.gz
 L7Z_WRKSRC=	${WRKDIR}/${L7Z_NAME}
 
 .include <bsd.port.pre.mk>
 
 P7Z_WRKSRC=	$$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE} -V WRKSRC)
 MIF_WRKSRC=	$$(cd ${PORTSDIR}/multimedia/mediainfo && ${MAKE} -V WRKSRC)
 
 post-extract:
 	@${GZCAT} ${DISTDIR}/${L7Z_DISTFILE} | (cd ${WRKDIR} && ${TAR} -xf -)
 	@${LN} -sf ${L7Z_NAME}-${L7Z_VERSION} ${L7Z_WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/lib7zip.a/s|^|#| ; \
-		 /-lmediainfo/s|^|#| ; \
-		 /libmediainfo/s|^|#| ; \
-		 s|-ldl|| ; \
-		 s|-std=c++0x || ; \
-		 s|-g || ; \
-		 s|-O2 ||' ${BUILD_WRKSRC}/${PORTNAME}.pro
+		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e \
 		's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp
 	@${REINPLACE_CMD} -e \
 		's|-ldl||' ${L7Z_WRKSRC}/Test7Zip/Makefile.in
 
 pre-configure:
 	@cd ${L7Z_WRKSRC} && ./configure --disable-shared \
 		CC="${CC}" CFLAGS="${CFLAGS}" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		P7ZIP_SOURCE_DIR="${P7Z_WRKSRC}"
 
 do-configure:
 	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
 		${PORTNAME}.pro ${QMAKEFLAGS}
 
 pre-build:
 	@cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${DATADIR}
 	@${MKDIR} ${DATADIR}/translations
 	${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm ${DATADIR}/translations
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo.svg \
 		${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
 .for size in 16 22 32 48 64
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \
 		${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/deskutils/cdcat/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/deskutils/cdcat/distinfo
===================================================================
--- head/deskutils/cdcat/distinfo	(revision 297074)
+++ head/deskutils/cdcat/distinfo	(revision 297075)
@@ -1,4 +1,4 @@
-SHA256 (cdcat-1.9.tar.bz2) = d9c83835e3544a1316bc4a10d5fb0efe19f556994424e5520f7edb2ce5f874da
-SIZE (cdcat-1.9.tar.bz2) = 367729
+SHA256 (cdcat-2.0.tar.bz2) = d9c6dd6d1ab0b997e35446c0370f03e69a40ac7f49492c3c70ae6224c568970a
+SIZE (cdcat-2.0.tar.bz2) = 382091
 SHA256 (lib7zip-1.4.1.tar.gz) = 20efb640c43c5d05e1f8d641eb0d01f8712648fe7989f275ec5b2997641316d9
 SIZE (lib7zip-1.4.1.tar.gz) = 95080

Property changes on: head/deskutils/cdcat/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property