ports/171976: deskutils/cdcat: Update to version 2.1

[KATO Tsuguru]

>Number:         171976
>Category:       ports
>Synopsis:       deskutils/cdcat: Update to version 2.1
>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:   Tue Sep 25 18:10:14 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 2.1

Remove file:
files/patch-7zipLibrary.cpp

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/deskutils/cdcat/Makefile deskutils/cdcat/Makefile
--- /usr/ports/deskutils/cdcat/Makefile	2012-06-06 15:43:23.000000000 +0900
+++ deskutils/cdcat/Makefile	2012-09-25 03:18:32.000000000 +0900
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	cdcat
-# Date created: 			04 May 2006
-# Whom: 				Aren Tyr <aren.tyr at gawab.com>
-#
+# Created by: Aren Tyr <aren.tyr at gawab.com>
 # $FreeBSD: ports/deskutils/cdcat/Makefile,v 1.18 2012/06/06 06:43:23 miwi Exp $
-#
 
 PORTNAME=	cdcat
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		GOOGLE_CODE:lib7zip
@@ -26,6 +21,8 @@
 LIB_DEPENDS=	tar.0:${PORTSDIR}/devel/libtar \
 		exif.12:${PORTSDIR}/graphics/libexif
 
+OPTIONS_DEFINE=	DOCS
+
 BUILD_WRKSRC=	${WRKSRC}/src
 
 PROJECTHOST=	lib7zip
@@ -62,7 +59,7 @@
 PLIST_DIRS=	%%DATADIR%%/translations %%DATADIR%%
 
 L7Z_NAME=	lib7zip
-L7Z_VERSION=	1.4.1
+L7Z_VERSION=	1.6.2
 L7Z_DISTFILE=	${L7Z_NAME}-${L7Z_VERSION}.tar.gz
 L7Z_WRKSRC=	${WRKDIR}/${L7Z_NAME}
 
@@ -112,7 +109,7 @@
 	${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}
diff -urN /usr/ports/deskutils/cdcat/distinfo deskutils/cdcat/distinfo
--- /usr/ports/deskutils/cdcat/distinfo	2012-05-21 12:10:15.000000000 +0900
+++ deskutils/cdcat/distinfo	2012-08-02 21:24:55.000000000 +0900
@@ -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.2.tar.gz) = b31be3af1d5f31bab50398a52c0ebbed2a2e05ac4b930c451d6656c6cad8f5f4
+SIZE (lib7zip-1.6.2.tar.gz) = 353575
diff -urN /usr/ports/deskutils/cdcat/files/patch-7zipLibrary.cpp deskutils/cdcat/files/patch-7zipLibrary.cpp
--- /usr/ports/deskutils/cdcat/files/patch-7zipLibrary.cpp	2011-09-01 06:43:15.000000000 +0900
+++ deskutils/cdcat/files/patch-7zipLibrary.cpp	1970-01-01 09:00:00.000000000 +0900
@@ -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 )
>Release-Note:
>Audit-Trail:
>Unformatted: