ports/164988: Update port: deskutils/cdcat to 1.6

[KATO Tsuguru]

>Number:         164988
>Category:       ports
>Synopsis:       Update port: deskutils/cdcat to 1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 11 18:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 1.6

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/deskutils/cdcat/Makefile deskutils/cdcat/Makefile
--- /usr/ports/deskutils/cdcat/Makefile	2011-09-01 23:05:40.000000000 +0900
+++ deskutils/cdcat/Makefile	2012-01-31 23:16:12.000000000 +0900
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cdcat
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		GOOGLE_CODE:lib7zip
@@ -21,7 +21,7 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \
-		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:patch
+		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build
 LIB_DEPENDS=	tar.0:${PORTSDIR}/devel/libtar
 
 BUILD_WRKSRC=	${WRKSRC}/src
@@ -35,7 +35,11 @@
 
 QMAKEFLAGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		INCLUDEPATH+="${MIF_WRKSRC}/MediaInfoLib/Source" \
-		LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a"
+		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"
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
 PORTDOCS=	Authors ChangeLog README TRANSLATORS_README
@@ -60,8 +64,15 @@
 	@${LN} -sf ${L7Z_NAME}-${L7Z_VERSION} ${L7Z_WRKSRC}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl .*||g' ${BUILD_WRKSRC}/${PORTNAME}.pro
-	@${REINPLACE_CMD} -e 's|-ldl||g' ${L7Z_WRKSRC}/Test7Zip/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/lib7zip.a/s|^|#| ; \
+		 /-lmediainfo/s|^|#| ; \
+		 s|-ldl|| ; \
+		 s|-std=c++0x -g -O2||' ${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 \
diff -urN /usr/ports/deskutils/cdcat/distinfo deskutils/cdcat/distinfo
--- /usr/ports/deskutils/cdcat/distinfo	2011-09-01 23:05:40.000000000 +0900
+++ deskutils/cdcat/distinfo	2012-01-31 05:22:53.000000000 +0900
@@ -1,4 +1,4 @@
-SHA256 (cdcat-1.5.tar.bz2) = 586aa5885418b6e4be7fcf888cfa249ec97b4b70a95fefe568ed826094d645a4
-SIZE (cdcat-1.5.tar.bz2) = 287378
+SHA256 (cdcat-1.6.tar.bz2) = ac259545dceea619c5d7ca8248944cccf815dcb23629b66917fe292379f60ee6
+SIZE (cdcat-1.6.tar.bz2) = 297260
 SHA256 (lib7zip-1.4.1.tar.gz) = 20efb640c43c5d05e1f8d641eb0d01f8712648fe7989f275ec5b2997641316d9
 SIZE (lib7zip-1.4.1.tar.gz) = 95080
>Release-Note:
>Audit-Trail:
>Unformatted: