Attachment #95588 for bug #134015

View | Details | Raw Unified | Return to bug 134015
Collapse All | Expand All

Lines 7-13 Link Here

(-)mapnik/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= mapnik	8	PORTNAME= mapnik
9	PORTVERSION= 0.5.1	9	PORTVERSION= 0.5.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= graphics geography	11	CATEGORIES= graphics geography
12	MASTER_SITES= ${MASTER_SITE_BERLIOS}/${PORTNAME}/	12	MASTER_SITES= ${MASTER_SITE_BERLIOS}/${PORTNAME}/
13	DISTNAME= mapnik_src-${PORTVERSION}	13	DISTNAME= mapnik_src-${PORTVERSION}




--- 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))
 

Lines 98-105 Link Here

(-)mapnik/pkg-plist (-2 / +1 lines)
98	include/mapnik/proj_transform.hpp	98	include/mapnik/proj_transform.hpp
99	include/mapnik/distance.hpp	99	include/mapnik/distance.hpp
100	lib/libmapnik.so	100	lib/libmapnik.so
101	lib/libmapnik.so.0.5	101	lib/libmapnik.so.0
102	lib/libmapnik.so.0.5.0
103	lib/mapnik/input/raster.input	102	lib/mapnik/input/raster.input
104	lib/mapnik/input/shape.input	103	lib/mapnik/input/shape.input
105	lib/mapnik/fonts/DejaVuSansMono-Oblique.ttf	104	lib/mapnik/fonts/DejaVuSansMono-Oblique.ttf

Return to bug 134015

Line 0 Link Here

(-)mapnik/files/patch-src-SConscript (+41 lines)
	1	--- src/SConscript.orig 2009-04-26 12:18:44.000000000 +0400
	2	+++ src/SConscript 2009-04-26 13:00:21.000000000 +0400
	3	@@ -37,6 +37,8 @@
	4	linkflags = '-Wl,-install_name,libmapnik.dylib'
	5	elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
	6	linkflags = '-R. -h libmapnik.so'
	7	+elif env['PLATFORM'] == 'FreeBSD':
	8	+ linkflags = '-Wl,-soname,libmapnik.so.' + ("%d" % (ABI_VERSION[0]))
	9	else: # Linux and others
	10	linkflags = '-Wl,-rpath-link,. -Wl,-soname,libmapnik.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1]))
	11
	12	@@ -106,16 +108,24 @@
	13
	14	major, minor, micro = ABI_VERSION
	15
	16	- soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
	17	+ if env['PLATFORM'] == 'FreeBSD':
	18	+ soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), major)
	19	+ else:
	20	+ soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
	21	libDir = install_prefix + '/' + env['LIBDIR_SCHEMA']
	22	env.Alias(target='install', source=env.InstallAs(target=os.path.join(libDir, soFile), source=mapnik))
	23	# Install symlinks
	24	- link1 = env.Command(os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)),
	25	+ if env['PLATFORM'] == 'FreeBSD':
	26	+ link = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))),
	27	+ os.path.join(libDir, "%s.%d" % (os.path.basename(str(mapnik[0])),major)), symlink)
	28	+ env.Alias(target='install', source=link)
	29	+ else:
	30	+ link1 = env.Command(os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)),
	31	os.path.join(libDir, soFile), symlink)
	32	- env.Alias(target='install', source=link1)
	33	- link2 = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))),
	34	+ env.Alias(target='install', source=link1)
	35	+ link2 = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))),
	36	os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), symlink)
	37	- env.Alias(target='install', source=link2)
	38	+ env.Alias(target='install', source=link2)
	39	else:
	40	env.Alias(target='install', source=env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'], mapnik))
	41