Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Nov 2009 21:09:10 GMT
From:      Oleg Ginzburg <oleg.ginzburg@nevosoft.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/140708: russian/ksocrat Makefile update for kdelibs4. Add MAKE_JOBS_SAFE
Message-ID:  <200911192109.nAJL9ACm072137@www.freebsd.org>
Resent-Message-ID: <200911192110.nAJLA0TJ072443@freefall.freebsd.org>

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

>Number:         140708
>Category:       ports
>Synopsis:       russian/ksocrat Makefile update for kdelibs4. Add MAKE_JOBS_SAFE
>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:   Thu Nov 19 21:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Oleg Ginzburg
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD localhost.my.domain 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Thu Nov 19 21:32:06 MSK 2009     root@localhost.my.domain:/usr/obj/usr/src/sys/GENERIC-NODEBUG  amd64
>Description:
adding kde{3,4}libs selection options
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN ksocrat.bak/Makefile ksocrat/Makefile
--- ksocrat.bak/Makefile	2009-11-19 23:43:09.000000000 +0300
+++ ksocrat/Makefile	2009-11-20 00:04:31.000000000 +0300
@@ -6,7 +6,7 @@
 
 PORTNAME=	ksocrat
 PORTVERSION=	3.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	russian kde
 MASTER_SITES=	http://ksocrat.linux.kiev.ua/download/
 
@@ -19,15 +19,39 @@
 COMMENT=	KSocrat is the simple English/Russian Russian/English dictionary
 
 USE_BZIP2=	yes
-USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
+MAKE_JOBS_SAFE= yes
 
 RESTRICTED=	"Redistribution not allowed"
 NO_CDROM=	${RESTRICTED}
 
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
+OPTIONS=        KDE		"Build with kdelibs3" off \
+                KDE4		"Build with kdelibs4" on
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_KDE) && defined defined(WITH_KDE4)
+IGNORE=         kdelibs3 and kdelibs4 is mutually exclusive. Please rerun 'make config' and disable one of these
+.endif
+
+.if !defined(WITH_KDE) && !defined(WITH_KDE4)
+IGNORE=         kdelibs3 or kdelibs4 must be selected
+.endif
+
+
+
+.if defined(WITH_KDE)
+USE_KDELIBS_VER=3
+.endif
+
+.if defined(WITH_KDE4)
+USE_KDE4=       kdehier kdelibs
+.endif
+
+
 post-install:
 		${INSTALL_DATA} ${WRKDIR}/usr/share/apps/ksocrat/* \
 			 ${PREFIX}/share/apps/ksocrat


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



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