[43677] trunk/dports/devel/orbit

[jmr at macports.org]

Revision: 43677
          http://trac.macports.org/changeset/43677
Author:   jmr at macports.org
Date:     2008-12-13 11:43:00 -0800 (Sat, 13 Dec 2008)
Log Message:
-----------
orbit: link to libwrap correctly (#17627)

Modified Paths:
--------------
    trunk/dports/devel/orbit/Portfile
    trunk/dports/devel/orbit/files/patch

Added Paths:
-----------
    trunk/dports/devel/orbit/files/patch-configure

Modified: trunk/dports/devel/orbit/Portfile
===================================================================
--- trunk/dports/devel/orbit/Portfile	2008-12-13 19:42:08 UTC (rev 43676)
+++ trunk/dports/devel/orbit/Portfile	2008-12-13 19:43:00 UTC (rev 43677)
@@ -22,6 +22,7 @@
 distname    	ORBit-${version}
 use_bzip2	yes
 depends_lib 	port:glib1 port:gettext
+patchfiles	patch-configure
 configure.args	\
     	LDFLAGS="-L${prefix}/lib" \
 	CPPFLAGS="-I${prefix}/include -no-cpp-precomp -DHAVE_LIMITED_WRITEV \
@@ -30,7 +31,7 @@
 	--infodir=${prefix}/share/info
 platform darwin 6 {
 	depends_lib-append	lib:libdl:dlcompat
-	patchfiles	patch
+	patchfiles-append	patch
 }
 
 livecheck.check regex

Modified: trunk/dports/devel/orbit/files/patch
===================================================================
--- trunk/dports/devel/orbit/files/patch	2008-12-13 19:42:08 UTC (rev 43676)
+++ trunk/dports/devel/orbit/files/patch	2008-12-13 19:43:00 UTC (rev 43677)
@@ -10,39 +10,6 @@
  
  bin_SCRIPTS = orbit-config
  
-diff -Naur configure configure
---- configure	Thu Jun  6 20:27:24 2002
-+++ configure	Wed Jul 31 21:57:14 2002
-@@ -4447,7 +4447,7 @@
-     # FIXME: Relying on posixy $() will cause problems for
-     #        cross-compilation, but unfortunately the echo tests do not
-     #        yet detect zsh echo's removal of \ escapes.
--    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
-+    archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
-     # We need to add '_' to the symbols in $export_symbols first
-     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-     hardcode_direct=yes
-@@ -8846,13 +8846,13 @@
- 		LIB_WRAP=-lwrap
- 		echo "Found $THEFILE/libwrap.so" 1>&5
- 		break
--	else
--		echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
--		if test -f $THEFILE/libwrap.a; then
--			LIBWRAP_PATH=$THEFILE/libwrap.a
--			echo "Found $LIBWRAP_PATH" 1>&5
--			break
--		fi
-+#	else
-+#		echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
-+#		if test -f $THEFILE/libwrap.a; then
-+#			LIBWRAP_PATH=$THEFILE/libwrap.a
-+#			echo "Found $LIBWRAP_PATH" 1>&5
-+#			break
-+#		fi
- 	fi
- 	esac
- done
 diff -Naur libIDL/configure libIDL/configure
 --- libIDL/configure	Thu Jun  6 20:27:28 2002
 +++ libIDL/configure	Wed Jul 31 21:53:19 2002

Added: trunk/dports/devel/orbit/files/patch-configure
===================================================================
--- trunk/dports/devel/orbit/files/patch-configure	                        (rev 0)
+++ trunk/dports/devel/orbit/files/patch-configure	2008-12-13 19:43:00 UTC (rev 43677)
@@ -0,0 +1,43 @@
+--- configure.orig	2002-06-06 21:27:24.000000000 +1000
++++ configure	2008-12-14 06:22:18.000000000 +1100
+@@ -4447,7 +4447,7 @@
+     # FIXME: Relying on posixy $() will cause problems for
+     #        cross-compilation, but unfortunately the echo tests do not
+     #        yet detect zsh echo's removal of \ escapes.
+-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
++    archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
+     # We need to add '_' to the symbols in $export_symbols first
+     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+     hardcode_direct=yes
+@@ -8841,17 +8841,24 @@
+ 	case "$I" in
+ 	-L*)
+ 	THEFILE="`echo $I | sed -e 's,^-L,,'`"
+-	echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
+-	if test -f $THEFILE/libwrap.so; then
++	echo "From $I, checking in dir $THEFILE for libwrap.dylib" 1>&5
++	if test -f $THEFILE/libwrap.dylib; then
+ 		LIB_WRAP=-lwrap
+-		echo "Found $THEFILE/libwrap.so" 1>&5
++		echo "Found $THEFILE/libwrap.dylib" 1>&5
+ 		break
+ 	else
+-		echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
+-		if test -f $THEFILE/libwrap.a; then
+-			LIBWRAP_PATH=$THEFILE/libwrap.a
+-			echo "Found $LIBWRAP_PATH" 1>&5
++		echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
++		if test -f $THEFILE/libwrap.so; then
++			LIB_WRAP=-lwrap
++			echo "Found $THEFILE/libwrap.so" 1>&5
+ 			break
++		else
++			echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
++			if test -f $THEFILE/libwrap.a; then
++				LIBWRAP_PATH=$THEFILE/libwrap.a
++				echo "Found $LIBWRAP_PATH" 1>&5
++				break
++			fi
+ 		fi
+ 	fi
+ 	esac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081213/1152043d/attachment-0001.html>