From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 26 11:20:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C254106566C for ; Sun, 26 Apr 2009 11:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 412BC8FC0A for ; Sun, 26 Apr 2009 11:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n3QBK1N0035885 for ; Sun, 26 Apr 2009 11:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n3QBK1hK035884; Sun, 26 Apr 2009 11:20:01 GMT (envelope-from gnats) Resent-Date: Sun, 26 Apr 2009 11:20:01 GMT Resent-Message-Id: <200904261120.n3QBK1hK035884@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gleb Smirnoff Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F14D1065672 for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: wenheping@gmail.com Subject: ports/134015: [patch] graphics/mapnik should install library with correct name X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2009 11:20:01 -0000 >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: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Apr 26 11:20:00 UTC 2009 >Closed-Date: >Last-Modified: >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: >Unformatted: