Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 07 May 2014 08:38:32 +0200
From:      Zsolt Udvari <udvzsolt@gmail.com>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        udvzsolt@gmail.com
Subject:   ports/189408: [patch] deskutils/fet update to 5.21.3, allow build only CLI version
Message-ID:  <5369d4f6.842f0e0a.1244.0d24@mx.google.com>
Resent-Message-ID: <201405070640.s476e0FC059995@freefall.freebsd.org>

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

>Number:         189408
>Category:       ports
>Synopsis:       [patch] deskutils/fet update to 5.21.3, allow build only CLI version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 07 06:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Zsolt Udvari
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD bsd-zsolt 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
- update to 5.21.3
- allow build a CLI version, so doesn't need qt4-gui

ports/187823 is outdated because of this.
>How-To-Repeat:
>Fix:

--- fet.diff begins here ---
diff -ur fet.orig/Makefile fet/Makefile
--- fet.orig/Makefile	2014-03-21 16:45:04.000000000 +0100
+++ fet/Makefile	2014-05-07 08:34:46.000000000 +0200
@@ -2,7 +2,7 @@
 # $FreeBSD: head/deskutils/fet/Makefile 346926 2014-03-03 16:23:00Z pawel $
 
 PORTNAME=	fet
-PORTVERSION=	5.21.0
+PORTVERSION=	5.21.3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
 		http://lalescu.ro/liviu/fet/download/old/ \
@@ -17,7 +17,7 @@
 
 USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	gui network xml \
+USE_QT4=	network xml \
 		moc_build rcc_build uic_build
 
 PORTEXAMPLES=	*
@@ -29,15 +29,22 @@
 		"Education;Qt;" \
 		true
 
-OPTIONS_DEFINE=	EXAMPLES NLS
+INSTALL_TARGET=${WRKSRC}/fet-cl
+
+OPTIONS_DEFINE=	EXAMPLES NLS ONLYCL
+ONLYCL_DESC= Build only command line version (without Qt4 GUI)
+
 OPTIONS_SUB=	yes
+ONLYCL_QMAKE_PRO=	src/src-cl.pro
+ONLYCL_USE_QT4_OFF=	gui
+ONLYCL_INSTALL_TARGET_OFF= ${WRKSRC}/fet
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
 		${WRKSRC}/src/interface/fet.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fet ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${INSTALL_TARGET} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/fet.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff -ur fet.orig/distinfo fet/distinfo
--- fet.orig/distinfo	2014-03-21 16:45:04.000000000 +0100
+++ fet/distinfo	2014-05-07 08:07:16.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (fet-5.21.0.tar.bz2) = 9a90ac129d6ccec07c50a5fb1d48de854ddeaceb855e918be8be5c89a667da89
-SIZE (fet-5.21.0.tar.bz2) = 8056540
+SHA256 (fet-5.21.3.tar.bz2) = 69e75f81ab3af2ee49b8c0ae7f642cb6c96e94df875a54517ce1291e81cb281f
+SIZE (fet-5.21.1.tar.bz2) = 8380210 
diff -ur fet.orig/pkg-plist fet/pkg-plist
--- fet.orig/pkg-plist	2014-03-21 16:45:04.000000000 +0100
+++ fet/pkg-plist	2014-03-21 17:47:09.000000000 +0100
@@ -1,4 +1,4 @@
-bin/fet
+%%NO_ONLYCL%%bin/fet
 bin/fet-cl
 man/man1/fet.1.gz
 %%NLS%%%%DATADIR%%/translations/fet_ar.qm
--- fet.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5369d4f6.842f0e0a.1244.0d24>