Bug 175585 - deskutils/cdcat: Update to version 2.2
Summary: deskutils/cdcat: Update to version 2.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Jason E. Hale
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-25 21:10 UTC by tkato432
Modified: 2014-02-27 14:10 UTC (History)
0 users

See Also:


Attachments
file.diff (1.60 KB, patch)
2013-01-25 21:10 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (1.93 KB, patch)
2013-02-05 18:27 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (1.95 KB, patch)
2013-03-19 17:51 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (1.95 KB, patch)
2013-04-24 18:54 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (1.94 KB, patch)
2013-08-18 18:50 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (6.21 KB, patch)
2013-10-09 18:55 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (6.23 KB, patch)
2013-10-14 18:50 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (6.23 KB, patch)
2013-11-22 18:00 UTC, tkato432
no flags Details | Diff
deskutils_cdcat.diff (6.25 KB, patch)
2013-11-26 18:00 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-01-25 21:10:05 UTC
- Update to version 2.2
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-01-25 21:12:01 UTC
Responsible Changed
From-To: freebsd-ports-bugs->araujo

araujo@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-02-05 05:35:01 UTC
State Changed
From-To: open->feedback

Hi, 

Distfile fails to fetch: 

kg_add pixman-0.24.2.tbz skipping pixman-0.24.2, already added pkg_add 
xcb-util-renderutil-0.3.8.tbz skipping xcb-util-renderutil-0.3.8, 
already added pkg_add xcb-util-0.3.9_1,1.tbz skipping 
xcb-util-0.3.9_1,1, already added pkg_add 
gtk-update-icon-cache-2.24.6_1.tbz pkg_add libtar-1.2.11_2.tbz pkg_add 
libexif-0.6.20.tbz ===>   cdcat-2.2 depends on file: /nonexistent - not 
found ===>    Verifying patch for /nonexistent in 
/usr/ports/archivers/p7zip => p7zip_9.20.1_src_all.tar.bz2 doesn't seem 
to exist in /tmp/distfiles/.  => Attempting to fetch 
http://heanet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://heanet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://sunet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://sunet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://iweb.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://iweb.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://switch.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://switch.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://freefr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://freefr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://garr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://garr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://aarnet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://aarnet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://jaist.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://jaist.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://osdn.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://osdn.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://nchc.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://nchc.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://ncu.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://ncu.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://internode.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://internode.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://waix.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://waix.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://hivelocity.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://hivelocity.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://superb-dca3.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://superb-dca3.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://ufpr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://ufpr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://tenet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://tenet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://space.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://space.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://netcologne.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://netcologne.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://ignum.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://ignum.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Couldn't fetch it - please try to retrieve this => 
port manually into /tmp/distfiles/ and try again.  *** [do-fetch] Error 
code 1 

Stop in /a/ports/archivers/p7zip.  *** [build-depends] Error code 1 

Stop in /a/ports/deskutils/cdcat. 
================================================================ build 
of /usr/ports/deskutils/cdcat ended at Tue Feb  5 05:24:51 UTC 
2013kg_add pixman-0.24.2.tbz skipping pixman-0.24.2, already added 
pkg_add xcb-util-renderutil-0.3.8.tbz skipping 
xcb-util-renderutil-0.3.8, already added pkg_add xcb-util-0.3.9_1,1.tbz 
skipping xcb-util-0.3.9_1,1, already added pkg_add 
gtk-update-icon-cache-2.24.6_1.tbz pkg_add libtar-1.2.11_2.tbz pkg_add 
libexif-0.6.20.tbz ===>   cdcat-2.2 depends on file: /nonexistent - not 
found ===>    Verifying patch for /nonexistent in 
/usr/ports/archivers/p7zip => p7zip_9.20.1_src_all.tar.bz2 doesn't seem 
to exist in /tmp/distfiles/.  => Attempting to fetch 
http://heanet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://heanet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://sunet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://sunet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://iweb.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://iweb.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://switch.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://switch.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://freefr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://freefr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://garr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://garr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://aarnet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://aarnet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://jaist.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://jaist.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://osdn.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://osdn.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://nchc.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://nchc.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://ncu.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://ncu.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://internode.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://internode.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://waix.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://waix.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://hivelocity.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://hivelocity.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://superb-dca3.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://superb-dca3.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://ufpr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://ufpr.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://tenet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://tenet.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://space.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://space.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://netcologne.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://netcologne.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
http://ignum.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
http://ignum.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Attempting to fetch 
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/p7zip_9.20.1_src_all.tar.bz2 
fetch: 
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/p7zip_9.20.1_src_all.tar.bz2: 
No address record => Couldn't fetch it - please try to retrieve this => 
port manually into /tmp/distfiles/ and try again.  *** [do-fetch] Error 
code 1 

Stop in /a/ports/archivers/p7zip.  *** [build-depends] Error code 1 

Stop in /a/ports/deskutils/cdcat. 
================================================================ build 
of /usr/ports/deskutils/cdcat ended at Tue Feb  5 05:24:51 UTC 2013
Comment 3 tkato432 2013-02-05 18:27:16 UTC
Here is the corrected patch.
Comment 4 Marcelo Araujo freebsd_committer freebsd_triage 2013-02-27 07:23:11 UTC
State Changed
From-To: feedback->open

Feedback received.
Comment 5 tkato432 2013-03-19 17:51:12 UTC
Remake of the patch against current tree.
Comment 6 tkato432 2013-04-24 18:54:12 UTC
Remake of the patch against current tree.
Comment 7 Marcelo Araujo freebsd_committer freebsd_triage 2013-06-25 04:08:37 UTC
Responsible Changed
From-To: araujo->freebsd-ports-bugs

- I have no time to take care of it anymore.
Comment 8 tkato432 2013-08-18 18:50:58 UTC
Remake of the patch against current tree.
Comment 9 tkato432 2013-10-09 18:55:03 UTC
Version 2.3.1 has been released.
Comment 10 Jason E. Hale freebsd_committer freebsd_triage 2013-10-10 08:45:59 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jhale

I'll take it.
Comment 11 tkato432 2013-10-14 18:50:33 UTC
Remake of the patch against current tree.
Comment 12 tkato432 2013-11-22 18:00:01 UTC
Remake of the patch against current tree.
Comment 13 tkato432 2013-11-26 18:00:00 UTC
Remake of the patch against current tree.
Comment 14 Martin Wilke freebsd_committer freebsd_triage 2014-02-27 14:07:09 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 15 dfilter service freebsd_committer freebsd_triage 2014-02-27 14:07:13 UTC
Author: miwi
Date: Thu Feb 27 14:07:04 2014
New Revision: 346339
URL: http://svnweb.freebsd.org/changeset/ports/346339
QAT: https://qat.redports.org/buildarchive/r346339/

Log:
  - Update to 2.3.1
  - Stage support
  
  PR:		175585
  Submitted by:	ports fury

Added:
  head/deskutils/cdcat/files/
  head/deskutils/cdcat/files/patch-src__exportcdcatdb.cpp   (contents, props changed)
Modified:
  head/deskutils/cdcat/Makefile
  head/deskutils/cdcat/distinfo

Modified: head/deskutils/cdcat/Makefile
==============================================================================
--- head/deskutils/cdcat/Makefile	Thu Feb 27 14:06:16 2014	(r346338)
+++ head/deskutils/cdcat/Makefile	Thu Feb 27 14:07:04 2014	(r346339)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cdcat
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		GOOGLE_CODE:lib7zip
@@ -19,7 +18,8 @@ LICENSE=	GPLv2 MPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \
-		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build
+		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build \
+		cryptopp>0:${PORTSDIR}/security/cryptopp
 LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar \
 		libexif.so:${PORTSDIR}/graphics/libexif
 
@@ -28,30 +28,29 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 
-USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	corelib gui xml \
-		linguist_build moc_build uic_build
-INSTALLS_ICONS=	yes
-
-QMAKE_ARGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
+USES=		qmake:norecursive
+USE_QT4=	corelib gui xml linguist_build moc_build uic_build
+QMAKE_ARGS=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		INCLUDEPATH+="${MIF_WRKSRC}/MediaInfoLib/Source" \
 		INCLUDEPATH+="${MIF_WRKSRC}/ZenLib/Source" \
 		LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a" \
 		LIBS+="${MIF_WRKSRC}/MediaInfoLib/Project/GNU/Library/.libs/libmediainfo.a" \
 		LIBS+="${MIF_WRKSRC}/ZenLib/Project/GNU/Library/.libs/libzen.a" \
+		LIBS+="${LOCALBASE}/lib/libcryptopp.a" \
 		LIBS+="-lz -lbz2 -ltar -lexif" \
 		DEFINES+="MEDIAINFO_STATIC" \
 		DEFINES+="MEDIAINFO_UNICODE" \
 		DEFINES+="USE_LIBEXIF"
-QMAKE_SOURCE_PATH=	${BUILD_WRKSRC}/cdcat.pro
+QMAKE_SOURCE_PATH=	${BUILD_WRKSRC}/${PORTNAME}.pro
+INSTALLS_ICONS=	yes
 
 # spoof tinderbox: build deps for multimedia/mediainfo
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 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
+.for lang in cz de el es fr hu id it pl pt ru sk sr
 PLIST_FILES+=	%%DATADIR%%/translations/${PORTNAME}_${lang}.qm
 .endfor
 .for size in 16 22 32 48 64
@@ -60,8 +59,11 @@ PLIST_FILES+=	share/icons/hicolor/${size
 PLIST_FILES+=	share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
 PLIST_DIRS=	%%DATADIR%%/translations %%DATADIR%%
 
+DESKTOP_ENTRIES="CdCat" "Hyper's CD Catalog" "${DATADIR}/${PORTNAME}.png" \
+		"${PORTNAME}" "AudioVideo;Qt;" ""
+
 L7Z_NAME=	lib7zip
-L7Z_VERSION=	1.6.3
+L7Z_VERSION=	1.6.5
 L7Z_DISTFILE=	${L7Z_NAME}-${L7Z_VERSION}.tar.gz
 L7Z_WRKSRC=	${WRKDIR}/${L7Z_NAME}
 
@@ -76,9 +78,13 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/cdcat.pro
+		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e \
 		's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp
+.for i in newdbdialog.cpp wdbfile.h
+	@${REINPLACE_CMD} -e \
+		's|crypto++/|cryptopp/|' ${BUILD_WRKSRC}/${i}
+.endfor
 	@${REINPLACE_CMD} -e \
 		's|-ldl||' ${L7Z_WRKSRC}/Test7Zip/Makefile.in
 
@@ -87,29 +93,32 @@ pre-configure:
 		CC="${CC}" CFLAGS="${CFLAGS}" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		P7ZIP_SOURCE_DIR="${P7Z_WRKSRC}"
-	@${LRELEASE} ${BUILD_WRKSRC}/cdcat.pro
+	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
 
 pre-build:
-	@cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
+	@cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}.png \
+		${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
-	${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm ${STAGEDIR}${DATADIR}/translations
+	(cd ${BUILD_WRKSRC}/lang && ${INSTALL_DATA} *.qm \
+		${STAGEDIR}${DATADIR}/translations)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo.svg \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps)
 .for size in 16 22 32 48 64
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo_${size}x${size}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png)
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.post.mk>

Modified: head/deskutils/cdcat/distinfo
==============================================================================
--- head/deskutils/cdcat/distinfo	Thu Feb 27 14:06:16 2014	(r346338)
+++ head/deskutils/cdcat/distinfo	Thu Feb 27 14:07:04 2014	(r346339)
@@ -1,4 +1,4 @@
-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
+SHA256 (cdcat-2.3.1.tar.bz2) = 7cb1bbd7646faf93359acda5835f510766c82e612bca577282571f13a8d5f01c
+SIZE (cdcat-2.3.1.tar.bz2) = 428708
+SHA256 (lib7zip-1.6.5.tar.gz) = a6fb9118657c71db5b40068cd6ddd35430818aaa21aa2d0af4d6c3309e9f2a38
+SIZE (lib7zip-1.6.5.tar.gz) = 359986

Added: head/deskutils/cdcat/files/patch-src__exportcdcatdb.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/cdcat/files/patch-src__exportcdcatdb.cpp	Thu Feb 27 14:07:04 2014	(r346339)
@@ -0,0 +1,10 @@
+--- src/exportcdcatdb.cpp.orig
++++ src/exportcdcatdb.cpp
+@@ -30,6 +30,7 @@
+ #include <QGridLayout>
+ #include <QVBoxLayout>
+ #include <iostream>
++#include <unistd.h>
+ 
+ #include "icons.h"
+ #include "cdcat.h"
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"