[47813] trunk/dports/devel/readline

[mcalhoun at macports.org]

Revision: 47813
          http://trac.macports.org/changeset/47813
Author:   mcalhoun at macports.org
Date:     2009-03-06 21:45:29 -0800 (Fri, 06 Mar 2009)
Log Message:
-----------
readline:
   * Assume maintainership with openmaintainer.
   * Change way shard libraries are built.
      - Remove explicit MACOSX_DEPLOYMENT_TARGET=10.3.
      - Remove -arch_only.
      - Change -install_name (${prefix}/lib/libxxx.y.z.dylib -> ${prefix}/lib/libxxx.y.dylib).
      - Append patchlevel to -current_version.
   * Build using muniversal PortGroup.

Modified Paths:
--------------
    trunk/dports/devel/readline/Portfile

Added Paths:
-----------
    trunk/dports/devel/readline/files/
    trunk/dports/devel/readline/files/config.cache
    trunk/dports/devel/readline/files/patch-shobj-conf.diff

Modified: trunk/dports/devel/readline/Portfile
===================================================================
--- trunk/dports/devel/readline/Portfile	2009-03-07 05:36:14 UTC (rev 47812)
+++ trunk/dports/devel/readline/Portfile	2009-03-07 05:45:29 UTC (rev 47813)
@@ -1,15 +1,17 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       muniversal 1.0
 
 name            readline
 set milestone   6.0
 set patchlevel  000
 version         ${milestone}.${patchlevel}
+revision        1
 distname        ${name}-${milestone}
 categories      devel
 platforms       darwin freebsd
-maintainers     nomaintainer
+maintainers     mcalhoun openmaintainer
 description     Library that provides command line editing
 
 long_description \
@@ -31,13 +33,17 @@
     set lastpatch 0
 }
 
+patchfiles-append  patch-shobj-conf.diff
 while {$i <= $lastpatch} {
     patchfiles-append ${patchname}-[format "%03d" $i]
     incr i
 }
 
-checksums       readline-${milestone}.tar.gz \
-                md5     b7f65a48add447693be6e86f04a63019 \
+post-patch {
+    reinplace "s|__MACPORTS_PATCHLEVEL__|${patchlevel}|" ${worksrcpath}/support/shobj-conf
+}
+
+checksums       md5     b7f65a48add447693be6e86f04a63019 \
                 sha1    1e511b091514ef631c539552316787c75ace5262 \
                 rmd160  9f886f437dfa3387cb3a4ce3439cefecffc2c789
 
@@ -71,6 +77,29 @@
     }
 }
 
+if {[variant_isset universal]} {
+
+    pre-configure {
+        # Eliminate warning.
+        configure.args-delete  --disable-dependency-tracking
+    }
+
+    if { ${os.arch}=="i386" } {
+        if { ${os.major} >= 10 } {
+            set merger_configure_args(ppc)  --config-cache
+        }
+        set merger_configure_args(ppc64)    --config-cache
+    } else {
+        set merger_configure_args(i386)     --config-cache
+        set merger_configure_args(x86_64)   --config-cache
+    }
+
+    post-extract {
+        # Answers to questions configure can't determine without running a program.
+        copy ${filespath}/config.cache ${worksrcpath} 
+    }
+}
+
 livecheck.check     regex
 livecheck.url       http://ftp.gnu.org/pub/gnu/${name}/?C=M&O=D
 livecheck.regex     ${name}-(\\d+(?:\\.\\d+)*)

Added: trunk/dports/devel/readline/files/config.cache
===================================================================
--- trunk/dports/devel/readline/files/config.cache	                        (rev 0)
+++ trunk/dports/devel/readline/files/config.cache	2009-03-07 05:45:29 UTC (rev 47813)
@@ -0,0 +1,4 @@
+bash_cv_must_reinstall_sighandlers=no
+bash_cv_func_sigsetjmp=present
+bash_cv_func_strcoll_broken=no
+bash_cv_func_ctype_nonascii=yes

Added: trunk/dports/devel/readline/files/patch-shobj-conf.diff
===================================================================
--- trunk/dports/devel/readline/files/patch-shobj-conf.diff	                        (rev 0)
+++ trunk/dports/devel/readline/files/patch-shobj-conf.diff	2009-03-07 05:45:29 UTC (rev 47813)
@@ -0,0 +1,32 @@
+--- support/shobj-conf.orig	2009-01-04 14:32:42.000000000 -0500
++++ support/shobj-conf	2009-03-06 23:36:29.000000000 -0500
+@@ -152,13 +152,13 @@
+ 	
+ 	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)/${@:$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)=$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)} -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)__MACPORTS_PATCHLEVEL__ -compatibility_version $(SHLIB_MAJOR) -v'
+ 
+ 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
+ 	;;
+@@ -176,10 +176,10 @@
+ 
+ 	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'
++			SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/${@:$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)=$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)} -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)__MACPORTS_PATCHLEVEL__ -compatibility_version $(SHLIB_MAJOR) -v'
+ 			;;
+ 	*)		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)/${@:$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)=$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)} -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)__MACPORTS_PATCHLEVEL__ -compatibility_version $(SHLIB_MAJOR) -v'
+ 			;;
+ 	esac
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090306/15a49076/attachment-0001.html>