From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 9 18:10:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9043BC5D for ; Wed, 9 Oct 2013 18:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7D99A2A66 for ; Wed, 9 Oct 2013 18:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r99IA2Wt098462 for ; Wed, 9 Oct 2013 18:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r99IA28Y098461; Wed, 9 Oct 2013 18:10:02 GMT (envelope-from gnats) Date: Wed, 9 Oct 2013 18:10:02 GMT Message-Id: <201310091810.r99IA28Y098461@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: KATO Tsuguru Subject: Re: ports/175585: deskutils/cdcat: Update to version 2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: KATO Tsuguru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 18:10:02 -0000 The following reply was made to PR ports/175585; it has been noted by GNATS. From: KATO Tsuguru To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/175585: deskutils/cdcat: Update to version 2.2 Date: Thu, 10 Oct 2013 02:55:03 +0900 This is a multi-part message in MIME format. --Multipart=_Thu__10_Oct_2013_02_55_03_+0900_aJL.e1/vvYYmCbHq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Version 2.3.1 has been released. --Multipart=_Thu__10_Oct_2013_02_55_03_+0900_aJL.e1/vvYYmCbHq Content-Type: text/x-diff; name="deskutils_cdcat.diff" Content-Disposition: attachment; filename="deskutils_cdcat.diff" Content-Transfer-Encoding: 7bit diff -urN /usr/ports/deskutils/cdcat/Makefile deskutils/cdcat/Makefile --- /usr/ports/deskutils/cdcat/Makefile 2013-09-22 01:05:21.000000000 +0900 +++ deskutils/cdcat/Makefile 2013-10-10 00:00:00.000000000 +0900 @@ -2,8 +2,7 @@ # $FreeBSD: head/deskutils/cdcat/Makefile 327718 2013-09-20 16:21:37Z bapt $ PORTNAME= cdcat -PORTVERSION= 2.1 -PORTREVISION= 1 +PORTVERSION= 2.3.1 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ GOOGLE_CODE:lib7zip @@ -18,18 +17,23 @@ LICENSE= GPLv2 MPL LICENSE_COMB= multi -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \ +FETCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \ ${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build +BUILD_DEPENDS= cryptopp>0:${PORTSDIR}/security/cryptopp LIB_DEPENDS= tar:${PORTSDIR}/devel/libtar \ exif:${PORTSDIR}/graphics/libexif OPTIONS_DEFINE= DOCS -BUILD_WRKSRC= ${WRKSRC}/src +CONFIGURE_WRKSRC= ${WRKSRC}/src +BUILD_WRKSRC= ${CONFIGURE_WRKSRC} USE_BZIP2= yes +USES= qmake:norecursive USE_QT4= corelib gui xml \ linguist_build moc_build qmake_build uic_build +QMAKE_ARGS= ${QMAKEFLAGS} +QMAKE_PRO= ${PORTNAME}.pro INSTALLS_ICONS= yes QMAKEFLAGS+= INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \ @@ -38,6 +42,7 @@ 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" \ + LIBS+="${LOCALBASE}/lib/libcryptopp.a" \ LIBS+="-lz -lbz2 -ltar -lexif" \ DEFINES+="MEDIAINFO_STATIC" \ DEFINES+="MEDIAINFO_UNICODE" \ @@ -49,7 +54,7 @@ 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 +.for lang in cz de el es fr hu id it pl pt ru sk sr PLIST_FILES+= %%DATADIR%%/translations/${PORTNAME}_${lang}.qm .endfor .for size in 16 22 32 48 64 @@ -58,12 +63,14 @@ PLIST_FILES+= share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg PLIST_DIRS= %%DATADIR%%/translations %%DATADIR%% +DESKTOP_ENTRIES="CdCat" "Hyper's CD Catalog" "${DATADIR}/${PORTNAME}.png" \ + "${PORTNAME}" "AudioVideo;Qt;" false + L7Z_NAME= lib7zip -L7Z_VERSION= 1.6.3 +L7Z_VERSION= 1.6.4 L7Z_DISTFILE= ${L7Z_NAME}-${L7Z_VERSION}.tar.gz L7Z_WRKSRC= ${WRKDIR}/${L7Z_NAME} -NO_STAGE= yes .include P7Z_WRKSRC= $$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE} -V WRKSRC) @@ -78,6 +85,10 @@ '/LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro @${REINPLACE_CMD} -e \ 's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp +.for i in newdbdialog.cpp wdbfile.h + @${REINPLACE_CMD} -e \ + 's|crypto++/|cryptopp/|' ${BUILD_WRKSRC}/${i} +.endfor @${REINPLACE_CMD} -e \ 's|-ldl||' ${L7Z_WRKSRC}/Test7Zip/Makefile.in @@ -86,35 +97,32 @@ 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} + @${LRELEASE} ${CONFIGURE_WRKSRC}/${PORTNAME}.pro pre-build: - @cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ + @cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${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 + (cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}.png \ + ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}${DATADIR}/translations + (cd ${BUILD_WRKSRC}/lang && ${INSTALL_DATA} *.qm \ + ${STAGEDIR}${DATADIR}/translations) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps) .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 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo_${size}x${size}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png) .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor -.endif .include diff -urN /usr/ports/deskutils/cdcat/distinfo deskutils/cdcat/distinfo --- /usr/ports/deskutils/cdcat/distinfo 2013-06-21 04:01:47.000000000 +0900 +++ deskutils/cdcat/distinfo 2013-10-10 00:00:00.000000000 +0900 @@ -1,4 +1,4 @@ -SHA256 (cdcat-2.1.tar.bz2) = ad332b374307835d5daadfdcc8a06937cf3c57fe3a87cf58dc41b368ba6e8204 -SIZE (cdcat-2.1.tar.bz2) = 383337 -SHA256 (lib7zip-1.6.3.tar.gz) = 03e6aecefbb7ed8c927fb0736c7192a4661ace7884a35f4147df7356b1a23860 -SIZE (lib7zip-1.6.3.tar.gz) = 356121 +SHA256 (cdcat-2.3.1.tar.bz2) = 7cb1bbd7646faf93359acda5835f510766c82e612bca577282571f13a8d5f01c +SIZE (cdcat-2.3.1.tar.bz2) = 428708 +SHA256 (lib7zip-1.6.4.tar.gz) = d50f8c1bb6dab4824c6876977d944c0f0ac10f15e64f49ee94665f7be30e26af +SIZE (lib7zip-1.6.4.tar.gz) = 361874 diff -urN /usr/ports/deskutils/cdcat/files/patch-src__exportcdcatdb.cpp deskutils/cdcat/files/patch-src__exportcdcatdb.cpp --- /usr/ports/deskutils/cdcat/files/patch-src__exportcdcatdb.cpp 1970-01-01 09:00:00.000000000 +0900 +++ deskutils/cdcat/files/patch-src__exportcdcatdb.cpp 2013-10-10 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- src/exportcdcatdb.cpp.orig ++++ src/exportcdcatdb.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "icons.h" + #include "cdcat.h" --Multipart=_Thu__10_Oct_2013_02_55_03_+0900_aJL.e1/vvYYmCbHq--