Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Mar 2014 03:25:49 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/187766: graphics/qcomicbook: Update MASTER_SITES and WWW: line
Message-ID:  <20140320032549.a34c1efc7625732561f29321@yahoo.com>
Resent-Message-ID: <201403191840.s2JIe9iA002685@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         187766
>Category:       ports
>Synopsis:       graphics/qcomicbook: Update MASTER_SITES and WWW: line
>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 Mar 19 18:40:09 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line
- Fix build on -current
- Support desktop-file-utils USES macro

New file:
files/patch-src__FrameDetect__CompareFrames.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/qcomicbook/Makefile graphics/qcomicbook/Makefile
--- /usr/ports/graphics/qcomicbook/Makefile	2014-02-15 04:20:22.000000000 +0900
+++ graphics/qcomicbook/Makefile	2014-03-20 00:00:00.000000000 +0900
@@ -3,9 +3,9 @@
 
 PORTNAME=	qcomicbook
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	http://qcomicbook.linux-projects.net/releases/
+MASTER_SITES=	http://qcomicbook.org/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt-based comic book archive viewer
@@ -13,65 +13,51 @@
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
-RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		unrar:${PORTSDIR}/archivers/unrar
-USE_QT4=	corelib gui linguist_build moc_build qmake_build rcc_build \
-		uic_build xml
-USES=		cmake pkgconfig
-
-PLIST_FILES=	\
-		${DESKTOPDIR:S,^${PREFIX}/,,}/${PORTNAME}.desktop \
-		bin/qcomicbook \
-		share/pixmaps/qcomicbook.png \
-		share/qcomicbook/i18n/qcomicbook_cs_CZ.qm \
-		share/qcomicbook/i18n/qcomicbook_de_DE.qm \
-		share/qcomicbook/i18n/qcomicbook_en_EN.qm \
-		share/qcomicbook/i18n/qcomicbook_es_ES.qm \
-		share/qcomicbook/i18n/qcomicbook_it_IT.qm \
-		share/qcomicbook/i18n/qcomicbook_fi_FI.qm \
-		share/qcomicbook/i18n/qcomicbook_fr_FR.qm \
-		share/qcomicbook/i18n/qcomicbook_fr_CA.qm \
-		share/qcomicbook/i18n/qcomicbook_ko_KR.qm \
-		share/qcomicbook/i18n/qcomicbook_nl_NL.qm \
-		share/qcomicbook/i18n/qcomicbook_pl_PL.qm \
-		share/qcomicbook/i18n/qcomicbook_pt_BR.qm \
-		share/qcomicbook/i18n/qcomicbook_ru_RU.qm \
-		share/qcomicbook/i18n/qcomicbook_uk_UA.qm \
-		share/qcomicbook/i18n/qcomicbook_zh_CN.qm
-
-PLIST_DIRS=	share/qcomicbook/i18n \
-		share/qcomicbook
-
-MAN1=		qcomicbook.1
-NO_MANCOMPRESS=	yes
-
-OPTIONS_DEFINE=	7ZIP ACE
-OPTIONS_DEFAULT=7ZIP ACE
+RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
+		unzip:${PORTSDIR}/archivers/unzip
 
-7ZIP_DESC=	7-Zip (.cb7) comic book archives support
-ACE_DESC=	ACE (.cba) comic book archives support
+USES=		cmake desktop-file-utils pkgconfig
+USE_QT4=	corelib gui xml \
+		linguist_build moc_build qmake_build rcc_build uic_build
+
+PLIST_FILES=	bin/qcomicbook \
+		man/man1/qcomicbook.1.gz \
+		share/applications/qcomicbook.desktop \
+		share/pixmaps/qcomicbook.png \
+		%%DATADIR%%/i18n/qcomicbook_cs_CZ.qm \
+		%%DATADIR%%/i18n/qcomicbook_de_DE.qm \
+		%%DATADIR%%/i18n/qcomicbook_en_EN.qm \
+		%%DATADIR%%/i18n/qcomicbook_es_ES.qm \
+		%%DATADIR%%/i18n/qcomicbook_it_IT.qm \
+		%%DATADIR%%/i18n/qcomicbook_fi_FI.qm \
+		%%DATADIR%%/i18n/qcomicbook_fr_FR.qm \
+		%%DATADIR%%/i18n/qcomicbook_fr_CA.qm \
+		%%DATADIR%%/i18n/qcomicbook_ko_KR.qm \
+		%%DATADIR%%/i18n/qcomicbook_nl_NL.qm \
+		%%DATADIR%%/i18n/qcomicbook_pl_PL.qm \
+		%%DATADIR%%/i18n/qcomicbook_pt_BR.qm \
+		%%DATADIR%%/i18n/qcomicbook_ru_RU.qm \
+		%%DATADIR%%/i18n/qcomicbook_uk_UA.qm \
+		%%DATADIR%%/i18n/qcomicbook_zh_CN.qm
+PLIST_DIRS=	%%DATADIR%%/i18n \
+		%%DATADIR%%
+
+OPTIONS_DEFINE=		7ZIP ACE
+OPTIONS_DEFAULT=	7ZIP ACE
+
+7ZIP_DESC=		7-Zip (.cb7) comic book archives support
+7ZIP_RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
+ACE_DESC=		ACE (.cba) comic book archives support
+ACE_RUN_DEPENDS=	unace:${PORTSDIR}/archivers/unace
 
-NO_STAGE=	yes
 post-patch:
 # fix man install directory
-	@${REINPLACE_CMD} -E \
-		-e 's|share/man|man|' \
+	@${REINPLACE_CMD} -e \
+		's|share/man|man|' \
 		${WRKSRC}/help/CMakeLists.txt
 # fix pixmap location
-	@${REINPLACE_CMD} -E \
-		-e 's|(qcomicbook.png)|${PREFIX}/share/pixmaps/\1|' \
+	@${REINPLACE_CMD} -e \
+		's|\(qcomicbook.png\)|${PREFIX}/share/pixmaps/\1|' \
 		${WRKSRC}/data/qcomicbook.desktop
 
-.include <bsd.port.options.mk>
-
-# 7-Zip (.cb7) support
-.if ${PORT_OPTIONS:M7ZIP}
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
-.endif
-
-# ACE (.cba) support
-.if ${PORT_OPTIONS:MACE}
-RUN_DEPENDS+=	unace:${PORTSDIR}/archivers/unace
-.endif
-
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h
--- /usr/ports/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h	1970-01-01 09:00:00.000000000 +0900
+++ graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h	2014-03-20 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- src/FrameDetect/CompareFrames.h.orig
++++ src/FrameDetect/CompareFrames.h
+@@ -14,6 +14,7 @@
+ #define __COMPARE_FRAMES_H
+ 
+ #include <ComicFrame.h>
++#include <cstdlib>
+ 
+ namespace QComicBook
+ {
diff -urN /usr/ports/graphics/qcomicbook/pkg-descr graphics/qcomicbook/pkg-descr
--- /usr/ports/graphics/qcomicbook/pkg-descr	2013-11-06 22:01:47.000000000 +0900
+++ graphics/qcomicbook/pkg-descr	2014-03-20 00:00:00.000000000 +0900
@@ -12,4 +12,4 @@
 	* PDF support
 	* and more... 
 
-WWW: http://qcomicbook.linux-projects.net/
+WWW: http://qcomicbook.org/
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140320032549.a34c1efc7625732561f29321>