[111887] trunk/dports/www/serf1

[blair at macports.org]

Revision: 111887
          https://trac.macports.org/changeset/111887
Author:   blair at macports.org
Date:     2013-10-04 23:27:46 -0700 (Fri, 04 Oct 2013)
Log Message:
-----------
serf1: new upstream 1.3.2 release.

Modified Paths:
--------------
    trunk/dports/www/serf1/Portfile
    trunk/dports/www/serf1/files/patch-SConstruct.diff

Modified: trunk/dports/www/serf1/Portfile
===================================================================
--- trunk/dports/www/serf1/Portfile	2013-10-05 02:51:57 UTC (rev 111886)
+++ trunk/dports/www/serf1/Portfile	2013-10-05 06:27:46 UTC (rev 111887)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name            serf1
-version         1.3.1
-revision        1
+version         1.3.2
 categories      www
 maintainers     blair
 license         Apache-2
@@ -21,8 +20,8 @@
 master_sites    http://serf.googlecode.com/files/
 distname        serf-${version}
 use_bzip2       yes
-checksums       sha1   b8c8e12e7163d7bacf9be0ea4aaa7b8c32e8c72c \
-                sha256 fc785d0df9c0f4debadae19a3549542d173ca62a1f3f36668b3b1251209f5d9a
+checksums       sha1   90478cd60d4349c07326cb9c5b720438cf9a1b5d \
+                sha256 e4e7da37d99f4fdf14a4c13a256330037536d4328a0e1ae3deb6f8531ed8200f
 
 patchfiles      patch-SConstruct.diff
 

Modified: trunk/dports/www/serf1/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/www/serf1/files/patch-SConstruct.diff	2013-10-05 02:51:57 UTC (rev 111886)
+++ trunk/dports/www/serf1/files/patch-SConstruct.diff	2013-10-05 06:27:46 UTC (rev 111887)
@@ -1,35 +1,14 @@
-diff -ru ../serf-1.3.1.orig/SConstruct ./SConstruct
---- ../serf-1.3.1.orig/SConstruct	2013-08-15 02:13:20.000000000 -0700
-+++ ./SConstruct	2013-08-31 14:10:43.000000000 -0700
-@@ -204,9 +204,9 @@
- libdir = '$LIBDIR'
- incdir = '$PREFIX/include/serf-$MAJOR'
- 
--env['SHLIBVERSION']='${MINOR}.0.0'
+diff -ru ../serf-1.3.2.orig/SConstruct ./SConstruct
+--- ../serf-1.3.2.orig/SConstruct	2013-10-04 08:11:04.000000000 -0700
++++ ./SConstruct	2013-10-04 23:09:57.000000000 -0700
+@@ -210,7 +210,9 @@
+ # Unfortunately we can't set the .dylib compatibility_version option separately
+ # from current_version, so don't use the PATCH level to avoid that build and
+ # runtime patch levels have to be identical.
+-env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
++
++# MacPorts: change PATCH to 0 when MINOR goes from 3 to 4.
 +env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, PATCH)
  
--LIBNAME = 'libserf-${MAJOR}'
-+LIBNAME = 'libserf-%d' % (MAJOR,)
+ LIBNAME = 'libserf-%d' % (MAJOR,)
  if sys.platform != 'win32':
-   LIBNAMESTATIC = LIBNAME
- else:
-@@ -218,10 +218,6 @@
- if sys.platform == 'darwin':
- #  linkflags.append('-Wl,-install_name, at executable_path/%s.dylib' % (LIBNAME,))
-   env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
--  # 'man ld' says positive non-zero for the first number, so we add one.
--  # Mac's interpretation of compatibility is the same as our MINOR version.
--  env.Append(LINKFLAGS='-Wl,-compatibility_version,%d' % (MINOR+1,))
--  env.Append(LINKFLAGS='-Wl,-current_version,%d.%d' % (MINOR+1, PATCH,))
- 
- if sys.platform != 'win32':
-   ### gcc only. figure out appropriate test / better way to check these
-@@ -401,7 +397,7 @@
-   # to a path in the sandbox. The shared library install name (id) should be the
-   # final targat path.
-   install_shared_path = install_shared[0].abspath
--  target_install_shared_path = os.path.join(libdir, lib_shared[0].name)
-+  target_install_shared_path = os.path.join(libdir, '%s.dylib' % LIBNAME)
-   env.AddPostAction(install_shared, ('install_name_tool -id %s %s'
-                                      % (target_install_shared_path,
-                                         install_shared_path)))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131004/a8c13d98/attachment.html>