From nobody@FreeBSD.org  Sun Jun 21 10:39:54 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1624A106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 21 Jun 2009 10:39:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 03F078FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 21 Jun 2009 10:39:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5LAdre6089794
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 21 Jun 2009 10:39:53 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n5LAdrKk089785;
	Sun, 21 Jun 2009 10:39:53 GMT
	(envelope-from nobody)
Message-Id: <200906211039.n5LAdrKk089785@www.freebsd.org>
Date: Sun, 21 Jun 2009 10:39:53 GMT
From: Max Brazhnikov <makc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: math/abakus: clean up, respect PREFIX/LOCALBASE
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: andy@athame.co.uk

>Number:         135885
>Category:       ports
>Synopsis:       math/abakus: clean up, respect PREFIX/LOCALBASE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 21 10:40:04 UTC 2009
>Closed-Date:    Sun Jun 21 19:39:53 UTC 2009
>Last-Modified:  Sun Jun 21 19:50:00 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jun 21 10:40:16 UTC 2009 
Responsible-Changed-Why:  
itetcu@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135885 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jun 21 10:40:22 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135885 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: andy@athame.co.uk
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/135885: math/abakus: clean up, respect PREFIX/LOCALBASE
Date: Sun, 21 Jun 2009 10:40:18 UT

 Maintainer of math/abakus,
 
 Please note that PR ports/135885 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/135885
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Andy Fawcett <andy@athame.co.uk>
To: bug-followup@freebsd.org,
 Max Brazhnikov <makc@freebsd.org>
Cc:  
Subject: Re: ports/135885: math/abakus: clean up, respect PREFIX/LOCALBASE
Date: Sun, 21 Jun 2009 20:22:24 +0300

 On Sunday 21 June 2009 13:40:18 Edwin Groothuis wrote:
 > Maintainer of math/abakus,
 >
 > Please note that PR ports/135885 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/135885
 
 I'm unable to maintain this port any more, as I don't use FreeBSD on the 
 desktop these days.
 
 I've taken a look at the patch, and it looks good to me, but I have no 
 way of testing it.
 
 Max, would you take maintainership of the port? Or alternatively, put it 
 to ports@ for me please?
 
 Cheers,
 
 Andy
 

From: Max Brazhnikov <makc@freebsd.org>
To: Andy Fawcett <andy@athame.co.uk>
Cc: bug-followup@freebsd.org
Subject: Re: ports/135885: math/abakus: clean up, respect PREFIX/LOCALBASE
Date: Sun, 21 Jun 2009 23:16:25 +0400

 On Sun, 21 Jun 2009 20:22:24 +0300, Andy Fawcett wrote:
 > On Sunday 21 June 2009 13:40:18 Edwin Groothuis wrote:
 > > Maintainer of math/abakus,
 > >
 > > Please note that PR ports/135885 has just been submitted.
 > >
 > > If it contains a patch for an upgrade, an enhancement or a bug fix
 > > you agree on, reply to this email stating that you approve the patch
 > > and a committer will take care of it.
 > >
 > > The full text of the PR can be found at:
 > >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/135885
 >
 > I'm unable to maintain this port any more, as I don't use FreeBSD on the
 > desktop these days.
 >
 > I've taken a look at the patch, and it looks good to me, but I have no
 > way of testing it.
 >
 > Max, would you take maintainership of the port? Or alternatively, put it
 > to ports@ for me please?
 
 Ok Andy, I'll take this port. I'll also reset all your other ports (seems 
 there is sysutils/uptimed only)
 
 Cheers,
 Max
 
 
 
 
State-Changed-From-To: feedback->open 
State-Changed-By: makc 
State-Changed-When: Sun Jun 21 19:39:35 UTC 2009 
State-Changed-Why:  
maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135885 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sun Jun 21 19:39:53 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135885 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135885: commit references a PR
Date: Sun, 21 Jun 2009 19:38:39 +0000 (UTC)

 makc        2009-06-21 19:38:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/abakus          Makefile pkg-descr pkg-plist 
   Added files:
     math/abakus/files    patch-src__SConscript 
   Log:
   1) update MASTER_SITES
   2) clean up Makefile
   3) respect PREFIX/LOCALBASE
   4) install .desktop file to standard place
   5) reduce dependencies
   6) take maintainership
   
   PR:             ports/135885
   Submitted by:   makc (self)
   Approved by:    Andy Fawcett (former maintainer)
   
   Revision  Changes    Path
   1.9       +6 -9      ports/math/abakus/Makefile
   1.1       +9 -0      ports/math/abakus/files/patch-src__SConscript (new)
   1.2       +1 -4      ports/math/abakus/pkg-descr
   1.4       +2 -1      ports/math/abakus/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Andy Fawcett <andy@athame.co.uk>
To: Max Brazhnikov <makc@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/135885: math/abakus: clean up, respect PREFIX/LOCALBASE
Date: Sun, 21 Jun 2009 22:44:24 +0300

 On Sunday 21 June 2009 22:16:25 Max Brazhnikov wrote:
 > On Sun, 21 Jun 2009 20:22:24 +0300, Andy Fawcett wrote:
 > > On Sunday 21 June 2009 13:40:18 Edwin Groothuis wrote:
 > > > Maintainer of math/abakus,
 > > >
 > > > Please note that PR ports/135885 has just been submitted.
 > > >
 > > > If it contains a patch for an upgrade, an enhancement or a bug
 > > > fix you agree on, reply to this email stating that you approve
 > > > the patch and a committer will take care of it.
 > > >
 > > > The full text of the PR can be found at:
 > > >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/135885
 > >
 > > I'm unable to maintain this port any more, as I don't use FreeBSD
 > > on the desktop these days.
 > >
 > > I've taken a look at the patch, and it looks good to me, but I have
 > > no way of testing it.
 > >
 > > Max, would you take maintainership of the port? Or alternatively,
 > > put it to ports@ for me please?
 >
 > Ok Andy, I'll take this port. I'll also reset all your other ports
 > (seems there is sysutils/uptimed only)
 
 Thanks.
 
 I'm ok with uptimed, I still have a few FreeBSD servers, so I can 
 maintain that one.
 
 A.
>Unformatted:
