From glebius@cell.glebius.int.ru  Sun Apr 26 11:10:55 2009
Return-Path: <glebius@cell.glebius.int.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F14D1065672
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 26 Apr 2009 11:10:55 +0000 (UTC)
	(envelope-from glebius@cell.glebius.int.ru)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.130])
	by mx1.freebsd.org (Postfix) with ESMTP id C83288FC1C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 26 Apr 2009 11:10:54 +0000 (UTC)
	(envelope-from glebius@cell.glebius.int.ru)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
	by cell.glebius.int.ru (8.14.3/8.14.3) with ESMTP id n3QAkVva060262;
	Sun, 26 Apr 2009 14:46:31 +0400 (MSD)
	(envelope-from glebius@cell.glebius.int.ru)
Received: (from glebius@localhost)
	by cell.glebius.int.ru (8.14.3/8.14.3/Submit) id n3QAkVUn060261;
	Sun, 26 Apr 2009 14:46:31 +0400 (MSD)
	(envelope-from glebius)
Message-Id: <200904261046.n3QAkVUn060261@cell.glebius.int.ru>
Date: Sun, 26 Apr 2009 14:46:31 +0400 (MSD)
From: Gleb Smirnoff <glebius@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: wenheping@gmail.com
Subject: [patch] graphics/mapnik should install library with correct name
X-Send-Pr-Version: 3.113
X-GNATS-Notify: wenheping@gmail.com

>Number:         134015
>Category:       ports
>Synopsis:       [patch] graphics/mapnik should install library with correct name
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 26 11:20:00 UTC 2009
>Closed-Date:    Wed May 20 21:48:10 UTC 2009
>Last-Modified:  Wed May 20 21:50:03 UTC 2009
>Originator:     Gleb Smirnoff
>Release:        FreeBSD 7.1-STABLE i386
>Organization:
Rambler Internet Holding
>Environment:
System: FreeBSD cell.glebius.int.ru 7.1-STABLE FreeBSD 7.1-STABLE #0: Thu Feb 26 13:01:21 MSK 2009 glebius@cell.glebius.int.ru:/usr/obj/usr/src/sys/NUCLEUS i386
>Description:
	The graphics/mapnik port installs its shlib as libmapnik.so.0.5.0,
	while in FreeBSD it is common to use only major lib version for
	library file name.

	Now I am working on a port that will be linked to mapnik library,
	and I first need to get mapnik fixed to get my port committed.
>How-To-Repeat:
	Install graphics/mapnik.
>Fix:
diff -Nur mapnik.bak/Makefile mapnik/Makefile
--- mapnik.bak/Makefile	2009-04-26 01:07:23.000000000 +0400
+++ mapnik/Makefile	2009-04-26 13:10:17.000000000 +0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	mapnik
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	${MASTER_SITE_BERLIOS}/${PORTNAME}/
 DISTNAME=	mapnik_src-${PORTVERSION}
diff -Nur mapnik.bak/files/patch-src-SConscript mapnik/files/patch-src-SConscript
--- mapnik.bak/files/patch-src-SConscript	1970-01-01 03:00:00.000000000 +0300
+++ mapnik/files/patch-src-SConscript	2009-04-26 13:00:57.000000000 +0400
@@ -0,0 +1,41 @@
+--- src/SConscript.orig	2009-04-26 12:18:44.000000000 +0400
++++ src/SConscript	2009-04-26 13:00:21.000000000 +0400
+@@ -37,6 +37,8 @@
+     linkflags = '-Wl,-install_name,libmapnik.dylib'
+ elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
+     linkflags = '-R. -h libmapnik.so'
++elif env['PLATFORM'] == 'FreeBSD':
++    linkflags = '-Wl,-soname,libmapnik.so.' + ("%d" % (ABI_VERSION[0]))
+ else: # Linux and others
+     linkflags = '-Wl,-rpath-link,. -Wl,-soname,libmapnik.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1])) 
+ 
+@@ -106,16 +108,24 @@
+ 
+     major, minor, micro = ABI_VERSION
+     
+-    soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
++    if env['PLATFORM'] == 'FreeBSD':
++        soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), major)
++    else:
++        soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
+     libDir = install_prefix + '/' + env['LIBDIR_SCHEMA']
+     env.Alias(target='install', source=env.InstallAs(target=os.path.join(libDir, soFile), source=mapnik))
+     # Install symlinks
+-    link1 = env.Command(os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), 
++    if env['PLATFORM'] == 'FreeBSD':
++        link = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))), 
++                        os.path.join(libDir, "%s.%d" % (os.path.basename(str(mapnik[0])),major)), symlink)
++        env.Alias(target='install', source=link)
++    else:
++        link1 = env.Command(os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), 
+                         os.path.join(libDir, soFile), symlink)
+-    env.Alias(target='install', source=link1)
+-    link2 = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))), 
++        env.Alias(target='install', source=link1)
++        link2 = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))), 
+                         os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), symlink)
+-    env.Alias(target='install', source=link2)
++        env.Alias(target='install', source=link2)
+ else:
+     env.Alias(target='install', source=env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'], mapnik))
+ 
diff -Nur mapnik.bak/pkg-plist mapnik/pkg-plist
--- mapnik.bak/pkg-plist	2009-04-26 01:07:23.000000000 +0400
+++ mapnik/pkg-plist	2009-04-26 13:10:02.000000000 +0400
@@ -98,8 +98,7 @@
 include/mapnik/proj_transform.hpp
 include/mapnik/distance.hpp
 lib/libmapnik.so
-lib/libmapnik.so.0.5
-lib/libmapnik.so.0.5.0
+lib/libmapnik.so.0
 lib/mapnik/input/raster.input
 lib/mapnik/input/shape.input
 lib/mapnik/fonts/DejaVuSansMono-Oblique.ttf
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->glebius 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Apr 26 11:20:11 UTC 2009 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134015 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Apr 26 11:20:15 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: wenheping@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/134015: [patch] graphics/mapnik should install library with correct name
Date: Sun, 26 Apr 2009 11:20:13 UT

 Maintainer of graphics/mapnik,
 
 Please note that PR ports/134015 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/134015
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: glebius->freebsd-ports-bugs 
Responsible-Changed-By: glebius 
Responsible-Changed-When: Sun Apr 26 12:22:15 UTC 2009 
Responsible-Changed-Why:  
Back to the pool, since I don't have ports commit bit. 

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

From: wen heping <wenheping@gmail.com>
To: bug-followup@FreeBSD.org, glebius@freebsd.org
Cc:  
Subject: Re: ports/134015: [patch] graphics/mapnik should install library with 
	correct name
Date: Sun, 26 Apr 2009 21:45:21 +0800

 --001636457594e0c7eb0468757048
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 I approve it.
 Thank you!
 
 
 Regards,
 wen
 
 --001636457594e0c7eb0468757048
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 I approve it.<br>Thank you!<br><br><br>Regards,<br>wen<br>
 
 --001636457594e0c7eb0468757048--
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sun May 17 08:43:05 UTC 2009 
State-Changed-Why:  
6.0 is now in portstree. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134015 
State-Changed-From-To: closed->open 
State-Changed-By: glebius 
State-Changed-When: Mon May 18 08:14:05 UTC 2009 
State-Changed-Why:  
Well, 6.0 is now in portstree, but the problem is still here. I'll submit 
updated patch soon. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134015 
State-Changed-From-To: open->closed 
State-Changed-By: stas 
State-Changed-When: Wed May 20 21:48:09 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/134015: commit references a PR
Date: Wed, 20 May 2009 21:48:00 +0000 (UTC)

 stas        2009-05-20 21:47:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/mapnik      Makefile pkg-plist 
   Added files:
     graphics/mapnik/files patch-src-SConscript 
   Log:
   - Use proper name for the shared library.
   
   PR:             ports/134015
   Submitted by:   glebius
   Approved by:    wen heping <wenheping@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.4       +1 -0      ports/graphics/mapnik/Makefile
   1.1       +41 -0     ports/graphics/mapnik/files/patch-src-SConscript (new)
   1.3       +1 -2      ports/graphics/mapnik/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"
 
>Unformatted:
