diff options
| author | Armin Pirkovitsch <sperber@FreeBSD.org> | 2012-11-30 23:52:08 +0000 |
|---|---|---|
| committer | Armin Pirkovitsch <sperber@FreeBSD.org> | 2012-11-30 23:52:08 +0000 |
| commit | 645e32e82198aacc14bdaad50e9f902ad181546d (patch) | |
| tree | 6de589b7f82a1e31b6c9f70dd636a372571361d5 /deskutils | |
| parent | 8820457d87986ec90760989cf29717ce62d39d41 (diff) | |
| download | ports-645e32e82198aacc14bdaad50e9f902ad181546d.tar.gz ports-645e32e82198aacc14bdaad50e9f902ad181546d.zip | |
Notes
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/cdcat/Makefile | 33 | ||||
| -rw-r--r-- | deskutils/cdcat/distinfo | 8 | ||||
| -rw-r--r-- | deskutils/cdcat/files/patch-7zipLibrary.cpp | 34 |
3 files changed, 21 insertions, 54 deletions
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile index c249cad78cd5..50a9a95059c9 100644 --- a/deskutils/cdcat/Makefile +++ b/deskutils/cdcat/Makefile @@ -1,16 +1,12 @@ -# New ports collection makefile for: cdcat -# Date created: 04 May 2006 -# Whom: Aren Tyr <aren.tyr@gawab.com> -# +# Created by: Aren Tyr <aren.tyr@gawab.com> # $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/scalable/apps/${PORTNAME}_logo.svg 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 diff --git a/deskutils/cdcat/distinfo b/deskutils/cdcat/distinfo index da74fb08be34..60ef2016fdd6 100644 --- a/deskutils/cdcat/distinfo +++ b/deskutils/cdcat/distinfo @@ -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 diff --git a/deskutils/cdcat/files/patch-7zipLibrary.cpp b/deskutils/cdcat/files/patch-7zipLibrary.cpp deleted file mode 100644 index 4164806e6212..000000000000 --- a/deskutils/cdcat/files/patch-7zipLibrary.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- ../lib7zip/Lib7Zip/7zipLibrary.cpp.orig 2011-07-24 08:14:18.000000000 +0900 -+++ ../lib7zip/Lib7Zip/7zipLibrary.cpp 2011-08-06 16:31:37.000000000 +0900 -@@ -35,6 +35,13 @@ - #define HMODULE void * - #endif - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#if (__FreeBSD_version < 900000 && __FreeBSD_version >= 800501) || (__FreeBSD_version >= 900006) -+#define HAVE_SCANDIR_POSIX -+#endif -+#endif -+ - /*-------------- const defines ---------------------------*/ - const UInt64 kMaxCheckStartPosition = 1 << 22; - -@@ -819,7 +826,7 @@ - } - #else - --#if defined(__WXMAC__) || defined(__APPLE__) -+#if defined(__WXMAC__) || defined(__APPLE__) || !defined(HAVE_SCANDIR_POSIX) - int myselect(struct dirent * pDir ); - #else - int myselect(const struct dirent * pDir ); -@@ -856,7 +863,7 @@ - return true; - } - --#if defined(__WXMAC__) || defined(__APPLE__) -+#if defined(__WXMAC__) || defined(__APPLE__) || !defined(HAVE_SCANDIR_POSIX) - int myselect(struct dirent * pDir ) - #else - int myselect(const struct dirent * pDir ) |