[79279] trunk/dports/devel/ustl
jmr at macports.org
jmr at macports.org
Wed Jun 8 00:17:30 PDT 2011
Revision: 79279
http://trac.macports.org/changeset/79279
Author: jmr at macports.org
Date: 2011-06-08 00:17:28 -0700 (Wed, 08 Jun 2011)
Log Message:
-----------
ustl: update to 1.5, fix build failure on 10.6 (#24984)
Modified Paths:
--------------
trunk/dports/devel/ustl/Portfile
Added Paths:
-----------
trunk/dports/devel/ustl/files/
trunk/dports/devel/ustl/files/Config.mk.in.diff
trunk/dports/devel/ustl/files/Makefile.diff
trunk/dports/devel/ustl/files/configure.diff
Modified: trunk/dports/devel/ustl/Portfile
===================================================================
--- trunk/dports/devel/ustl/Portfile 2011-06-08 05:07:03 UTC (rev 79278)
+++ trunk/dports/devel/ustl/Portfile 2011-06-08 07:17:28 UTC (rev 79279)
@@ -3,9 +3,10 @@
PortSystem 1.0
name ustl
-version 0.8
+version 1.5
categories devel
platforms darwin
+license MIT
maintainers nomaintainer
description micro-STL is a partial implementation of the STL specification
long_description uSTL (micro-STL) is a partial implementation of the STL \
@@ -14,18 +15,26 @@
homepage http://ustl.sourceforge.net/
master_sites sourceforge
-distname ${distname}-0
-checksums md5 dd59483c327f1bd1356273bc5ae4dde0
+checksums md5 df48fd261e38ccb906c08bcb393af877 \
+ sha1 8e31aa4c0b1d6ca640444678a8f7d0d3cc464015 \
+ rmd160 0dd0fd1d2236ad86f8a20e220b0efeda48fa02bb
use_bzip2 yes
-worksrcdir ${name}-${version}
+depends_build port:gsed
+patchfiles configure.diff Makefile.diff
+platform darwin {
+ patchfiles-append Config.mk.in.diff
+}
+
+configure.env SED="${prefix}/bin/gsed"
+
pre-destroot {
- reinplace "s|${prefix}|${destroot}${prefix}|g" ${worksrcpath}/Common.mk
+ reinplace "s|${prefix}|${destroot}${prefix}|g" ${worksrcpath}/Config.mk
+ xinstall -d ${destroot}${prefix}/include/${name}
}
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} LICENSE \
${destroot}${prefix}/share/doc/${name}
}
-
Added: trunk/dports/devel/ustl/files/Config.mk.in.diff
===================================================================
--- trunk/dports/devel/ustl/files/Config.mk.in.diff (rev 0)
+++ trunk/dports/devel/ustl/files/Config.mk.in.diff 2011-06-08 07:17:28 UTC (rev 79279)
@@ -0,0 +1,23 @@
+--- Config.mk.in.orig 2011-03-17 04:11:26.000000000 +1100
++++ Config.mk.in 2011-06-08 15:31:14.000000000 +1000
+@@ -18,7 +18,7 @@
+ DOXYGEN := @DOXYGEN@
+ INSTALL := @INSTALL@
+
+-INSTALLDATA := ${INSTALL} -D -p -m 644
++INSTALLDATA := ${INSTALL} -p -m 644
+ INSTALLLIB := ${INSTALLDATA}
+
+ ################ Destination #########################################
+@@ -41,10 +41,9 @@
+ LIBS :=
+ ifdef DEBUG
+ CXXFLAGS += -O0 -g
+- LDFLAGS += -rdynamic
+ else
+ CXXFLAGS += -Os -g0 -DNDEBUG=1 -fomit-frame-pointer ${INLINEOPTS}
+- LDFLAGS += -s -Wl,-gc-sections
++ LDFLAGS += -s -dead_strip
+ endif
+ ifdef NOLIBSTDCPP
+ LD := @CC@
Added: trunk/dports/devel/ustl/files/Makefile.diff
===================================================================
--- trunk/dports/devel/ustl/files/Makefile.diff (rev 0)
+++ trunk/dports/devel/ustl/files/Makefile.diff 2011-06-08 07:17:28 UTC (rev 79279)
@@ -0,0 +1,26 @@
+--- Makefile.orig 2011-03-17 04:11:26.000000000 +1100
++++ Makefile 2011-06-08 16:07:02.000000000 +1000
+@@ -10,8 +10,8 @@
+
+ .PHONY: all clean html check dist distclean maintainer-clean
+
+-all: Config.mk config.h ${NAME}/config.h
+-ALLTGTS := Config.mk config.h ${NAME}/config.h
++all: config.h ${NAME}/config.h
++ALLTGTS := config.h ${NAME}/config.h
+
+ ifdef BUILD_SHARED
+ SLIBL := $O$(call slib_lnk,${NAME})
+@@ -144,10 +144,9 @@
+ @echo " Linking inplace header location ..."
+ @rm -f ${NAME}; ln -s . ${NAME}
+
+-${OBJS}: Makefile Config.mk config.h
+-Config.mk: Config.mk.in
++${OBJS}: Makefile config.h
+ config.h: config.h.in
+-Config.mk config.h: configure
++config.h: configure
+ @if [ -x config.status ]; then echo "Reconfiguring ..."; ./config.status; \
+ else echo "Running configure ..."; ./configure; fi
+
Added: trunk/dports/devel/ustl/files/configure.diff
===================================================================
--- trunk/dports/devel/ustl/files/configure.diff (rev 0)
+++ trunk/dports/devel/ustl/files/configure.diff 2011-06-08 07:17:28 UTC (rev 79279)
@@ -0,0 +1,94 @@
+--- configure.orig 2011-03-17 04:11:26.000000000 +1100
++++ configure 2011-06-08 15:49:42.000000000 +1000
+@@ -64,6 +64,10 @@
+ # First pair is used if nothing matches
+ PROGS="CC=gcc CC=cc CXX=g++ CXX=c++ DOXYGEN=doxygen LD=ld AR=ar RANLIB=ranlib RANLIB=touch INSTALL=install"
+
++if [ -z "${SED}" ]; then
++ SED="sed"
++fi
++
+ # Environment variables
+ ENVIRONS="CXXFLAGS LDFLAGS"
+
+@@ -283,12 +287,12 @@
+ fi
+ if [ "$SYSNAME" = "mac" ]; then
+ echo 's/ \?@libgcc_eh@//g
+- s/@SYSWARNS@/-Wno-long-double/g
+- s/lib$1.so/lib$1.dylib/g
++ s/@SYSWARNS@//g
+ s/lib$1.so.${MAJOR}.${MINOR}.${BUILD}/lib$1.${MAJOR}.${MINOR}.${BUILD}.dylib/g
+ s/lib$1.so.${MAJOR}.${MINOR}/lib$1.${MAJOR}.${MINOR}.dylib/g
+ s/lib$1.so.${MAJOR}/lib$1.${MAJOR}.dylib/g
+- s/@SHBLDFL@/-Wl,-single_module -compatibility_version 1 -current_version 1 -install_name $1 -Wl,-Y,1455 -dynamiclib -mmacosx-version-min=10.4/g' >>config.sed
++ s/lib$1.so/lib$1.dylib/g
++ s|@SHBLDFL@|-Wl,-single_module -compatibility_version 1 -current_version 1 -install_name ${LIBDIR}/$1 -Wl,-Y,1455 -dynamiclib|g' >>config.sed
+ else
+ echo 's/ \?@SYSWARNS@//g' >>config.sed
+ fi
+@@ -361,7 +365,7 @@
+
+ SubVar() {
+ local esc2
+- esc2=`echo $2 | sed 's/\//\\\&/g'`
++ esc2=`echo $2 | ${SED} 's/\//\\\&/g'`
+ eval ac_var_$1='$esc2';
+ echo "s/@$1@/$esc2/g" >>config.sed
+ }
+@@ -411,8 +415,8 @@
+ s/@libdir@/${ac_var_libdir:=$ac_var_exec_prefix\/lib}/g
+ s/@localedir@/$ac_var_datarootdir\/locale/g
+ s/@mandir@/$ac_var_datarootdir\/man/g
+-s/@gccincludedir@/${ac_var_gccincludedir:=`echo $PINCDIR | sed 's/\//\\\&/g'`}/g
+-s/@gcclibdir@/${ac_var_gcclibdir:=`echo $PLIBDIR | sed 's/\//\\\&/g'`}/g
++s/@gccincludedir@/${ac_var_gccincludedir:=`echo $PINCDIR | ${SED} 's/\//\\\&/g'`}/g
++s/@gcclibdir@/${ac_var_gcclibdir:=`echo $PLIBDIR | ${SED} 's/\//\\\&/g'`}/g
+ s/@customincdir@/${ac_var_customincdir:=$ac_var_prefix\/include}/g
+ s/@customlibdir@/${ac_var_customlibdir:=$ac_var_prefix\/lib}/g" >>config.sed
+
+@@ -429,7 +433,7 @@
+ SubHeadLibsProgs() {
+ local INCPATH LIBPATH LIBSUFFIX found pname pcall esciv
+ INCPATH="$ac_var_oldincludedir $ac_var_includedir $ac_var_gccincludedir $ac_var_customincdir"
+-INCPATH=`echo $INCPATH | sed 's/\\\\//g'`
++INCPATH=`echo $INCPATH | ${SED} 's/\\\\//g'`
+ for i in $HEADERS; do
+ for p in $INCPATH; do
+ if [ -r "$p/$i" ]; then
+@@ -440,7 +444,7 @@
+ done
+
+ LIBPATH="`echo $LD_LIBRARY_PATH | tr ':' ' '` $ac_var_libdir $ac_var_gcclibdir $ac_var_customlibdir /usr/lib /usr/local/lib /lib"
+-LIBPATH=`echo $LIBPATH | sed 's/\\\\//g'`
++LIBPATH=`echo $LIBPATH | ${SED} 's/\\\\//g'`
+ LIBSUFFIX="so a la dylib"
+ for i in $LIBS; do
+ found=
+@@ -459,7 +463,7 @@
+ for i in $PROGS; do
+ pname=`expr "$i" : '\([^=]*\)=[^=]*'`
+ pcall=`expr "$i" : '[^=]*=\([^=]*\)'`
+- esciv="`eval echo \$\{$pname\}|sed 's/\//\\\\\//g'`"
++ esciv="`eval echo \$\{$pname\}|${SED} 's/\//\\\\\//g'`"
+ # First check if an environment variable is set
+ [ ! -z "$esciv" ] && echo "s/@$pname@/$esciv/g" >>config.sed
+ # Check if the program exists
+@@ -473,7 +477,7 @@
+ done
+ # And, finally, the environment variables
+ for i in $ENVIRONS; do
+- esciv="`eval echo '"'\$\{$i\}'"'|sed 's/\//\\\&/g'`"
++ esciv="`eval echo '"'\$\{$i\}'"'|${SED} 's/\//\\\&/g'`"
+ [ ! -z "$esciv" ] && esciv=" $esciv"
+ echo "s/ \?@$i@/$esciv/g" >>config.sed
+ done
+@@ -484,7 +488,7 @@
+ #### Apply substitutions to all files ################################
+
+ for i in $FILES; do
+- sed -f config.sed $i.in > $i
++ ${SED} -f config.sed $i.in > $i
+ done
+
+ touch config.status
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110608/688c7785/attachment.html>
More information about the macports-changes
mailing list