Attachment 188800 Details for Bug 224319 – Patch.

[patch] Patch.

fet-5.34.2.diff (text/plain), 7.14 KB, created by Zsolt Udvari on 2017-12-13 08:12:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2017-12-13 08:12:39 UTC

Size: 7.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 456186)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	fet
>-DISTVERSION=	5.34.0
>+DISTVERSION=	5.34.2
> CATEGORIES=	deskutils kde
> MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
> 		http://lalescu.ro/liviu/fet/download/old/ \
>@@ -15,45 +15,63 @@
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		qmake tar:bzip2
>+USES=		tar:bzip2
> 
> PORTEXAMPLES=	*
> 
>-DESKTOP_ENTRIES="FET" \
>-		"Free timetable software" \
>-		"" \
>-		"fet" \
>-		"Education;Qt;" \
>-		true
>-
>-OPTIONS_DEFINE=	EXAMPLES NLS ONLYCL
>+OPTIONS_DEFINE=	NLS
> OPTIONS_SINGLE=	QTVER
> OPTIONS_SINGLE_QTVER=	QT4 QT5
> OPTIONS_DEFAULT=	QT4
> ONLYCL_DESC=	Build only command line version (without Qt GUI)
> 
>+FLAVORS=	gui cli examples
>+cli_PKGNAMESUFFIX=	-cli
>+examples_PKGNAMESUFFIX=	-examples
>+
> OPTIONS_SUB=	yes
> 
>-QT4_USE=	QT4=corelib,moc_build,rcc_build,uic_build,xml
>-QT5_USE=	QT5=buildtools_build,core,xml GL=gl
>-
> .include <bsd.port.options.mk>
> 
>+.if ${FLAVOR:U} == examples
>+
>+NO_BUILD=	yes
>+PLIST_SUB+=	EXAMPLES="@comment "
>+do-install:
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
>+
>+.else
>+
>+USES+=	qmake
>+.	if ${FLAVOR:U} == cli
>+PLIST_SUB+=	CLI="" EXAMPLES="" GUI="@comment "
> INSTALL_TARGET=	${WRKSRC}/fet-cl
>-.if ${PORT_OPTIONS:MONLYCL}
> QMAKE_SOURCE_PATH=	${WRKSRC}/src/src-cl.pro
>-.else
>-INSTALL_TARGET+=	${WRKSRC}/fet
>-.if ${PORT_OPTIONS:MQT4}
>-USE_QT4+=gui network
>-.else
>+.		if ${PORT_OPTIONS:MQT4}
>+USE_QT4+=corelib moc_build rcc_build uic_build xml
>+.		else
>+USE_QT5+=	buildtools_build core xml
>+USE_GL=	gl
>+.		endif
>+.	else
>+DESKTOP_ENTRIES="FET" \
>+		"Free timetable software" \
>+		"" \
>+		"fet" \
>+		"Education;Qt;" \
>+		true
>+PLIST_SUB+=	CLI="@comment " EXAMPLES="" GUI=""
>+INSTALL_TARGET=	${WRKSRC}/fet
>+.		if ${PORT_OPTIONS:MQT4}
>+USE_QT4+=gui network corelib moc_build rcc_build uic_build xml
>+.		else
>+USE_QT5+=	buildtools_build core xml
>+USE_GL=	gl
> USE_QT5+=gui network printsupport widgets
>-.endif
>-.endif
>+.		endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
>-		${WRKSRC}/src/interface/fet.cpp
>+.	endif
> 
> do-install:
> 	${INSTALL_PROGRAM} ${INSTALL_TARGET} ${STAGEDIR}${PREFIX}/bin
>@@ -62,8 +80,10 @@
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
> 	cd ${WRKSRC}/translations && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR}/translations
> 
>-do-install-EXAMPLES-on:
>-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
>+.endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
>+		${WRKSRC}/src/interface/fet.cpp
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 456186)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1509887144
>-SHA256 (fet-5.34.0.tar.bz2) = a049cd89d7a6ed73e67758d1a01ee740fdaa245943be2911c0a9002dda27a836
>-SIZE (fet-5.34.0.tar.bz2) = 11200465
>+TIMESTAMP = 1512997210
>+SHA256 (fet-5.34.2.tar.bz2) = 201d280e1d0dcfe19882e8a6b14713906ef85373a0be609fc392fb9fe2008d23
>+SIZE (fet-5.34.2.tar.bz2) = 11186514
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 456186)
>+++ pkg-plist	(working copy)
>@@ -1,39 +1,39 @@
>-%%NO_ONLYCL%%bin/fet
>-bin/fet-cl
>-man/man1/fet.1.gz
>-man/man1/fet-cl.1.gz
>-%%NLS%%%%DATADIR%%/translations/fet_ar.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ca.qm
>-%%NLS%%%%DATADIR%%/translations/fet_cs.qm
>-%%NLS%%%%DATADIR%%/translations/fet_da.qm
>-%%NLS%%%%DATADIR%%/translations/fet_de.qm
>-%%NLS%%%%DATADIR%%/translations/fet_el.qm
>-%%NLS%%%%DATADIR%%/translations/fet_en_GB.qm
>-%%NLS%%%%DATADIR%%/translations/fet_es.qm
>-%%NLS%%%%DATADIR%%/translations/fet_eu.qm
>-%%NLS%%%%DATADIR%%/translations/fet_fa.qm
>-%%NLS%%%%DATADIR%%/translations/fet_fr.qm
>-%%NLS%%%%DATADIR%%/translations/fet_gl.qm
>-%%NLS%%%%DATADIR%%/translations/fet_he.qm
>-%%NLS%%%%DATADIR%%/translations/fet_hu.qm
>-%%NLS%%%%DATADIR%%/translations/fet_id.qm
>-%%NLS%%%%DATADIR%%/translations/fet_it.qm
>-%%NLS%%%%DATADIR%%/translations/fet_lt.qm
>-%%NLS%%%%DATADIR%%/translations/fet_mk.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ms.qm
>-%%NLS%%%%DATADIR%%/translations/fet_nl.qm
>-%%NLS%%%%DATADIR%%/translations/fet_pl.qm
>-%%NLS%%%%DATADIR%%/translations/fet_pt_BR.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ro.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ru.qm
>-%%NLS%%%%DATADIR%%/translations/fet_si.qm
>-%%NLS%%%%DATADIR%%/translations/fet_sk.qm
>-%%NLS%%%%DATADIR%%/translations/fet_sr.qm
>-%%NLS%%%%DATADIR%%/translations/fet_sq.qm
>-%%NLS%%%%DATADIR%%/translations/fet_tr.qm
>-%%NLS%%%%DATADIR%%/translations/fet_uk.qm
>-%%NLS%%%%DATADIR%%/translations/fet_untranslated.qm
>-%%NLS%%%%DATADIR%%/translations/fet_uz.qm
>-%%NLS%%%%DATADIR%%/translations/fet_vi.qm
>-%%NLS%%%%DATADIR%%/translations/fet_zh_CN.qm
>-%%NLS%%%%DATADIR%%/translations/fet_zh_TW.qm
>+%%EXAMPLES%%%%GUI%%bin/fet
>+%%EXAMPLES%%%%CLI%%bin/fet-cl
>+%%EXAMPLES%%%%GUI%%man/man1/fet.1.gz
>+%%EXAMPLES%%%%CLI%%man/man1/fet-cl.1.gz
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ar.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ca.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_cs.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_da.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_de.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_el.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_en_GB.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_es.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_eu.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_fa.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_fr.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_gl.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_he.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_hu.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_id.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_it.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_lt.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_mk.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ms.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_nl.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_pl.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_pt_BR.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ro.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ru.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_si.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sk.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sr.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sq.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_tr.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_uk.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_untranslated.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_uz.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_vi.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_zh_CN.qm
>+%%EXAMPLES%%%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_zh_TW.qm

Flags:

uzsolt: maintainer-approval+

Actions: View | Diff

Attachments on bug 224319: 188800 | 189107 | 189108 | 189619 | 189890 | 191329 | 191727