Use a stdc++ hack to fix the build on 5.X.

Reported by:	mezz


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2393 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 75 insertions, 7 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index bcc52eb72..45342a92e 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -22,8 +22,8 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
index 2c33f8690..705312447 100644
--- a/sysutils/nautilus-cd-burner/files/patch-configure
+++ b/sysutils/nautilus-cd-burner/files/patch-configure
@@ -1,6 +1,23 @@
---- configure.orig	Fri Jun 11 00:48:41 2004
-+++ configure	Fri Jun 11 00:52:31 2004
-@@ -20235,6 +20237,8 @@
+--- configure.orig	Fri Jun 11 17:40:51 2004
++++ configure	Fri Jun 11 17:43:37 2004
+@@ -19674,6 +19674,16 @@
+ echo "$as_me:$LINENO: checking for architecture specific defines" >&5
+ echo $ECHO_N "checking for architecture specific defines... $ECHO_C" >&6
+ case "$host" in
++	*-freebsd5*)
++	        echo "$as_me:$LINENO: result: has discovery" >&5
++echo "${ECHO_T}has discovery and libstdc++ hack" >&6
++		IS_LINUX="yes"
++		(
++cat >>confdefs.h <<\_ACEOF
++#define LIBSTDCXX_HACK 1
++_ACEOF
++)
++		;;
+ 	*-freebsd*)
+ 		echo "$as_me:$LINENO: result: has discovery" >&5
+ echo "${ECHO_T}has discovery" >&6
+@@ -21006,6 +21016,8 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -9,7 +26,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20317,6 +20321,7 @@
+@@ -21088,6 +21100,7 @@
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +34,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -20324,6 +20329,7 @@
+@@ -21095,6 +21108,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
diff --git a/sysutils/nautilus-cd-burner/files/patch-ltmain.sh b/sysutils/nautilus-cd-burner/files/patch-ltmain.sh
new file mode 100644
index 000000000..8c8acdd88
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Fri Mar  5 10:05:44 2004
++++ ltmain.sh	Sat Mar  6 04:33:50 2004
+@@ -1349,7 +1349,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1364,8 +1364,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3059,6 +3067,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5531,10 +5542,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"