Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jun 2009 10:39:53 GMT
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/135885: math/abakus: clean up, respect PREFIX/LOCALBASE
Message-ID:  <200906211039.n5LAdrKk089785@www.freebsd.org>
Resent-Message-ID: <200906211040.n5LAe4u0050064@freefall.freebsd.org>

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

>Number:         135885
>Category:       ports
>Synopsis:       math/abakus: clean up, respect PREFIX/LOCALBASE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 21 10:40:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.2-STABLE FreeBSD 7.2-STABLE #1: Sat Jun 13 20:56:45 MSD 2009     root@luna.dio.ru:/usr/obj/usr/freebsd/7/src/sys/LUNA  i386
>Description:
1) update mastersites
2) clean up Makefile
3) respect PREFIX/LOCALBASE
4) install .desktop file to standard place 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports//math/abakus/Makefile /home/makc/dev/ports/math/abakus/Makefile
--- /usr/ports//math/abakus/Makefile	2009-05-13 13:46:01.000000000 +0400
+++ /home/makc/dev/ports/math/abakus/Makefile	2009-06-21 14:07:10.000000000 +0400
@@ -6,9 +6,9 @@
 
 PORTNAME=	abakus
 PORTVERSION=	0.91
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math kde
-MASTER_SITES=	http://grammarian.homelinux.net/abakus/ \
+MASTER_SITES=	http://purinchu.net/abakus/ \
 		http://www.athame.co.uk/mirror/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
@@ -18,14 +18,11 @@
 BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4
 
-USE_BISON=	build
-PREFIX=		${LOCALBASE}
+USE_BZIP2=	yes
 USE_KDELIBS_VER=3
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	bison=no flex=no prefix=${PREFIX} extraincludes=${LOCALBASE}
 _NO_KDE_CONFTARGET_HACK=	yes
 QT_NONSTANDARD=	yes
 
-HAS_CONFIGURE=	yes
-USE_BZIP2=	yes
-PREFIX=		${LOCALBASE}
-
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports//math/abakus/files/patch-src__SConscript /home/makc/dev/ports/math/abakus/files/patch-src__SConscript
--- /usr/ports//math/abakus/files/patch-src__SConscript	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/dev/ports/math/abakus/files/patch-src__SConscript	2009-06-21 14:26:03.000000000 +0400
@@ -0,0 +1,9 @@
+--- ./src/SConscript.orig	2005-08-17 07:03:14.000000000 +0400
++++ ./src/SConscript	2009-06-21 14:26:00.000000000 +0400
+@@ -77,5 +77,5 @@
+ ## Warning : there is a difference between the normal destop file used for the menu
+ ##     and the servicetype desktop file, so they go in different directories
+ ##     you will find more information in 'test3'
+-myenv.KDEinstall( 'KDEMENU', 'Utilities', 'abakus.desktop')
++myenv.KDEinstall( 'KDEXDG', '', 'abakus.desktop')
+ 
diff -ruN --exclude=CVS /usr/ports//math/abakus/pkg-descr /home/makc/dev/ports/math/abakus/pkg-descr
--- /usr/ports//math/abakus/pkg-descr	2006-01-03 22:56:53.000000000 +0300
+++ /home/makc/dev/ports/math/abakus/pkg-descr	2009-06-21 11:30:07.000000000 +0400
@@ -1,7 +1,4 @@
 Abakus is a simple calculator for KDE, based on a concept of Roberto Alsina's.
 Think of it as bc (the command-line calculator) with a nice GUI.
 
-WWW: http://grammarian.homelinux.net/abakus/
-
-- Andy Fawcett
-andy@athame.co.uk
+WWW:	http://purinchu.net/abakus/
diff -ruN --exclude=CVS /usr/ports//math/abakus/pkg-plist /home/makc/dev/ports/math/abakus/pkg-plist
--- /usr/ports//math/abakus/pkg-plist	2006-09-02 00:24:47.000000000 +0400
+++ /home/makc/dev/ports/math/abakus/pkg-plist	2009-06-21 14:27:24.000000000 +0400
@@ -1,5 +1,5 @@
 bin/abakus
-share/applnk/Utilities/abakus.desktop
+share/applications/kde/abakus.desktop
 share/apps/abakus/abakusui.rc
 share/doc/HTML/en/abakus/abakus-degrees-mode.png
 share/doc/HTML/en/abakus/abakus-dnd.png
@@ -14,3 +14,4 @@
 share/icons/hicolor/64x64/apps/abakus.png
 @dirrm share/doc/HTML/en/abakus
 @dirrm share/apps/abakus
+@dirrmtry share/applications/kde


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



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