From owner-svn-ports-head@FreeBSD.ORG Wed Jul 30 07:11:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01BF5876; Wed, 30 Jul 2014 07:11:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6AEE2471; Wed, 30 Jul 2014 07:11:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6U7B5n8050051; Wed, 30 Jul 2014 07:11:05 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6U7B5E5050050; Wed, 30 Jul 2014 07:11:05 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407300711.s6U7B5E5050050@svn.freebsd.org> From: John Marino Date: Wed, 30 Jul 2014 07:11:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363449 - head/deskutils/cdcat X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jul 2014 07:11:06 -0000 Author: marino Date: Wed Jul 30 07:11:05 2014 New Revision: 363449 URL: http://svnweb.freebsd.org/changeset/ports/363449 QAT: https://qat.redports.org/buildarchive/r363449/ Log: deskutils/cdcat: Unbreak PR: 192199 Submitted by: Ports Fury Modified: head/deskutils/cdcat/Makefile Modified: head/deskutils/cdcat/Makefile ============================================================================== --- head/deskutils/cdcat/Makefile Wed Jul 30 07:07:16 2014 (r363448) +++ head/deskutils/cdcat/Makefile Wed Jul 30 07:11:05 2014 (r363449) @@ -3,6 +3,7 @@ PORTNAME= cdcat PORTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ GOOGLE_CODE:lib7zip @@ -14,18 +15,15 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Qt based tool for offline CD/DVD/disk catalogs -BROKEN= Fails to build after mediainfo split - LICENSE= GPLv2 MPL LICENSE_COMB= multi BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \ - ${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build \ cryptopp>0:${PORTSDIR}/security/cryptopp LIB_DEPENDS= libtar.so:${PORTSDIR}/devel/libtar \ - libexif.so:${PORTSDIR}/graphics/libexif - -OPTIONS_DEFINE= DOCS + libexif.so:${PORTSDIR}/graphics/libexif \ + libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo \ + libzen.so:${PORTSDIR}/multimedia/libzen CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${CONFIGURE_WRKSRC} @@ -33,22 +31,15 @@ BUILD_WRKSRC= ${CONFIGURE_WRKSRC} USES= qmake:norecursive tar:bzip2 USE_QT4= corelib gui xml linguist_build moc_build uic_build QMAKE_ARGS= 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" \ LIBS+="${LOCALBASE}/lib/libcryptopp.a" \ - LIBS+="-lz -lbz2 -ltar -lexif" \ + LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \ DEFINES+="MEDIAINFO_STATIC" \ DEFINES+="MEDIAINFO_UNICODE" \ DEFINES+="USE_LIBEXIF" QMAKE_SOURCE_PATH= ${BUILD_WRKSRC}/${PORTNAME}.pro INSTALLS_ICONS= yes -# 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 ru sk sr @@ -63,6 +54,8 @@ PLIST_DIRS= %%DATADIR%%/translations %%D DESKTOP_ENTRIES="CdCat" "Hyper's CD Catalog" "${DATADIR}/${PORTNAME}.png" \ "${PORTNAME}" "AudioVideo;Qt;" "" +OPTIONS_DEFINE= DOCS + L7Z_NAME= lib7zip L7Z_VERSION= 1.6.5 L7Z_DISTFILE= ${L7Z_NAME}-${L7Z_VERSION}.tar.gz @@ -70,8 +63,7 @@ L7Z_WRKSRC= ${WRKDIR}/${L7Z_NAME} .include -P7Z_WRKSRC= $$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE} -V WRKSRC) -MIF_WRKSRC= $$(cd ${PORTSDIR}/multimedia/mediainfo && ${MAKE} -V WRKSRC) +P7Z_WRKSRC= $$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE_CMD} -V WRKSRC) post-extract: @${GZCAT} ${DISTDIR}/${L7Z_DISTFILE} | (cd ${WRKDIR} && ${TAR} -xf -)