net-analyzer/tcptraceroute: #373865

https://bugs.gentoo.org/show_bug.cgi?id=373865

2 files changed, 50 insertions, 79 deletions

diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index d93f26c1..b40acb53 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,3 +1,3 @@
-AUX tcptraceroute-1.5_beta7-BJA-cross.diff 2686 RMD160 4b1ac0afc22aaf4634e53f4ba346732b8aefc7f8 SHA1 5fa87898212608c45c6e8174ac0cbc5528dd43c3 SHA256 e063d5f1e3cbf26c8b99c84b41f43dc227376c305870a2929453e70606b081a5
+AUX tcptraceroute-1.5_beta7-BJA-cross.diff 1966 RMD160 078351bbacb4ab6a80d1db3bb45aed01ffed8318 SHA1 c7c118ae0b64ad05935168926a8f4b11c28066d0 SHA256 4f95f6ecd49a50e36b16b83ddf2e566a8e13aba4238dc7c2eef95ed63be4f910
 DIST tcptraceroute-1.5beta7.tar.gz 119119 RMD160 fe937341f4ef1aa358b253c3af490419a689031f SHA1 78847ef4ba7031cee660c540593256fd384a1a62 SHA256 aed5b163ed4886f04242b46005a6cb4876ef38ad72001a94facb62a99dc99c57
 EBUILD tcptraceroute-1.5_beta7-r1.ebuild 972 RMD160 eb55253d21352477cfc699f5e52bce30f83fe059 SHA1 874a22bdc4755f3d2fe0e90cafc4241b4fa8c100 SHA256 e22fce55b689c1d9ed05f33dbda7542f2586d4514846a3710ade5f9c9d2f9f7b
diff --git a/net-analyzer/tcptraceroute/files/tcptraceroute-1.5_beta7-BJA-cross.diff b/net-analyzer/tcptraceroute/files/tcptraceroute-1.5_beta7-BJA-cross.diff
index b1be5b5b..399a3455 100644
--- a/net-analyzer/tcptraceroute/files/tcptraceroute-1.5_beta7-BJA-cross.diff
+++ b/net-analyzer/tcptraceroute/files/tcptraceroute-1.5_beta7-BJA-cross.diff
@@ -1,18 +1,17 @@
---- configure.ac.ori	2011-07-03 02:00:53.000000000 +0200
-+++ configure.ac	2011-07-03 02:10:41.000000000 +0200
-@@ -147,72 +147,80 @@
+--- /tmp/tcptraceroute-1.5beta7/configure.ac	2004-12-28 04:40:54.000000000 +0100
++++ configure.ac	2011-07-05 02:05:06.243200245 +0200
+@@ -146,73 +146,24 @@
+ AC_FUNC_VPRINTF
  AC_CHECK_FUNCS([gettimeofday memset select socket strchr])
  
- # Is this Solaris?
+-# Is this Solaris?
 -AC_MSG_CHECKING(for Solaris)
 -AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
-+AC_CACHE_CHECK([for Solaris], ac_cv_os_solaris,
-+	[AC_TRY_RUN([
- #if defined (__SVR4) && defined (__sun)
- 	exit(0);
- #else
- 	exit(-1);
- #endif
+-#if defined (__SVR4) && defined (__sun)
+-	exit(0);
+-#else
+-	exit(-1);
+-#endif
 -		])
 -	],[
 -		AC_MSG_RESULT(yes)
@@ -21,27 +20,15 @@
 -	],[
 -		AC_MSG_RESULT(no)
 -	])
-+	],
-+	ac_cv_os_solaris=yes,
-+	ac_cv_os_solaris=no,
-+	ac_cv_os_solaris=no	dnl cross-compiling, assuming is not
-+)])
-+AS_IF([test x$ac_cv_os_solaris = xyes],
-+	[AC_DEFINE([HAVE_SOLARIS], 1, [Is this a Solaris system?])
-+	 HAVE_SOLARIS=yes
-+	]
-+)
- 
- # Is this BSDI?
+-
+-# Is this BSDI?
 -AC_MSG_CHECKING(for BSDI)
 -AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
-+AC_CACHE_CHECK([for BSDI], ac_cv_os_bsdi,
-+	[AC_TRY_RUN([
- #if defined (__bsdi__)
- 	exit(0);
- #else
- 	exit(-1);
- #endif
+-#if defined (__bsdi__)
+-	exit(0);
+-#else
+-	exit(-1);
+-#endif
 -		])
 -	],[
 -		AC_MSG_RESULT(yes)
@@ -50,27 +37,15 @@
 -	],[
 -		AC_MSG_RESULT(no)
 -	])
-+	],
-+	ac_cv_os_bsdi=yes,
-+	ac_cv_os_bsdi=no,
-+	ac_cv_os_bsdi=no	dnl cross-compiling, assuming is not
-+)]) 
-+AS_IF([test x$ac_cv_os_bsdi = xyes],
-+	[AC_DEFINE([HAVE_BSDI], 1, [Is this a BSDI system?])
-+	 HAVE_BSDI=yes
-+	]
-+)
- 
- # Is this NetBSD?
+-
+-# Is this NetBSD?
 -AC_MSG_CHECKING(for NetBSD)
 -AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
-+AC_CACHE_CHECK([for NetBSD], ac_cv_os_netbsd,
-+	[AC_TRY_RUN([
- #if defined (__NetBSD__)
- 	exit(0);
- #else
- 	exit(-1);
- #endif
+-#if defined (__NetBSD__)
+-	exit(0);
+-#else
+-	exit(-1);
+-#endif
 -		])
 -	],[
 -		AC_MSG_RESULT(yes)
@@ -79,27 +54,15 @@
 -	],[
 -		AC_MSG_RESULT(no)
 -	])
-+	],
-+	ac_cv_os_netbsd=yes,
-+	ac_cv_os_netbsd=no,
-+	ac_cv_os_netbsd=no	dnl cross-compiling, assuming is not
-+)])
-+AS_IF([test x$ac_cv_os_netbsd = xyes],
-+	[AC_DEFINE([HAVE_NETBSD], 1, [Is this a NetBSD system?])
-+	 HAVE_NETBSD=yes
-+	]
-+)
- 
- # Is this MacOS X?
+-
+-# Is this MacOS X?
 -AC_MSG_CHECKING(for MacOS X)
 -AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
-+AC_CACHE_CHECK([for MacOS X], ac_cv_os_macosx,
-+	[AC_TRY_RUN([
- #if defined (__APPLE__) && defined (__MACH__)
- 	exit(0);
- #else
- 	exit(-1);
- #endif
+-#if defined (__APPLE__) && defined (__MACH__)
+-	exit(0);
+-#else
+-	exit(-1);
+-#endif
 -		])
 -	],[
 -		AC_MSG_RESULT(yes)
@@ -108,16 +71,24 @@
 -	],[
 -		AC_MSG_RESULT(no)
 -	])
-+	],
-+	ac_cv_os_macosx=yes,
-+	ac_cv_os_macosx=no,
-+	ac_cv_os_macosx=no	dnl cross-compiling, assuming is not
-+)])     
-+AS_IF([test x$ac_cv_os_macosx = xyes],
-+	[AC_DEFINE([HAVE_MACOSX], 1, [Is this a MacOS X system?])
-+	 HAVE_MACOSX=yes
-+	]
-+)
++case $host_os in
++  *-*-solaris*)
++    AC_DEFINE([HAVE_SOLARIS], 1, [Is this a Solaris system?])
++    HAVE_SOLARIS=yes
++    ;;
++  *-*-bsdi*)
++    AC_DEFINE([HAVE_BSDI], 1, [Is this a BSDI system?])
++    HAVE_BSDI=yes
++    ;;
++  *-*-netbsd*)
++    AC_DEFINE([HAVE_NETBSD], 1, [Is this a NetBSD system?])
++    HAVE_NETBSD=yes
++    ;;
++  *-*-darwin*)
++    AC_DEFINE([HAVE_MACOSX], 1, [Is this a MacOS X system?])
++    HAVE_MACOSX=yes
++	;;
++esac
  
  # Handle --enable-noselect-default
  AC_ARG_ENABLE(noselect-default,