Date: Thu, 25 Aug 2011 03:35:38 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/160091: Update port: deskutils/cdcat to 1.5 Message-ID: <20110825033538.5a1a60f9.tkato432@yahoo.com> Resent-Message-ID: <201108241850.p7OIoInX011646@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160091
>Category: ports
>Synopsis: Update port: deskutils/cdcat to 1.5
>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: Wed Aug 24 18:50:17 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.5
New file:
files/patch-7zipLibrary.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/deskutils/cdcat/Makefile deskutils/cdcat/Makefile
--- /usr/ports/deskutils/cdcat/Makefile 2011-07-03 02:35:45.000000000 +0900
+++ deskutils/cdcat/Makefile 2011-08-14 17:13:52.000000000 +0900
@@ -6,9 +6,13 @@
#
PORTNAME= cdcat
-PORTVERSION= 1.3
+PORTVERSION= 1.5
CATEGORIES= deskutils
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
+ GOOGLE_CODE:lib7zip
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ ${L7Z_DISTFILE}:lib7zip
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= A QT based tool for offline CD/DVD/disk catalogs
@@ -16,41 +20,68 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \
+ ${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:patch
+LIB_DEPENDS= tar.0:${PORTSDIR}/devel/libtar
+
BUILD_WRKSRC= ${WRKSRC}/src
+PROJECTHOST= lib7zip
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= corelib gui qt3support xml \
linguist_build moc_build qmake_build uic_build
MAKE_JOBS_SAFE= yes
+QMAKEFLAGS+= INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
+ INCLUDEPATH+="${MIF_WRKSRC}/MediaInfoLib/Source" \
+ LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a"
LRELEASE= ${QT_PREFIX}/bin/lrelease-qt4
+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
+PLIST_FILES+= %%DATADIR%%/translations/${PORTNAME}_${lang}.qm
+.endfor
+PLIST_DIRS= %%DATADIR%%/translations %%DATADIR%%
+
+L7Z_NAME= lib7zip
+L7Z_VERSION= 1.4.1
+L7Z_DISTFILE= ${L7Z_NAME}-${L7Z_VERSION}.tar.gz
+L7Z_WRKSRC= ${WRKDIR}/${L7Z_NAME}
+
.include <bsd.port.pre.mk>
-PORTDOCS= Authors ChangeLog README TRANSLATORS_README
-PLIST_FILES= bin/cdcat \
- %%DATADIR%%/cdcat.png \
- %%DATADIR%%/translations/cdcat_cz.qm \
- %%DATADIR%%/translations/cdcat_de.qm \
- %%DATADIR%%/translations/cdcat_el.qm \
- %%DATADIR%%/translations/cdcat_es.qm \
- %%DATADIR%%/translations/cdcat_hu.qm \
- %%DATADIR%%/translations/cdcat_id.qm \
- %%DATADIR%%/translations/cdcat_pl.qm \
- %%DATADIR%%/translations/cdcat_pt.qm \
- %%DATADIR%%/translations/cdcat_sk.qm
-PLIST_DIRS= %%DATADIR%%/translations \
- %%DATADIR%%
+P7Z_WRKSRC!= cd ${PORTSDIR}/archivers/p7zip && ${MAKE} -V WRKSRC
+MIF_WRKSRC!= cd ${PORTSDIR}/multimedia/mediainfo && ${MAKE} -V WRKSRC
+
+post-extract:
+ @${GZCAT} ${DISTDIR}/${L7Z_DISTFILE} | (cd ${WRKDIR} && ${TAR} -xf -)
+ @${LN} -sf ${L7Z_NAME}-${L7Z_VERSION} ${L7Z_WRKSRC}
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-ldl .*||g' ${BUILD_WRKSRC}/${PORTNAME}.pro
+ @${REINPLACE_CMD} -e 's|-ldl||g' ${L7Z_WRKSRC}/Test7Zip/Makefile.in
+
+pre-configure:
+ @cd ${L7Z_WRKSRC} && ./configure --disable-shared \
+ CC="${CC}" CFLAGS="${CFLAGS}" \
+ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ P7ZIP_SOURCE_DIR="${P7Z_WRKSRC}"
do-configure:
- @${LRELEASE} ${BUILD_WRKSRC}/cdcat.pro
- @cd ${BUILD_WRKSRC} && ${QMAKE} cdcat.pro ${QMAKEFLAGS}
+ @${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
+ @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
+ ${PORTNAME}.pro ${QMAKEFLAGS}
+
+pre-build:
+ @cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
do-install:
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/cdcat ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
@${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/cdcat.png ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${DATADIR}
@${MKDIR} ${DATADIR}/translations
${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm ${DATADIR}/translations
.if !defined(NOPORTDOCS)
diff -urN /usr/ports/deskutils/cdcat/distinfo deskutils/cdcat/distinfo
--- /usr/ports/deskutils/cdcat/distinfo 2011-07-03 02:35:46.000000000 +0900
+++ deskutils/cdcat/distinfo 2011-08-13 16:09:16.000000000 +0900
@@ -1,2 +1,4 @@
-SHA256 (cdcat-1.3.tar.bz2) = bd8595de036ee64783ba6e14a865c9e588072735d0315ff1484528d518baf6a1
-SIZE (cdcat-1.3.tar.bz2) = 248555
+SHA256 (cdcat-1.5.tar.bz2) = 586aa5885418b6e4be7fcf888cfa249ec97b4b70a95fefe568ed826094d645a4
+SIZE (cdcat-1.5.tar.bz2) = 287378
+SHA256 (lib7zip-1.4.1.tar.gz) = 20efb640c43c5d05e1f8d641eb0d01f8712648fe7989f275ec5b2997641316d9
+SIZE (lib7zip-1.4.1.tar.gz) = 95080
diff -urN /usr/ports/deskutils/cdcat/files/patch-7zipLibrary.cpp deskutils/cdcat/files/patch-7zipLibrary.cpp
--- /usr/ports/deskutils/cdcat/files/patch-7zipLibrary.cpp 1970-01-01 09:00:00.000000000 +0900
+++ deskutils/cdcat/files/patch-7zipLibrary.cpp 2011-08-06 21:46:09.000000000 +0900
@@ -0,0 +1,34 @@
+--- ../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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110825033538.5a1a60f9.tkato432>