Attachment 95588 Details for Bug 134015 – file.diff

[patch] file.diff

file.diff (text/plain), 3.29 KB, created by Gleb Smirnoff on 2009-04-26 12:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Smirnoff

Created: 2009-04-26 12:20:00 UTC

Size: 3.29 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 134015: 95588