Attachment #184681 for bug #220984





PORTNAME=	znotes
PORTVERSION=	0.4.5
PORTREVISION=	3
CATEGORIES=	deskutils

USE_GITHUB=	yes
GH_ACCOUNT=	proton
GH_PROJECT=	zNotes
GH_TAGNAME=	6423c5e

MAINTAINER=	vg@FreeBSD.org
COMMENT=	Simple notes managment application based on Qt

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		qmake
QT4_USE=	QT4=uic_build,moc_build,rcc_build,linguisttools_build,corelib,gui,network,xml
QT5_USE=	QT5=buildtools_build,linguisttools_build,core,gui,network,printsupport,widgets,xml

OPTIONS_SINGLE=		QT
OPTIONS_SINGLE_QT=	QT4 QT5
OPTIONS_DEFAULT=	QT5

QMAKE_ARGS=	QMAKE_LRELEASE=${LRELEASE}

DESKTOP_ENTRIES="zNotes" "Notes managment" \

OPTIONS_DEFINE=		NLS
OPTIONS_SUB=		yes

post-patch:
	@${REINPLACE_CMD} -e '/.path =/s|/usr|$$$$PREFIX|g' \
		-e '/PREFIX = /d' \
		${WRKSRC}/${PORTNAME}.pro
	@${REINPLACE_CMD} -i -e 's,QCoreApplication::applicationDirPath()+"/translations","${DATADIR}/translations",g' \
		${WRKSRC}/settings.cpp

pre-configure:
#Work around badly written .pro
	${LRELEASE} ${WRKSRC}/${PORTNAME}.pro

Lines 1-2 Link Here

(-)b/deskutils/znotes/distinfo (-2 / +3 lines)
1	SHA256 (znotes-0.4.5.tar.gz) = ac692253e74bda8f989db40042c26b6db2bb60a5f9c30cdbfcd824af0de1c5b2	1	TIMESTAMP = 1500936060
2	SIZE (znotes-0.4.5.tar.gz) = 171884	2	SHA256 (proton-zNotes-0.4.5-6423c5e_GH0.tar.gz) = 93a9708a7c2522197e442d0aa28c9c20b13815c192ef8c51ced0006f6b352d2c
		3	SIZE (proton-zNotes-0.4.5-6423c5e_GH0.tar.gz) = 725999




--- single_inst/qtlocalpeer.cpp.orig	2011-08-27 08:25:14 UTC
+++ single_inst/qtlocalpeer.cpp
@@ -58,9 +58,7 @@ static PProcessIdToSessionId pProcessIdT
 #if defined(Q_OS_UNIX)
 #include <time.h>
 #endif
-#if defined(Q_OS_OS2)
 #include <unistd.h>
-#endif
 
 namespace QtLP_Private {
 #include "qtlockedfile.cpp"




/usr/bin/znotes
/usr/share/applications/znotes.desktop
/usr/share/pixmaps/znotes.png
/usr/%%DATADIR%%/translations/znotes_cs.qm
/usr/%%DATADIR%%/translations/znotes_de.qm
/usr/%%DATADIR%%/translations/znotes_en.qm
/usr/%%DATADIR%%/translations/znotes_es.qm
/usr/%%DATADIR%%/translations/znotes_pl.qm
/usr/%%DATADIR%%/translations/znotes_pt_BR.qm
/usr/%%DATADIR%%/translations/znotes_ru.qm
/usr/%%DATADIR%%/translations/znotes_sk.qm
/usr/%%DATADIR%%/translations/znotes_sv.qm
/usr/%%DATADIR%%/translations/znotes_uk.qm
@dir /usr/share/applications
@dir /usr/share/pixmaps
@dir /usr/%%DATADIR%%/translations
@dir /usr/%%DATADIR%%

Return to bug 220984

Lines 3-21 Link Here

(-)b/deskutils/znotes/Makefile (-12 / +14 lines)
3		3
4	PORTNAME= znotes	4	PORTNAME= znotes
5	PORTVERSION= 0.4.5	5	PORTVERSION= 0.4.5
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= deskutils	7	CATEGORIES= deskutils
8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/	8
		9	USE_GITHUB= yes
		10	GH_ACCOUNT= proton
		11	GH_PROJECT= zNotes
		12	GH_TAGNAME= 6423c5e
9		13
10	MAINTAINER= vg@FreeBSD.org	14	MAINTAINER= vg@FreeBSD.org
11	COMMENT= Simple notes managment application based on Qt 4	15	COMMENT= Simple notes managment application based on Qt
12		16
13	LICENSE= GPLv3	17	LICENSE= GPLv3
14	LICENSE_FILE= ${WRKSRC}/LICENSE	18	LICENSE_FILE= ${WRKSRC}/LICENSE
15		19
16	USES= qmake	20	USES= qmake
17	USE_QT4= corelib gui network xml uic_build moc_build rcc_build \	21	QT4_USE= QT4=uic_build,moc_build,rcc_build,linguisttools_build,corelib,gui,network,xml
18	linguisttools_build	22	QT5_USE= QT5=buildtools_build,linguisttools_build,core,gui,network,printsupport,widgets,xml
		23
		24	OPTIONS_SINGLE= QT
		25	OPTIONS_SINGLE_QT= QT4 QT5
		26	OPTIONS_DEFAULT= QT5
		27
19	QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE}	28	QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE}
20		29
21	DESKTOP_ENTRIES="zNotes" "Notes managment" \	30	DESKTOP_ENTRIES="zNotes" "Notes managment" \
Lines 25-37 DESKTOP_ENTRIES="zNotes" "Notes managment" \ Link Here
25	OPTIONS_DEFINE= NLS	34	OPTIONS_DEFINE= NLS
26	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
27		36
28	post-patch:
29	@${REINPLACE_CMD} -e '/.path =/s\|/usr\|$$$$PREFIX\|g' \
30	-e '/PREFIX = /d' \
31	${WRKSRC}/${PORTNAME}.pro
32	@${REINPLACE_CMD} -i -e 's,QCoreApplication::applicationDirPath()+"/translations","${DATADIR}/translations",g' \
33	${WRKSRC}/settings.cpp
34
35	pre-configure:	37	pre-configure:
36	#Work around badly written .pro	38	#Work around badly written .pro
37	${LRELEASE} ${WRKSRC}/${PORTNAME}.pro	39	${LRELEASE} ${WRKSRC}/${PORTNAME}.pro

Removed Link Here

(-)a/deskutils/znotes/files/patch-single__inst_qtlocalpeer.cpp (-12 lines)
1	--- single_inst/qtlocalpeer.cpp.orig 2011-08-27 08:25:14 UTC
2	+++ single_inst/qtlocalpeer.cpp
3	@@ -58,9 +58,7 @@ static PProcessIdToSessionId pProcessIdT
4	#if defined(Q_OS_UNIX)
5	#include <time.h>
6	#endif
7	-#if defined(Q_OS_OS2)
8	#include <unistd.h>
9	-#endif
10
11	namespace QtLP_Private {
12	#include "qtlockedfile.cpp"

Lines 1-9 Link Here

(-)b/deskutils/znotes/pkg-plist (-9 / +17 lines)
1	bin/znotes	1	/usr/bin/znotes
2	share/pixmaps/znotes.png	2	/usr/share/applications/znotes.desktop
3	%%NLS%%%%DATADIR%%/translations/znotes_cs.qm	3	/usr/share/pixmaps/znotes.png
4	%%NLS%%%%DATADIR%%/translations/znotes_en.qm	4	/usr/%%DATADIR%%/translations/znotes_cs.qm
5	%%NLS%%%%DATADIR%%/translations/znotes_es.qm	5	/usr/%%DATADIR%%/translations/znotes_de.qm
6	%%NLS%%%%DATADIR%%/translations/znotes_pt_BR.qm	6	/usr/%%DATADIR%%/translations/znotes_en.qm
7	%%NLS%%%%DATADIR%%/translations/znotes_ru.qm	7	/usr/%%DATADIR%%/translations/znotes_es.qm
8	%%NLS%%%%DATADIR%%/translations/znotes_sk.qm	8	/usr/%%DATADIR%%/translations/znotes_pl.qm
9	%%NLS%%%%DATADIR%%/translations/znotes_uk.qm	9	/usr/%%DATADIR%%/translations/znotes_pt_BR.qm
		10	/usr/%%DATADIR%%/translations/znotes_ru.qm
		11	/usr/%%DATADIR%%/translations/znotes_sk.qm
		12	/usr/%%DATADIR%%/translations/znotes_sv.qm
		13	/usr/%%DATADIR%%/translations/znotes_uk.qm
		14	@dir /usr/share/applications
		15	@dir /usr/share/pixmaps
		16	@dir /usr/%%DATADIR%%/translations
		17	@dir /usr/%%DATADIR%%