Changeset 111887


Ignore:
Timestamp:
Oct 5, 2013, 6:27:46 AM (6 years ago)
Author:
blair@…
Message:

serf1: new upstream 1.3.2 release.

Location:
trunk/dports/www/serf1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/serf1/Portfile

    r110508 r111887  
    44
    55name            serf1
    6 version         1.3.1
    7 revision        1
     6version         1.3.2
    87categories      www
    98maintainers     blair
     
    2221distname        serf-${version}
    2322use_bzip2       yes
    24 checksums       sha1   b8c8e12e7163d7bacf9be0ea4aaa7b8c32e8c72c \
    25                 sha256 fc785d0df9c0f4debadae19a3549542d173ca62a1f3f36668b3b1251209f5d9a
     23checksums       sha1   90478cd60d4349c07326cb9c5b720438cf9a1b5d \
     24                sha256 e4e7da37d99f4fdf14a4c13a256330037536d4328a0e1ae3deb6f8531ed8200f
    2625
    2726patchfiles      patch-SConstruct.diff
  • trunk/dports/www/serf1/files/patch-SConstruct.diff

    r110506 r111887  
    1 diff -ru ../serf-1.3.1.orig/SConstruct ./SConstruct
    2 --- ../serf-1.3.1.orig/SConstruct       2013-08-15 02:13:20.000000000 -0700
    3 +++ ./SConstruct        2013-08-31 14:10:43.000000000 -0700
    4 @@ -204,9 +204,9 @@
    5  libdir = '$LIBDIR'
    6  incdir = '$PREFIX/include/serf-$MAJOR'
    7  
    8 -env['SHLIBVERSION']='${MINOR}.0.0'
     1diff -ru ../serf-1.3.2.orig/SConstruct ./SConstruct
     2--- ../serf-1.3.2.orig/SConstruct       2013-10-04 08:11:04.000000000 -0700
     3+++ ./SConstruct        2013-10-04 23:09:57.000000000 -0700
     4@@ -210,7 +210,9 @@
     5 # Unfortunately we can't set the .dylib compatibility_version option separately
     6 # from current_version, so don't use the PATCH level to avoid that build and
     7 # runtime patch levels have to be identical.
     8-env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
     9+
     10+# MacPorts: change PATCH to 0 when MINOR goes from 3 to 4.
    911+env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, PATCH)
    1012 
    11 -LIBNAME = 'libserf-${MAJOR}'
    12 +LIBNAME = 'libserf-%d' % (MAJOR,)
     13 LIBNAME = 'libserf-%d' % (MAJOR,)
    1314 if sys.platform != 'win32':
    14    LIBNAMESTATIC = LIBNAME
    15  else:
    16 @@ -218,10 +218,6 @@
    17  if sys.platform == 'darwin':
    18  #  linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
    19    env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
    20 -  # 'man ld' says positive non-zero for the first number, so we add one.
    21 -  # Mac's interpretation of compatibility is the same as our MINOR version.
    22 -  env.Append(LINKFLAGS='-Wl,-compatibility_version,%d' % (MINOR+1,))
    23 -  env.Append(LINKFLAGS='-Wl,-current_version,%d.%d' % (MINOR+1, PATCH,))
    24  
    25  if sys.platform != 'win32':
    26    ### gcc only. figure out appropriate test / better way to check these
    27 @@ -401,7 +397,7 @@
    28    # to a path in the sandbox. The shared library install name (id) should be the
    29    # final targat path.
    30    install_shared_path = install_shared[0].abspath
    31 -  target_install_shared_path = os.path.join(libdir, lib_shared[0].name)
    32 +  target_install_shared_path = os.path.join(libdir, '%s.dylib' % LIBNAME)
    33    env.AddPostAction(install_shared, ('install_name_tool -id %s %s'
    34                                       % (target_install_shared_path,
    35                                          install_shared_path)))
Note: See TracChangeset for help on using the changeset viewer.