"Hey deanna, does gnash play youtube yet?"
YES. Yes it does.
This updates gnash to 0.8.0. I am having a little trouble
pleasing lib-depends-check, though I'm sure the dependencies are
correct. Clues appreciated.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/gnash/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 25 May 2007 16:17:45 -0000 1.11
+++ Makefile 12 Jun 2007 00:10:14 -0000
@@ -2,72 +2,78 @@
SHARED_ONLY= Yes
COMMENT= "flash player with firefox browser plugin"
-DISTNAME= gnash-0.7.2
-PKGNAME= ${DISTNAME}p5
-SHARED_LIBS += gnashbase 1.0
-SHARED_LIBS += gnashgeo 1.0
-SHARED_LIBS += gnashamf 1.0
-SHARED_LIBS += gnashserver 1.0
-SHARED_LIBS += gnashbackend 1.0
-SHARED_LIBS += gnashgui 1.0
-
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= gnash-0.8.0
+SHARED_LIBS += gnashbase 2.0
+SHARED_LIBS += gnashgeo 2.0
+SHARED_LIBS += gnashamf 2.0
+SHARED_LIBS += gnashserver 2.0
+SHARED_LIBS += gnashbackend 2.0
+SHARED_LIBS += gnashgui 2.0
+SHARED_LIBS += gnashplayer 2.0
CATEGORIES= www
-MASTER_SITES= ftp://ftp.gnu.org/pub/gnu/gnash/0.7.2/
+MASTER_SITES= ${MASTER_SITE_GNU:=/gnash/0.8.0/}
-HOMEPAGE= http://www.gnu.org/software/gnash/
+HOMEPAGE= http://gnash.lulu.com
MAINTAINER= Deanna Phillips <[EMAIL PROTECTED]>
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
+# patented codecs
+PERMIT_PACKAGE_CDROM= No
+PERMIT_PACKAGE_FTP= No
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
LIBTOOL_FLAGS+= --tag=disable-static
MODULES= gettext
-NO_REGRESS= "testsuite available at
http://www.gnu.org/software/gnash/testcases";
+NO_REGRESS= "testsuite available at http://www.gnashdev.org/testcases/";
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_X11= Yes
BUILD_DEPENDS+= ::devel/boost
-LIB_DEPENDS+= curl.>=4::net/curl \
+
+LIB_DEPENDS+= curl.>=5::net/curl \
xml2.>=9.0::textproc/libxml \
theora.>=2::multimedia/libtheora \
agg.>=2::graphics/agg \
- avcodec.>=7,avutil.>=1,avformat.>=7::graphics/ffmpeg \
- gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+ gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \
+ boost_thread-mt,boost_date_time::devel/boost,-libs \
+ gsm::audio/gsm ltdl::devel/libtool,-ltdl \
+ faac::audio/faac faad::audio/faad \
+ mp3lame::audio/lame \
+ SDL.>=6::devel/sdl \
+ vorbis,vorbisenc::audio/libvorbis \
+ avcodec.>=8,avutil.>=2,avformat.>=8::graphics/ffmpeg \
WANTLIB= Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat \
- freetype fontconfig Xrender usbhid Xext X11 z \
- stdc++ m pthread c ssl crypto ogg cairo \
+ freetype fontconfig Xrender usbhid Xext X11 ICE SM \
+ stdc++ m pthread c ssl crypto z ossaudio ogg cairo \
glib-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 pangox-1.0 \
- gobject-2.0 gmodule-2.0 atk-1.0 png jpeg glitz SDL idn
+ gobject-2.0 gmodule-2.0 atk-1.0 png jpeg glitz
CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- ac_cv_lib_gsm_gsm_encode=no
+ LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--enable-plugin \
- --enable-sound=SDL \
+CONFIGURE_ARGS+=--enable-media=ffmpeg \
--with-plugindir=${LOCALBASE}/lib/mozilla-plugins \
- --without-arts \
--disable-klash \
+ --disable-cygnal \
+ --disable-debugger \
--enable-renderer=agg \
--enable-gui=gtk \
- --with-mp3-decoder=ffmpeg \
- --without-gcc-arch
-
-MAKE_FLAGS+= libgnashbase_la_LDFLAGS='-version-info 1:0' \
- libgnashgeo_la_LDFLAGS='-version-info 1:0' \
- libgnashamf_la_LDFLAGS='-version-info 1:0' \
- libgnashserver_la_LDFLAGS='-version-info 1:0' \
- libgnashbackend_la_LDFLAGS='-version-info 1:0' \
- libgnashgui_la_LDFLAGS='-version-info 1:0'
+ --without-gcc-arch \
+ --with-expat-incl=${X11BASE}/include \
+ --with-expat-lib=${X11BASE}/lib
+
+MAKE_FLAGS+= libgnashbase_la_LDFLAGS='-version-info 2:0' \
+ libgnashgeo_la_LDFLAGS='-version-info 2:0' \
+ libgnashamf_la_LDFLAGS='-version-info 2:0' \
+ libgnashserver_la_LDFLAGS='-version-info 2:0' \
+ libgnashbackend_la_LDFLAGS='-version-info 2:0' \
+ libgnashgui_la_LDFLAGS='-version-info 2:0' \
+ libgnashplayer_la_LDFLAGS='-version-info 2:0'
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/gnash/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 Apr 2007 17:26:20 -0000 1.3
+++ distinfo 11 Jun 2007 23:00:28 -0000
@@ -1,5 +1,5 @@
-MD5 (gnash-0.7.2.tar.bz2) = zO8PRb4BpMKZK0bCNjpRTw==
-RMD160 (gnash-0.7.2.tar.bz2) = D1kEtsE/+zsrSl9yPZ/aywqKYZg=
-SHA1 (gnash-0.7.2.tar.bz2) = 4rvXHWFmXENe0iM5B4Bwrxluoxo=
-SHA256 (gnash-0.7.2.tar.bz2) = EtzLS8aUiPUW4Cg+mIQSun21360ydEQl+X1kE5Ki6Ys=
-SIZE (gnash-0.7.2.tar.bz2) = 1599810
+MD5 (gnash-0.8.0.tar.gz) = AvcI2tx839juJY4Ix8Dqyw==
+RMD160 (gnash-0.8.0.tar.gz) = BTFLYbkZD/QsmJqhZu39A+I7d8w=
+SHA1 (gnash-0.8.0.tar.gz) = KainhCElctnX+nw+76RKOxutN2g=
+SHA256 (gnash-0.8.0.tar.gz) = bIPPXiIFzBjqHaJx3LzOvBtTyqWZZLwW0opy6XjlgLQ=
+SIZE (gnash-0.8.0.tar.gz) = 2706203
Index: patches/patch-backend_render_handler_agg_style_h
===================================================================
RCS file: patches/patch-backend_render_handler_agg_style_h
diff -N patches/patch-backend_render_handler_agg_style_h
--- patches/patch-backend_render_handler_agg_style_h 11 May 2007 20:20:23
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-backend_render_handler_agg_style_h,v 1.2 2007/05/11 20:20:23
deanna Exp $
---- backend/render_handler_agg_style.h.orig Mon Nov 6 14:24:24 2006
-+++ backend/render_handler_agg_style.h Fri May 11 12:38:37 2007
-@@ -44,6 +44,12 @@ class agg_style_base (public)
-
- // for non-solid styles:
- virtual void generate_span(agg::rgba8* span, int x, int y, unsigned len)=0;
-+
-+ // Everytime a class has a virtual method it should
-+ // also have a virtual destructor. This will ensure
-+ // that the destructor for the *derived* class is invoked
-+ // when deleting a pointer to base class !!
-+ virtual ~agg_style_base() {}
- };
-
-
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 11 Jun 2007 23:09:01 -0000
@@ -0,0 +1,1246 @@
+$OpenBSD$
+--- configure.orig Fri Jun 8 21:41:56 2007
++++ configure Mon Jun 11 19:08:58 2007
+@@ -3889,387 +3889,25 @@ fi;
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
++ LIBICONV=-liconv
+
+-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+-if test "${with_libiconv_prefix+set}" = set; then
+- withval="$with_libiconv_prefix"
+
+- if test "X$withval" = "Xno"; then
+- use_additional=no
+- else
+- if test "X$withval" = "X"; then
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- else
+- additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
+- fi
+- fi
+
+-fi;
+- LIBICONV=
+- LTLIBICONV=
+- INCICONV=
+- rpathdirs=
+- ltrpathdirs=
+- names_already_handled=
+- names_next_round='iconv '
+- while test -n "$names_next_round"; do
+- names_this_round="$names_next_round"
+- names_next_round=
+- for name in $names_this_round; do
+- already_handled=
+- for n in $names_already_handled; do
+- if test "$n" = "$name"; then
+- already_handled=yes
+- break
+- fi
+- done
+- if test -z "$already_handled"; then
+- names_already_handled="$names_already_handled $name"
+- uppername=`echo "$name" | sed -e
'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+- eval value=\"\$HAVE_LIB$uppername\"
+- if test -n "$value"; then
+- if test "$value" = yes; then
+- eval value=\"\$LIB$uppername\"
+- test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+- eval value=\"\$LTLIB$uppername\"
+- test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+
}$value"
+- else
+- :
+- fi
+- else
+- found_dir=
+- found_la=
+- found_so=
+- found_a=
+- if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- fi
+- fi
+- fi
+- if test "X$found_dir" = "X"; then
+- for x in $LDFLAGS $LTLIBICONV; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- case "$x" in
+- -L*)
+- dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f
"$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
+- found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- fi
+- fi
+- ;;
+- esac
+- if test "X$found_dir" != "X"; then
+- break
+- fi
+- done
+- fi
+- if test "X$found_dir" != "X"; then
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir
-l$name"
+- if test "X$found_so" != "X"; then
+- if test
"$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+-
haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $found_dir"
+- fi
+- if test "$hardcode_direct" = yes; then
+-
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+- if test -n "$hardcode_libdir_flag_spec" && test
"$hardcode_minus_L" = no; then
+-
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $found_dir"
+- fi
+- else
+-
haveit=
+- for x in $LDFLAGS $LIBICONV; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- if test "X$x" = "X-L$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+- fi
+- if test "$hardcode_minus_L" != no; then
+-
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+-
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+- fi
+- fi
+- fi
+- fi
+- else
+- if test "X$found_a" != "X"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+- else
+-
LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+- fi
+- fi
+- additional_includedir=
+- case "$found_dir" in
+- */lib | */lib/)
+- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
's,/lib/*$,,'`
+- additional_includedir="$basedir/include"
+- ;;
+- esac
+- if test "X$additional_includedir" != "X"; then
+-
if test "X$additional_includedir" !=
"X/usr/include"; then
+- haveit=
+- if test "X$additional_includedir" = "X/usr/local/include";
then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- for x in $CPPFLAGS $INCICONV; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- if test "X$x" = "X-I$additional_includedir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_includedir"; then
+- INCICONV="${INCICONV}${INCICONV:+
}-I$additional_includedir"
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test -n "$found_la"; then
+- save_libdir="$libdir"
+- case "$found_la" in
+- */* | *\\*) . "$found_la" ;;
+- *) . "./$found_la" ;;
+- esac
+- libdir="$save_libdir"
+- for dep in $dependency_libs; do
+- case "$dep" in
+- -L*)
+- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+-
if test "X$additional_libdir" != "X/usr/lib"; then
+- haveit=
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- haveit=
+- for x in $LDFLAGS $LIBICONV; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+-
LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+- fi
+- fi
+- haveit=
+- for x in $LDFLAGS $LTLIBICONV; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+-
LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+- fi
+- fi
+- fi
+- fi
+- ;;
+- -R*)
+- dir=`echo "X$dep" | sed -e 's/^X-R//'`
+- if test "$enable_rpath" != no; then
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $dir"
+- fi
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $dir"
+- fi
+- fi
+- ;;
+- -l*)
+- names_next_round="$names_next_round
"`echo "X$dep" | sed -e 's/^X-l//'`
+- ;;
+- *.la)
+-
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e
's,^lib,,' -e 's,\.la$,,'`
+- ;;
+- *)
+- LIBICONV="${LIBICONV}${LIBICONV:+
}$dep"
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+- ;;
+- esac
+- done
+- fi
+- else
+-
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+- fi
+- fi
+- fi
+- done
+- done
+- if test "X$rpathdirs" != "X"; then
+- if test -n "$hardcode_libdir_separator"; then
+- alldirs=
+- for found_dir in $rpathdirs; do
+- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+- done
+- acl_save_libdir="$libdir"
+- libdir="$alldirs"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+- else
+- for found_dir in $rpathdirs; do
+- acl_save_libdir="$libdir"
+- libdir="$found_dir"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+- done
+- fi
+- fi
+- if test "X$ltrpathdirs" != "X"; then
+- for found_dir in $ltrpathdirs; do
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+- done
+- fi
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+ echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
+ if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+@@ -4427,851 +4065,8 @@ echo "${ECHO_T}$USE_NLS" >&6
+
+
+
+- LIBINTL=
+- LTLIBINTL=
+- POSUB=
+-
+- if test "$USE_NLS" = "yes"; then
+- gt_use_preinstalled_gnugettext=no
+-
+-
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
+-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+-int
+-main ()
+-{
+-bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_gnugettext1_libc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_gnugettext1_libc=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
+-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
+-
+- if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+-
+-
+-
+-
+-
+- am_save_CPPFLAGS="$CPPFLAGS"
+-
+- for element in $INCICONV; do
+- haveit=
+- for x in $CPPFLAGS; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X$element"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+- fi
+- done
+-
+-
+- echo "$as_me:$LINENO: checking for iconv" >&5
+-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+-if test "${am_cv_func_iconv+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- am_cv_func_iconv="no, consider installing GNU libiconv"
+- am_cv_lib_iconv=no
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdlib.h>
+-#include <iconv.h>
+-int
+-main ()
+-{
+-iconv_t cd = iconv_open("","");
+- iconv(cd,NULL,NULL,NULL,NULL);
+- iconv_close(cd);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- am_cv_func_iconv=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- if test "$am_cv_func_iconv" != yes; then
+- am_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBICONV"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdlib.h>
+-#include <iconv.h>
+-int
+-main ()
+-{
+-iconv_t cd = iconv_open("","");
+- iconv(cd,NULL,NULL,NULL,NULL);
+- iconv_close(cd);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- LIBS="$am_save_LIBS"
+- fi
+-
+-fi
+-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+-echo "${ECHO_T}$am_cv_func_iconv" >&6
+- if test "$am_cv_func_iconv" = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ICONV 1
+-_ACEOF
+-
+- fi
+- if test "$am_cv_lib_iconv" = yes; then
+- echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+- echo "$as_me:$LINENO: result: $LIBICONV" >&5
+-echo "${ECHO_T}$LIBICONV" >&6
+- else
+- CPPFLAGS="$am_save_CPPFLAGS"
+- LIBICONV=
+- LTLIBICONV=
+- fi
+-
+-
+-
+-
+-
+-
+- use_additional=yes
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+-
+-# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
+-if test "${with_libintl_prefix+set}" = set; then
+- withval="$with_libintl_prefix"
+-
+- if test "X$withval" = "Xno"; then
+- use_additional=no
+- else
+- if test "X$withval" = "X"; then
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- else
+- additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
+- fi
+- fi
+-
+-fi;
+- LIBINTL=
+- LTLIBINTL=
+- INCINTL=
+- rpathdirs=
+- ltrpathdirs=
+- names_already_handled=
+- names_next_round='intl '
+- while test -n "$names_next_round"; do
+- names_this_round="$names_next_round"
+- names_next_round=
+- for name in $names_this_round; do
+- already_handled=
+- for n in $names_already_handled; do
+- if test "$n" = "$name"; then
+- already_handled=yes
+- break
+- fi
+- done
+- if test -z "$already_handled"; then
+- names_already_handled="$names_already_handled $name"
+- uppername=`echo "$name" | sed -e
'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+- eval value=\"\$HAVE_LIB$uppername\"
+- if test -n "$value"; then
+- if test "$value" = yes; then
+- eval value=\"\$LIB$uppername\"
+- test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+- eval value=\"\$LTLIB$uppername\"
+- test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+- else
+- :
+- fi
+- else
+- found_dir=
+- found_la=
+- found_so=
+- found_a=
+- if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- fi
+- fi
+- fi
+- if test "X$found_dir" = "X"; then
+- for x in $LDFLAGS $LTLIBINTL; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- case "$x" in
+- -L*)
+- dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f
"$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
+- found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- fi
+- fi
+- ;;
+- esac
+- if test "X$found_dir" != "X"; then
+- break
+- fi
+- done
+- fi
+- if test "X$found_dir" != "X"; then
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir
-l$name"
+- if test "X$found_so" != "X"; then
+- if test
"$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- else
+-
haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $found_dir"
+- fi
+- if test "$hardcode_direct" = yes; then
+-
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- else
+- if test -n "$hardcode_libdir_flag_spec" && test
"$hardcode_minus_L" = no; then
+-
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $found_dir"
+- fi
+- else
+-
haveit=
+- for x in $LDFLAGS $LIBINTL; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-L$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+- fi
+- if test "$hardcode_minus_L" != no; then
+-
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+- else
+-
LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+- fi
+- fi
+- fi
+- fi
+- else
+- if test "X$found_a" != "X"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+- else
+-
LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+- fi
+- fi
+- additional_includedir=
+- case "$found_dir" in
+- */lib | */lib/)
+- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
's,/lib/*$,,'`
+- additional_includedir="$basedir/include"
+- ;;
+- esac
+- if test "X$additional_includedir" != "X"; then
+-
if test "X$additional_includedir" !=
"X/usr/include"; then
+- haveit=
+- if test "X$additional_includedir" = "X/usr/local/include";
then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- for x in $CPPFLAGS $INCINTL; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-I$additional_includedir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_includedir"; then
+- INCINTL="${INCINTL}${INCINTL:+
}-I$additional_includedir"
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test -n "$found_la"; then
+- save_libdir="$libdir"
+- case "$found_la" in
+- */* | *\\*) . "$found_la" ;;
+- *) . "./$found_la" ;;
+- esac
+- libdir="$save_libdir"
+- for dep in $dependency_libs; do
+- case "$dep" in
+- -L*)
+- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+-
if test "X$additional_libdir" != "X/usr/lib"; then
+- haveit=
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- haveit=
+- for x in $LDFLAGS $LIBINTL; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+-
LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+- fi
+- fi
+- haveit=
+- for x in $LDFLAGS $LTLIBINTL; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+-
LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+- fi
+- fi
+- fi
+- fi
+- ;;
+- -R*)
+- dir=`echo "X$dep" | sed -e 's/^X-R//'`
+- if test "$enable_rpath" != no; then
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $dir"
+- fi
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $dir"
+- fi
+- fi
+- ;;
+- -l*)
+- names_next_round="$names_next_round
"`echo "X$dep" | sed -e 's/^X-l//'`
+- ;;
+- *.la)
+-
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e
's,^lib,,' -e 's,\.la$,,'`
+- ;;
+- *)
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+- ;;
+- esac
+- done
+- fi
+- else
+-
LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+- fi
+- fi
+- fi
+- done
+- done
+- if test "X$rpathdirs" != "X"; then
+- if test -n "$hardcode_libdir_separator"; then
+- alldirs=
+- for found_dir in $rpathdirs; do
+- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+- done
+- acl_save_libdir="$libdir"
+- libdir="$alldirs"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+- else
+- for found_dir in $rpathdirs; do
+- acl_save_libdir="$libdir"
+- libdir="$found_dir"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+- done
+- fi
+- fi
+- if test "X$ltrpathdirs" != "X"; then
+- for found_dir in $ltrpathdirs; do
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+- done
+- fi
+-
+- echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
+-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $INCINTL"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBINTL"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias (const char *);
+-int
+-main ()
+-{
+-bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_gnugettext1_libintl=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_gnugettext1_libintl=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- if test "$gt_cv_func_gnugettext1_libintl" != yes &&
test -n "$LIBICONV"; then
+- LIBS="$LIBS $LIBICONV"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias (const char *);
+-int
+-main ()
+-{
+-bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- LIBINTL="$LIBINTL $LIBICONV"
+- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+- gt_cv_func_gnugettext1_libintl=yes
+-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- fi
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
+-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
+- fi
+-
+- if test
"$gt_cv_func_gnugettext1_libc" = "yes" \
+- || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+- && test "$PACKAGE" != gettext-runtime \
+- && test "$PACKAGE" != gettext-tools; }; then
+- gt_use_preinstalled_gnugettext=yes
+- else
+- LIBINTL=
+- LTLIBINTL=
+- INCINTL=
+- fi
+-
+-
+-
+- if test -n "$INTL_MACOSX_LIBS"; then
+- if test "$gt_use_preinstalled_gnugettext" = "yes" \
+- || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+- LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+- fi
+- fi
+-
+- if test "$gt_use_preinstalled_gnugettext" = "yes" \
+- || test "$nls_cv_use_gnu_gettext" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NLS 1
+-_ACEOF
+-
+- else
+- USE_NLS=no
+- fi
+- fi
+-
+- echo "$as_me:$LINENO: checking whether to use NLS" >&5
+-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
+- echo "$as_me:$LINENO: result: $USE_NLS" >&5
+-echo "${ECHO_T}$USE_NLS" >&6
+- if test "$USE_NLS" = "yes"; then
+- echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
+- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+- gt_source="external libintl"
+- else
+- gt_source="libc"
+- fi
+- else
+- gt_source="included intl directory"
+- fi
+- echo "$as_me:$LINENO: result: $gt_source" >&5
+-echo "${ECHO_T}$gt_source" >&6
+- fi
+-
+- if test "$USE_NLS" = "yes"; then
+-
+- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+- echo "$as_me:$LINENO: checking how to link with libintl" >&5
+-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
+- echo "$as_me:$LINENO: result: $LIBINTL" >&5
+-echo "${ECHO_T}$LIBINTL" >&6
+-
+- for element in $INCINTL; do
+- haveit=
+- for x in $CPPFLAGS; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X$element"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+- fi
+- done
+-
+- fi
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DCGETTEXT 1
+-_ACEOF
+-
+- fi
+-
+- POSUB=po
+- fi
+-
+-
+-
+- INTLLIBS="$LIBINTL"
++ LIBINTL=-lintl
++ INTLLIBS="$LIBINTL"
+
+
+
Index: patches/patch-server_parser_sprite_definition_cpp
===================================================================
RCS file: patches/patch-server_parser_sprite_definition_cpp
diff -N patches/patch-server_parser_sprite_definition_cpp
--- patches/patch-server_parser_sprite_definition_cpp 11 May 2007 20:20:23
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-server_parser_sprite_definition_cpp,v 1.1 2007/05/11 20:20:23
deanna Exp $
---- server/parser/sprite_definition.cpp.orig Sat Oct 28 18:58:32 2006
-+++ server/parser/sprite_definition.cpp Fri May 11 12:40:53 2007
-@@ -104,6 +104,8 @@ sprite_definition::read(stream* in)
- IF_VERBOSE_PARSE (
- log_parse(" show_frame (sprite)");
- );
-+
-+ assert(m_loading_frame < m_frame_count);
- m_loading_frame++;
- }
- else if (_tag_loaders.get(tag_type, &lf))
Index: patches/patch-server_sprite_instance_cpp
===================================================================
RCS file: patches/patch-server_sprite_instance_cpp
diff -N patches/patch-server_sprite_instance_cpp
--- patches/patch-server_sprite_instance_cpp 11 May 2007 20:20:23 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-server_sprite_instance_cpp,v 1.2 2007/05/11 20:20:23 deanna
Exp $
---- server/sprite_instance.cpp.orig Fri Nov 17 14:08:21 2006
-+++ server/sprite_instance.cpp Fri May 11 12:38:37 2007
-@@ -1210,12 +1210,12 @@ bool sprite_instance::on_event(event_id id)
- // Keep m_as_environment alive during any method calls!
- // Don't do this, make sure caller is keeping us alive instead
- //smart_ptr<as_object> this_ptr(this);
-+ as_value method;
-
- bool called = false;
-
- // First, check for built-in event handler.
- {
-- as_value method;
- if (get_event_handler(id, &method))
- {
- // Dispatch.
-@@ -1235,7 +1235,6 @@ bool sprite_instance::on_event(event_id id)
- const tu_stringi& method_name = id.get_function_name();
- if (method_name.length() > 0)
- {
-- as_value method;
- if (get_member(method_name, &method))
- {
- call_method0(method, &m_as_environment, this);
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/gnash/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 11 Feb 2007 20:36:06 -0000 1.2
+++ pkg/DESCR 11 Jun 2007 23:12:42 -0000
@@ -1,4 +1,6 @@
-Gnash is a Free Flash movie player, which works either standalone, or
-as a Firefox/Mozilla plugin. This alpha release supports all Flash
-versions up to, but not including, v9. Flash video is not yet
-supported.
+Gnash is the GNU Flash movie player, which can be run standalone on
+the desktop or an embedded device, as well as as a plugin for several
+browsers.
+
+This version of the OpenBSD port installs a standalone player and
+a Firefox plugin.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/gnash/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 20 Nov 2006 04:06:41 -0000 1.2
+++ pkg/PLIST 10 Jun 2007 23:00:10 -0000
@@ -12,10 +12,17 @@ lib/libgnashgeo.la
@lib lib/libgnashgeo.so.${LIBgnashgeo_VERSION}
lib/libgnashgui.la
@lib lib/libgnashgui.so.${LIBgnashgui_VERSION}
+lib/libgnashplayer.la
[EMAIL PROTECTED] lib/libgnashplayer.so.${LIBgnashplayer_VERSION}
lib/libgnashserver.la
@lib lib/libgnashserver.so.${LIBgnashserver_VERSION}
lib/mozilla-plugins/
lib/mozilla-plugins/libgnashplugin.so
@man man/man1/gnash.1
share/gnash/
+share/gnash/GnashG.png
share/gnash/gnash_128_96.ico
+share/locale/de/gnash.mo
+share/locale/es/gnash.mo
+share/locale/fr/gnash.mo
+share/nls/pl_PL.ISO_8859-2/
