diff options
| author | stas <stas@FreeBSD.org> | 2009-05-21 05:47:51 +0800 |
|---|---|---|
| committer | stas <stas@FreeBSD.org> | 2009-05-21 05:47:51 +0800 |
| commit | 20fcd85b1692fde924711a2622eb08096b01b4a1 (patch) | |
| tree | 06544386791386ac1012a1d3a3b142bedec38925 | |
| parent | 9b8f08dbd8a499c693d82e88da1c79ac701b283b (diff) | |
| download | freebsd-ports-gnome-20fcd85b1692fde924711a2622eb08096b01b4a1.tar.gz freebsd-ports-gnome-20fcd85b1692fde924711a2622eb08096b01b4a1.tar.zst freebsd-ports-gnome-20fcd85b1692fde924711a2622eb08096b01b4a1.zip | |
- Use proper name for the shared library.
PR: ports/134015
Submitted by: glebius
Approved by: wen heping <wenheping@gmail.com> (maintainer)
| -rw-r--r-- | graphics/mapnik/Makefile | 1 | ||||
| -rw-r--r-- | graphics/mapnik/files/patch-src-SConscript | 41 | ||||
| -rw-r--r-- | graphics/mapnik/pkg-plist | 3 |
3 files changed, 43 insertions, 2 deletions
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index a41d79446334..c93660e5d4ed 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -7,6 +7,7 @@ PORTNAME= mapnik PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= ${MASTER_SITE_BERLIOS}/${PORTNAME}/ diff --git a/graphics/mapnik/files/patch-src-SConscript b/graphics/mapnik/files/patch-src-SConscript new file mode 100644 index 000000000000..ccedccaa190d --- /dev/null +++ b/graphics/mapnik/files/patch-src-SConscript @@ -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 --git a/graphics/mapnik/pkg-plist b/graphics/mapnik/pkg-plist index 85e366a1f337..7a0ed45e9e88 100644 --- a/graphics/mapnik/pkg-plist +++ b/graphics/mapnik/pkg-plist @@ -101,8 +101,7 @@ include/mapnik/comparison.hpp include/mapnik/proj_transform.hpp include/mapnik/distance.hpp lib/libmapnik.so -lib/libmapnik.so.0.6 -lib/libmapnik.so.0.6.0 +lib/libmapnik.so.0 lib/mapnik/input/postgis.input lib/mapnik/input/raster.input lib/mapnik/input/shape.input |