[118664] trunk/dports/devel/readline

mcalhoun at macports.org mcalhoun at macports.org
Mon Apr 7 13:05:56 PDT 2014 

Revision: 118664
          https://trac.macports.org/changeset/118664
Author:   mcalhoun at macports.org
Date:     2014-04-07 13:05:56 -0700 (Mon, 07 Apr 2014)
Log Message:
-----------
readline:
   * Update version 6.2.0->6.3.3
   * Remove some dead code
   * Reduce the number of links to older versions of the library.
   * Fixes #43266.

Modified Paths:
--------------
    trunk/dports/devel/readline/Portfile
    trunk/dports/devel/readline/files/patch-shobj-conf.diff

Modified: trunk/dports/devel/readline/Portfile
===================================================================
--- trunk/dports/devel/readline/Portfile	2014-04-07 19:47:47 UTC (rev 118663)
+++ trunk/dports/devel/readline/Portfile	2014-04-07 20:05:56 UTC (rev 118664)
@@ -4,8 +4,8 @@
 PortGroup       muniversal 1.0
 
 name            readline
-set milestone   6.2
-set patchlevel  000
+set milestone   6.3
+set patchlevel  003
 version         ${milestone}.${patchlevel}
 distname        ${name}-${milestone}
 categories      devel
@@ -34,21 +34,26 @@
     set lastpatch 0
 }
 
+# remove "-arch_only `/usr/bin/arch`"
 patchfiles-append  patch-shobj-conf.diff
 while {$i <= $lastpatch} {
     patchfiles-append ${patchname}-[format "%03d" $i]
     incr i
 }
 
-post-patch {
-    reinplace "s|__MACPORTS_PATCHLEVEL__|${patchlevel}|" ${worksrcpath}/support/shobj-conf
-}
+checksums           ${patchname}-001 \
+                    rmd160  feb98062e9407192a65ab85d62e54b947f119d97 \
+                    sha256  1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f \
+                    ${patchname}-002 \
+                    rmd160  8985874564ff3d1630231e333e87d7d7596fbe63 \
+                    sha256  39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5 \
+                    ${patchname}-003 \
+                    rmd160  bc0765b54e0e97cacfe9ddbacc123b4ce007e350 \
+                    sha256  ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f \
+                    ${distfiles} \
+                    rmd160  986262d811d9dbe1e38bc9d714853272967dca7e \
+                    sha256  56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43
 
-checksums       ${distfiles} \
-                md5     67948acb2ca081f23359d0256e9a271c \
-                sha1    a9761cd9c3da485eb354175fcc2fe35856bc43ac \
-                rmd160  5e7fb934e7c83cd0cd37463f7865bc257c3ea743
-
 configure.args  --with-curses
 
 configure.universal_args-delete --disable-dependency-tracking
@@ -66,11 +71,19 @@
         ${destroot}${docdir}/html
 }
 
-# Install symlinks to avoid breaking ports linked against the old versions
+# Prior to 6.3, the "install_name" of shared libraries were
+#    libreadline.X.Y.dylib and libhistory.X.Y.dylib instead of    
+#    libreadline.X.dylib   and libhistory.X.dylib
+# Therefore, when upgrading, symlinks were installed to avoid breaking ports linked
+#    against old versions.
+# This was fixed in 6.3.
+# For 6.4, therefore, the following should probably be removed.
+# Version 6.1 hasn't been around for over three years (76438), so only create a
+#    link for 6.2.
 platform darwin {
     post-destroot {
         foreach f {history readline} {
-            foreach v {5.0 5.1 5.2 6.1} {
+            foreach v {6.2} {
                 ln -sf lib${f}.${milestone}.dylib ${destroot}${prefix}/lib/lib${f}.${v}.dylib
             }
         }
@@ -79,11 +92,6 @@
 
 if {[variant_isset universal]} {
 
-    pre-configure {
-        # Eliminate warning.
-        configure.args-delete  --disable-dependency-tracking
-    }
-
     configure.args-append   bash_cv_must_reinstall_sighandlers=no \
                             bash_cv_func_sigsetjmp=present \
                             bash_cv_func_strcoll_broken=no \

Modified: trunk/dports/devel/readline/files/patch-shobj-conf.diff
===================================================================
--- trunk/dports/devel/readline/files/patch-shobj-conf.diff	2014-04-07 19:47:47 UTC (rev 118663)
+++ trunk/dports/devel/readline/files/patch-shobj-conf.diff	2014-04-07 20:05:56 UTC (rev 118664)
@@ -1,41 +1,18 @@
---- support/shobj-conf.orig	2009-10-29 00:20:21.000000000 +1100
-+++ support/shobj-conf	2011-03-24 13:43:03.000000000 +1100
-@@ -157,19 +157,19 @@
- 	;;
- 
- # Darwin/MacOS X
--darwin[89]*|darwin10*)
-+darwin[89]*|darwin1[0-9]*)
- 	SHOBJ_STATUS=supported
- 	SHLIB_STATUS=supported
- 	
- 	SHOBJ_CFLAGS='-fno-common'
- 
--	SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
-+	SHOBJ_LD='${CC}'
- 
- 	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
- 	SHLIB_LIBSUFF='dylib'
- 
--	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
--	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-+	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
-+	SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 
- 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
- 	;;
-@@ -186,11 +186,11 @@
- 	SHLIB_LIBSUFF='dylib'
- 
- 	case "${host_os}" in
--	darwin[789]*|darwin10*)	SHOBJ_LDFLAGS=''
--			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-+	darwin[789]*|darwin1[0-9]*)	SHOBJ_LDFLAGS=''
-+			SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+--- support/shobj-conf.orig	2014-02-23 19:06:29.000000000 -0700
++++ support/shobj-conf	2014-04-07 09:23:17.000000000 -0700
+@@ -189,13 +189,13 @@
+ 	darwin[1-7].*)
+ 		SHOBJ_STATUS=unsupported
+ 		SHOBJ_LDFLAGS='-dynamic'
+-		SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
++		SHLIB_XLDFLAGS='-install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ 		;;
+ 	# Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
+ 	*)
+ 		case "${host_os}" in
+ 		darwin[89]*|darwin1[012]*)
+-			SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`'
++			SHOBJ_ARCHFLAGS=
  			;;
- 	*)		SHOBJ_LDFLAGS='-dynamic'
--			SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-+			SHLIB_XLDFLAGS='-install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 			;;
- 	esac
- 
+ 		 *) 	# Mac OS X 10.9 (Mavericks) and later
+ 			SHOBJ_ARCHFLAGS=
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140407/06b546fb/attachment-0001.html>

More information about the macports-changes mailing list