From owner-svn-ports-all@FreeBSD.ORG Fri Nov 30 23:52:11 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 01DDED23; Fri, 30 Nov 2012 23:52:09 +0000 (UTC) (envelope-from sperber@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 667858FC15; Fri, 30 Nov 2012 23:52:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAUNq9wW079910; Fri, 30 Nov 2012 23:52:09 GMT (envelope-from sperber@svn.freebsd.org) Received: (from sperber@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAUNq9Ym079908; Fri, 30 Nov 2012 23:52:09 GMT (envelope-from sperber@svn.freebsd.org) Message-Id: <201211302352.qAUNq9Ym079908@svn.freebsd.org> From: Armin Pirkovitsch Date: Fri, 30 Nov 2012 23:52:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308044 - in head/deskutils/cdcat: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2012 23:52:11 -0000 Author: sperber Date: Fri Nov 30 23:52:08 2012 New Revision: 308044 URL: http://svnweb.freebsd.org/changeset/ports/308044 Log: - Update to version 2.1 - Update LICENSE - Remove shlib versions - Convert to optionsng - Trim Makefile header - Add BROKEN for 7.X PR: ports/171976 Submitted by: KATO Tsuguru Approved by: beat (mentor) Feature safe: yes Deleted: head/deskutils/cdcat/files/ Modified: head/deskutils/cdcat/Makefile head/deskutils/cdcat/distinfo Modified: head/deskutils/cdcat/Makefile ============================================================================== --- head/deskutils/cdcat/Makefile Fri Nov 30 23:52:02 2012 (r308043) +++ head/deskutils/cdcat/Makefile Fri Nov 30 23:52:08 2012 (r308044) @@ -1,16 +1,12 @@ -# New ports collection makefile for: cdcat -# Date created: 04 May 2006 -# Whom: Aren Tyr -# +# Created by: Aren Tyr # $FreeBSD$ -# PORTNAME= cdcat -PORTVERSION= 2.0 -PORTREVISION= 1 +PORTVERSION= 2.1 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ GOOGLE_CODE:lib7zip +PROJECTHOST= lib7zip DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${L7Z_DISTFILE}:lib7zip EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -18,17 +14,18 @@ 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 +LICENSE= GPLv2 MPL +LICENSE_COMB= multi BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \ ${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build -LIB_DEPENDS= tar.0:${PORTSDIR}/devel/libtar \ - exif.12:${PORTSDIR}/graphics/libexif +LIB_DEPENDS= tar:${PORTSDIR}/devel/libtar \ + exif:${PORTSDIR}/graphics/libexif + +OPTIONS_DEFINE= DOCS BUILD_WRKSRC= ${WRKSRC}/src -PROJECTHOST= lib7zip USE_BZIP2= yes USE_QT4= corelib gui xml \ linguist_build moc_build qmake_build uic_build @@ -62,7 +59,7 @@ PLIST_FILES+= share/icons/hicolor/scalab PLIST_DIRS= %%DATADIR%%/translations %%DATADIR%% L7Z_NAME= lib7zip -L7Z_VERSION= 1.4.1 +L7Z_VERSION= 1.6.3 L7Z_DISTFILE= ${L7Z_NAME}-${L7Z_VERSION}.tar.gz L7Z_WRKSRC= ${WRKDIR}/${L7Z_NAME} @@ -71,6 +68,10 @@ L7Z_WRKSRC= ${WRKDIR}/${L7Z_NAME} P7Z_WRKSRC= $$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE} -V WRKSRC) MIF_WRKSRC= $$(cd ${PORTSDIR}/multimedia/mediainfo && ${MAKE} -V WRKSRC) +.if ${OSVERSION} < 800000 +BROKEN= does not build on 7.X +.endif + post-extract: @${GZCAT} ${DISTDIR}/${L7Z_DISTFILE} | (cd ${WRKDIR} && ${TAR} -xf -) @${LN} -sf ${L7Z_NAME}-${L7Z_VERSION} ${L7Z_WRKSRC} @@ -112,10 +113,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \ ${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -.for file in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.for i in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif Modified: head/deskutils/cdcat/distinfo ============================================================================== --- head/deskutils/cdcat/distinfo Fri Nov 30 23:52:02 2012 (r308043) +++ head/deskutils/cdcat/distinfo Fri Nov 30 23:52:08 2012 (r308044) @@ -1,4 +1,4 @@ -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 +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