-Update to 1.10.

-Do not get libevent to link with librt, which our clock_gettime() is in libc.

4 files changed, 152 insertions, 107 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 1f45b4b7c52..76a6ed967d0 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	1.06
-PORTREVISION?=	1
+PORTVERSION=	1.10
+PORTREVISION?=	0
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 
@@ -17,14 +17,22 @@ COMMENT?=	A free BitTorrent client written from scratch in C
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME?=	gnometarget intlhack
+USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS?=--without-gtk \
-		--without-wx
+		LDFLAGS="${LDFLAGS}"
+LDFLAGS=	-L${LOCALBASE}/lib -lintl
+CONFIGURE_ARGS?=${GCONFIGURE} \
+		--enable-cli \
+		--disable-daemon \
+		--disable-gtk
+
+# General configure
+GCONFIGURE=	--disable-beos \
+		--disable-darwin \
+		--disable-wx
 
-CUSTOM_SUBDIRS?=third-party libtransmission cli
 DOCS=		AUTHORS LICENSE NEWS README
 MAN1?=		transmissioncli.1
 
@@ -32,10 +40,13 @@ general-patch:
 	@${REINPLACE_CMD} -e \
 		's|CFLAGS="-g -Wall.*"|CFLAGS="${CFLAGS} -Wall -W"|g ; \
 		s|CXXFLAGS="-g -Wall.*"|CXXFLAGS="${CXXFLAGS} -Wall -W"|g ; \
-		s|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g' \
+		s|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g ; \
+		s|[$$]GMSGFMT[$$]|$$INTLTOOL_MSGFMT$$|g' \
 			${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%CUSTOM_SUBDIRS%%|${CUSTOM_SUBDIRS}|g' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|bin_PROGRAMS = benc2php.*|bin_PROGRAMS = |g' \
+		${WRKSRC}/libtransmission/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lrt||g' \
+		${WRKSRC}/third-party/libevent/configure
 	@${REINPLACE_CMD} -e 's|@SUBDIRS = . sample.*|@SUBDIRS = .|g' \
 		${WRKSRC}/third-party/libevent/Makefile.in
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index d4b201e1197..bd6b965861d 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,3 +1,3 @@
-MD5 (transmission-1.06.tar.bz2) = 471e4bd40e1464067a3e266ecf3cb724
-SHA256 (transmission-1.06.tar.bz2) = 44cffabf577f76ebef10405e337c55cac2a00644551dab8f68de2856f2147786
-SIZE (transmission-1.06.tar.bz2) = 4232766
+MD5 (transmission-1.10.tar.bz2) = 51250c3ff7854da6fe4649c036afeccf
+SHA256 (transmission-1.10.tar.bz2) = 2335be1705b48d1bb49e378c85d90dc682d78f0ef44eb5232a369abb0d457ee7
+SIZE (transmission-1.10.tar.bz2) = 4407682
diff --git a/net-p2p/transmission-cli/files/patch-Makefile.in b/net-p2p/transmission-cli/files/patch-Makefile.in
deleted file mode 100644
index da4604eeeda..00000000000
--- a/net-p2p/transmission-cli/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	2008-01-22 16:11:12.000000000 -0600
-+++ Makefile.in	2008-01-22 16:11:43.000000000 -0600
-@@ -258,14 +258,7 @@
- @HAVE_DARWIN_TRUE@MAC_DIR = macosx
- @WITH_GTK_TRUE@GTK_DIR = gtk po
- @HAVE_WX_TRUE@WX_DIR = wx
--SUBDIRS = \
--  third-party \
--  libtransmission \
--  daemon cli \
--  $(BEOS_DIR) \
--  $(GTK_DIR) \
--  $(MAC_DIR) \
--  $(WX_DIR)
-+SUBDIRS = %%CUSTOM_SUBDIRS%%
- 
- EXTRA_DIST = \
-   NEWS \
diff --git a/net-p2p/transmission-cli/files/patch-configure b/net-p2p/transmission-cli/files/patch-configure
index 3ed17c31290..a8cb746a9d8 100644
--- a/net-p2p/transmission-cli/files/patch-configure
+++ b/net-p2p/transmission-cli/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2008-01-25 12:25:43.000000000 -0600
-+++ configure	2008-01-25 12:26:45.000000000 -0600
-@@ -880,11 +880,9 @@
+--- configure.orig	2008-03-29 14:43:46.000000000 -0500
++++ configure	2008-03-29 14:47:37.000000000 -0500
+@@ -882,11 +882,9 @@
  PTHREAD_CC
  PTHREAD_LIBS
  PTHREAD_CFLAGS
@@ -12,17 +12,17 @@
 +PKG_CONFIG
  GTK_CFLAGS
  GTK_LIBS
- WITH_GTK_TRUE
-@@ -971,8 +969,6 @@
+ BUILD_GTK_TRUE
+@@ -979,8 +977,6 @@
  F77
  FFLAGS
  PKG_CONFIG
 -OPENSSL_CFLAGS
 -OPENSSL_LIBS
  GTK_CFLAGS
- GTK_LIBS'
- ac_subdirs_all='third-party/libevent'
-@@ -1593,10 +1589,6 @@
+ GTK_LIBS
+ GIO_CFLAGS
+@@ -1609,10 +1605,6 @@
    F77         Fortran 77 compiler command
    FFLAGS      Fortran 77 compiler flags
    PKG_CONFIG  path to pkg-config utility
@@ -32,175 +32,175 @@
 -              linker flags for OPENSSL, overriding pkg-config
    GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
    GTK_LIBS    linker flags for GTK, overriding pkg-config
- 
-@@ -4501,7 +4493,7 @@
+   GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
+@@ -4523,7 +4515,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 4504 "configure"' > conftest.$ac_ext
-+  echo '#line 4496 "configure"' > conftest.$ac_ext
+-  echo '#line 4526 "configure"' > conftest.$ac_ext
++  echo '#line 4518 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7244,11 +7236,11 @@
+@@ -7266,11 +7258,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7247: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7239: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7269: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7261: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7251: \$? = $ac_status" >&5
-+   echo "$as_me:7243: \$? = $ac_status" >&5
+-   echo "$as_me:7273: \$? = $ac_status" >&5
++   echo "$as_me:7265: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7534,11 +7526,11 @@
+@@ -7556,11 +7548,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7537: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7529: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7559: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7551: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7541: \$? = $ac_status" >&5
-+   echo "$as_me:7533: \$? = $ac_status" >&5
+-   echo "$as_me:7563: \$? = $ac_status" >&5
++   echo "$as_me:7555: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7638,11 +7630,11 @@
+@@ -7660,11 +7652,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7641: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7633: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7663: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7655: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:7645: \$? = $ac_status" >&5
-+   echo "$as_me:7637: \$? = $ac_status" >&5
+-   echo "$as_me:7667: \$? = $ac_status" >&5
++   echo "$as_me:7659: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -9989,7 +9981,7 @@
+@@ -10011,7 +10003,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9992 "configure"
-+#line 9984 "configure"
+-#line 10014 "configure"
++#line 10006 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -10089,7 +10081,7 @@
+@@ -10111,7 +10103,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 10092 "configure"
-+#line 10084 "configure"
+-#line 10114 "configure"
++#line 10106 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12509,11 +12501,11 @@
+@@ -12531,11 +12523,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12512: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12504: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12534: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12526: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:12516: \$? = $ac_status" >&5
-+   echo "$as_me:12508: \$? = $ac_status" >&5
+-   echo "$as_me:12538: \$? = $ac_status" >&5
++   echo "$as_me:12530: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -12613,11 +12605,11 @@
+@@ -12635,11 +12627,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12616: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12608: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12638: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12630: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:12620: \$? = $ac_status" >&5
-+   echo "$as_me:12612: \$? = $ac_status" >&5
+-   echo "$as_me:12642: \$? = $ac_status" >&5
++   echo "$as_me:12634: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -14177,11 +14169,11 @@
+@@ -14199,11 +14191,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14180: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14172: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14202: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14194: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14184: \$? = $ac_status" >&5
-+   echo "$as_me:14176: \$? = $ac_status" >&5
+-   echo "$as_me:14206: \$? = $ac_status" >&5
++   echo "$as_me:14198: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14281,11 +14273,11 @@
+@@ -14303,11 +14295,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14284: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14276: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14306: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14298: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14288: \$? = $ac_status" >&5
-+   echo "$as_me:14280: \$? = $ac_status" >&5
+-   echo "$as_me:14310: \$? = $ac_status" >&5
++   echo "$as_me:14302: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16470,11 +16462,11 @@
+@@ -16492,11 +16484,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16473: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16465: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16495: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16487: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16477: \$? = $ac_status" >&5
-+   echo "$as_me:16469: \$? = $ac_status" >&5
+-   echo "$as_me:16499: \$? = $ac_status" >&5
++   echo "$as_me:16491: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16760,11 +16752,11 @@
+@@ -16782,11 +16774,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16763: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16755: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16785: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16777: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16767: \$? = $ac_status" >&5
-+   echo "$as_me:16759: \$? = $ac_status" >&5
+-   echo "$as_me:16789: \$? = $ac_status" >&5
++   echo "$as_me:16781: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16864,11 +16856,11 @@
+@@ -16886,11 +16878,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16867: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16859: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16889: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16881: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16871: \$? = $ac_status" >&5
-+   echo "$as_me:16863: \$? = $ac_status" >&5
+-   echo "$as_me:16893: \$? = $ac_status" >&5
++   echo "$as_me:16885: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -22161,6 +22153,148 @@
+@@ -22187,6 +22179,148 @@
  
  
  
@@ -349,7 +349,7 @@
  { echo "$as_me:$LINENO: checking for library containing socket" >&5
  echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
  if test "${ac_cv_search_socket+set}" = set; then
-@@ -22328,237 +22462,6 @@
+@@ -22354,237 +22488,6 @@
  fi
  
  
@@ -587,9 +587,9 @@
  # Check whether --enable-largefile was given.
  if test "${enable_largefile+set}" = set; then
    enableval=$enable_largefile;
-@@ -23027,6 +22930,126 @@
+@@ -23052,6 +22955,126 @@
+ 
  
- have_gtk=yes
  
 +
 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -714,7 +714,32 @@
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for GTK" >&5
  echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
-@@ -26479,11 +26502,9 @@
+@@ -23154,6 +23177,8 @@
+ fi
+ 
+ build_gtk=no
++use_gio=no
++use_libnotify=no
+ if test "x$want_gtk" = "xyes" ; then
+     if test "x$have_gtk" = "xyes"; then
+       build_gtk=yes
+@@ -23174,6 +23199,7 @@
+ 
+ 
+ 
++if test "x$build_gtk" = "xyes"; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GIO" >&5
+@@ -23333,6 +23359,7 @@
+ _ACEOF
+ 
+ fi
++fi
+ 
+ 
+ case "$am__api_version" in
+@@ -26732,11 +26759,9 @@
  PTHREAD_CC!$PTHREAD_CC$ac_delim
  PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
  PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
@@ -726,13 +751,40 @@
 +PKG_CONFIG!$PKG_CONFIG$ac_delim
  GTK_CFLAGS!$GTK_CFLAGS$ac_delim
  GTK_LIBS!$GTK_LIBS$ac_delim
- WITH_GTK_TRUE!$WITH_GTK_TRUE$ac_delim
-@@ -26555,7 +26576,7 @@
+ BUILD_GTK_TRUE!$BUILD_GTK_TRUE$ac_delim
+@@ -26814,7 +26839,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -26833,7 +26858,7 @@
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+ _ACEOF
+ sed '
+ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+@@ -26846,6 +26871,8 @@
+ ' >>$CONFIG_STATUS <conf$$subs.sed
+ rm -f conf$$subs.sed
+ cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
+ CEOF$ac_eof
+ _ACEOF
+ 
+@@ -27099,7 +27126,7 @@
+ s&@INSTALL@&$ac_INSTALL&;t t
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&