Date: Thu, 30 Jun 2011 03:02:07 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/158498: Update port: deskutils/cdcat to 1.3 Message-ID: <20110630030207.f07a9607.tkato432@yahoo.com> Resent-Message-ID: <201106291830.p5TIUQk6010404@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158498 >Category: ports >Synopsis: Update port: deskutils/cdcat to 1.3 >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 Jun 29 18:30:25 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 1.3 Remove file: files/patch-src-recode.cpp files/patch-src-tparser.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/deskutils/cdcat/Makefile deskutils/cdcat/Makefile --- /usr/ports/deskutils/cdcat/Makefile 2010-03-28 17:31:10.000000000 +0900 +++ deskutils/cdcat/Makefile 2011-05-30 06:21:07.000000000 +0900 @@ -6,74 +6,58 @@ # PORTNAME= cdcat -PORTVERSION= 1.01b # >1.01 as b doesn't stay for 'beta' -PORTREVISION= 5 +PORTVERSION= 1.3 CATEGORIES= deskutils -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ - http://cdcat.sourceforge.net/ - -DISTNAME= CdCat-${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A QT based tool for offline CD/DVD/disk catalogs -BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -WRKSRC= ${WRKDIR}/CdCat-${PORTVERSION}/src +BUILD_WRKSRC= ${WRKSRC}/src USE_BZIP2= yes -USE_QT_VER= 3 -QTDIR?= ${QT_PREFIX} -USE_GMAKE= yes -MAKE_ENV= QTDIR="${QTDIR}" MAKE="${GMAKE}" \ - QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" +USE_QT_VER= 4 +QT_COMPONENTS= corelib gui qt3support xml \ + linguist_build moc_build qmake_build uic_build +MAKE_JOBS_SAFE= yes -#PLIST= ${WRKDIR}/pkg-plist +LRELEASE= ${QT_PREFIX}/bin/lrelease-qt4 .include <bsd.port.pre.mk> +PORTDOCS= Authors ChangeLog README TRANSLATORS_README PLIST_FILES= bin/cdcat \ - share/cdcat/Authors \ - share/cdcat/COPYING \ - share/cdcat/ChangeLog \ - share/cdcat/README \ - share/cdcat/TRANSLATORS_README \ - share/cdcat/cdcat.png \ - share/cdcat/translations/cdcat_cz.qm \ - share/cdcat/translations/cdcat_de.qm \ - share/cdcat/translations/cdcat_el.qm \ - share/cdcat/translations/cdcat_es.qm \ - share/cdcat/translations/cdcat_fr.qm \ - share/cdcat/translations/cdcat_hu.qm \ - share/cdcat/translations/cdcat_id.qm \ - share/cdcat/translations/cdcat_it.qm \ - share/cdcat/translations/cdcat_pl.qm \ - share/cdcat/translations/cdcat_pt.qm \ - share/cdcat/translations/cdcat_sk.qm \ - share/cdcat/translations/cdcat_sr.qm -PLIST_DIRS= share/cdcat/translations \ - share/cdcat - -post-patch: - @${REINPLACE_CMD} -e 's|importGtktalogCsv\:\:importGtktalogCsv|importGtktalogCsv|' \ - ${WRKSRC}/import.h - -pre-configure: - cd ${WRKSRC} && ${MAKE_ENV} qmake cdcat.pro -.if defined(WITH_KDE) -PLIST_DIRS+= share/apps/cdcat -PLIST_FILES+= share/applications/kde/cdcat.desktop \ - share/apps/cdcat/cdcat.png -.endif - -post-install: -.if defined(WITH_KDE) - ${INSTALL_DATA} ${WRKSRC}/../KDE/cdcat.desktop ${LOCALBASE}/share/applications/kde - ${MKDIR} ${LOCALBASE}/share/apps/cdcat - ${LN} ${LOCALBASE}/share/cdcat/cdcat.png ${LOCALBASE}/share/apps/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%% + +do-configure: + @${LRELEASE} ${BUILD_WRKSRC}/cdcat.pro + @cd ${BUILD_WRKSRC} && ${QMAKE} cdcat.pro ${QMAKEFLAGS} + +do-install: + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/cdcat ${PREFIX}/bin + @${MKDIR} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/cdcat.png ${DATADIR} + @${MKDIR} ${DATADIR}/translations + ${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm ${DATADIR}/translations +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor .endif - ${STRIP_CMD} ${LOCALBASE}/bin/cdcat - .include <bsd.port.post.mk> diff -urN /usr/ports/deskutils/cdcat/distinfo deskutils/cdcat/distinfo --- /usr/ports/deskutils/cdcat/distinfo 2011-03-21 02:04:47.000000000 +0900 +++ deskutils/cdcat/distinfo 2011-05-30 05:13:22.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (CdCat-1.01b.tar.bz2) = dd0a7e72115857e376234e0d926e5a8b2e256119867387e6f9f58085d65f215a -SIZE (CdCat-1.01b.tar.bz2) = 341539 +SHA256 (cdcat-1.3.tar.bz2) = bd8595de036ee64783ba6e14a865c9e588072735d0315ff1484528d518baf6a1 +SIZE (cdcat-1.3.tar.bz2) = 248555 diff -urN /usr/ports/deskutils/cdcat/files/patch-src-recode.cpp deskutils/cdcat/files/patch-src-recode.cpp --- /usr/ports/deskutils/cdcat/files/patch-src-recode.cpp 2006-07-07 03:03:52.000000000 +0900 +++ deskutils/cdcat/files/patch-src-recode.cpp 1970-01-01 09:00:00.000000000 +0900 @@ -1,19 +0,0 @@ -*** ./recode.cpp Mon Aug 22 18:03:00 2005 ---- ../../cdcat.bsd/src/recode.cpp Sun Apr 30 19:47:51 2006 -*************** -*** 12,18 **** - #include <string.h> - #include <stdio.h> - #include <stdlib.h> -! #include <malloc.h> - #include <ctype.h> - - char *recode2(const char *c) ---- 12,18 ---- - #include <string.h> - #include <stdio.h> - #include <stdlib.h> -! /* #include <malloc.h> */ - #include <ctype.h> - - char *recode2(const char *c) diff -urN /usr/ports/deskutils/cdcat/files/patch-src-tparser.cpp deskutils/cdcat/files/patch-src-tparser.cpp --- /usr/ports/deskutils/cdcat/files/patch-src-tparser.cpp 2006-07-07 03:03:52.000000000 +0900 +++ deskutils/cdcat/files/patch-src-tparser.cpp 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ -*** ./tparser.cpp Mon Sep 19 21:52:00 2005 ---- ../../cdcat.bsd/src/tparser.cpp Sun Apr 30 19:56:55 2006 -*************** -*** 27,33 **** - */ - //#include <iostream.h> - //#include <stdio.h> -! #include <malloc.h> - #include <qstring.h> - - #include "tparser.h" ---- 27,34 ---- - */ - //#include <iostream.h> - //#include <stdio.h> -! /*#include <malloc.h> */ -! #include <stdlib.h> - #include <qstring.h> - - #include "tparser.h" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110630030207.f07a9607.tkato432>