Two more for Gnome 2.2.2.

x11/gnome/libgtkhtml/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2003/06/12 20:21:06 marcm Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/07 05:55:44 marcm Exp $
 
 COMMENT=		"lightweight HTML rendering/printing/editing engine"
 
-DISTNAME=		libgtkhtml-2.2.1
+DISTNAME=		libgtkhtml-2.2.4
 CATEGORIES=		x11/gnome
 
 HOMEPAGE=		http://www.gnome.org/
@@ -19,8 +19,7 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtkhtml/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 BUILD_DEPENDS=		:pkgconfig->=0.14.0p1:devel/pkgconfig
-LIB_DEPENDS=		gailutil.17::x11/gnome/gail \
+LIB_DEPENDS=		gailutil.17::x11/gnome/gail
-			xml2.6::textproc/libxml
 
 SEPARATE_BUILD= 	concurrent
 USE_GMAKE=		Yes

x11/gnome/libgtkhtml/distinfo

@@ -1,3 +1,3 @@
-MD5 (libgtkhtml-2.2.1.tar.bz2) = afce0ccf5dfdb51e11fca830367f85e4
+MD5 (libgtkhtml-2.2.4.tar.bz2) = 26443c4027470c4510d221af30a2c3f6
-RMD160 (libgtkhtml-2.2.1.tar.bz2) = 88d135600874567334b2e7cdba6bf12584743e30
+RMD160 (libgtkhtml-2.2.4.tar.bz2) = 8276b08877eb0188b9075602666b4aac221c4c5e
-SHA1 (libgtkhtml-2.2.1.tar.bz2) = 5c7528745825626e9263ca9ae5f09ef0a5623e10
+SHA1 (libgtkhtml-2.2.4.tar.bz2) = 3d2c293f4e6f696cfdcbcfa8afd3a17670be34f5

x11/gnome/libgtkhtml/patches/patch-configure

@@ -1,109 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2003/06/12 20:21:06 marcm Exp $
---- configure.orig	Sat May 31 06:26:55 2003
-+++ configure	Sat May 31 06:34:04 2003
-@@ -3250,6 +3250,16 @@ newos6*)
-   lt_cv_file_magic_test_file=/usr/lib/libnls.so
-   ;;
- 
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
- osf3* | osf4* | osf5*)
-   # this will be overridden with pass_all, but let us keep it just in case
-   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-@@ -4151,8 +4161,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
- 
- if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
- fi
- 
- # Allow CC to be a program name with arguments.
-@@ -4732,7 +4749,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
- extract_expsyms_cmds=
- 
- case $host_os in
--cygwin* | mingw* | pw32* )
-+cygwin* | mingw* | pw32*)
-   # FIXME: the MSVC++ port hasn't been tested in a loooong time
-   # When not using gcc, we currently assume that we are using
-   # Microsoft Visual C++.
-@@ -4740,7 +4757,9 @@ cygwin* | mingw* | pw32* )
-     with_gnu_ld=no
-   fi
-   ;;
--
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- esac
- 
- ld_shlibs=yes
-@@ -5144,10 +5163,24 @@ else
-     ;;
- 
-   openbsd*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-R$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+    else
-+      case "$host_os" in
-+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+        ;;
-+      *)
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-R$libdir'
-+        ;;
-+      esac
-+    fi
-     ;;
- 
-   os2*)
-@@ -5628,9 +5661,21 @@ newsos6)
- 
- openbsd*)
-   version_type=sunos
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--    need_version=no
-+  need_lib_prefix=no
-+  need_version=no
-+  sys_lib_search_path_spec="/usr/lib"
-+  sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case "$host_os" in
-+    openbsd2.[89] | openbsd2.[89].*)
-+      shlibpath_overrides_runpath=no
-+      ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+      ;;
-+    esac
-+  else
-+    shlibpath_overrides_runpath=yes
-   fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

x11/gnome/libgtkhtml/patches/patch-ltmain_sh

@@ -1,6 +1,6 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 20:21:06 marcm Exp $
+$OpenBSD: patch-ltmain_sh,v 1.3 2003/08/07 05:55:44 marcm Exp $
---- ltmain.sh.orig	Wed Apr 17 06:06:13 2002
+--- ltmain.sh.orig	2002-04-17 06:06:13.000000000 -0700
-+++ ltmain.sh	Sat May 31 06:26:55 2003
++++ ltmain.sh	2003-08-06 13:56:20.000000000 -0700
 @@ -1037,6 +1037,17 @@ compiler."
  	continue
  	;;
@@ -19,17 +19,27 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 20:21:06 marcm Exp $
        -module)
  	module=yes
  	continue
-@@ -1473,6 +1484,9 @@ compiler."
+@@ -1473,6 +1484,19 @@ compiler."
  	  fi
  	  continue
  	  ;;
 +	-pthread)
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    newdependency_libs="$deplib $newdependency_libs"
++	    ;;
++	  prog)
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	    ;;
++	  esac
 +	  continue
 +	  ;;
  	%DEPLIBS%)
  	  alldeplibs=yes
  	  continue
-@@ -4412,40 +4426,6 @@ relink_command=\"$relink_command\""
+@@ -4412,40 +4436,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = ":" && exit 0
  

x11/gnome/yelp/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2003/06/12 20:22:04 marcm Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/07 05:55:44 marcm Exp $
 
 COMMENT=		"GNOME 2.0 help browser"
 
-VERSION=		2.2.0
+VERSION=		2.2.3
 DISTNAME=		yelp-${VERSION}
 CATEGORIES=		x11/gnome
 

x11/gnome/yelp/distinfo

@@ -1,3 +1,3 @@
-MD5 (yelp-2.2.0.tar.bz2) = 1148afe2578ad50be59a591677946a4c
+MD5 (yelp-2.2.3.tar.bz2) = 46727cccf4e8d17ec5102e8274b5145c
-RMD160 (yelp-2.2.0.tar.bz2) = f851b47866ae4c6a10c1fafc0669e2deb9b24466
+RMD160 (yelp-2.2.3.tar.bz2) = 368cc226f34e060282a2d5c099304c958b44ca3d
-SHA1 (yelp-2.2.0.tar.bz2) = 7f950076a6f40bd1a145746be23f160d90adb86a
+SHA1 (yelp-2.2.3.tar.bz2) = ef957e21ed16696670ad0712ba1b8339cd97c33c

x11/gnome/yelp/patches/patch-configure

@@ -0,0 +1,13 @@
+$OpenBSD: patch-configure,v 1.3 2003/08/07 05:55:45 marcm Exp $
+--- configure.orig	2003-08-06 14:23:39.000000000 -0700
++++ configure	2003-08-06 14:24:11.000000000 -0700
+@@ -9881,8 +9881,7 @@ CFLAGS="$YELP_CFLAGS $CFLAGS"
+ 
+ YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
+ 
+-YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+-
++YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
+ 
+ echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5
+ echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6

x11/gnome/yelp/patches/patch-ltmain_sh

@@ -1,6 +1,6 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 20:22:04 marcm Exp $
+$OpenBSD: patch-ltmain_sh,v 1.3 2003/08/07 05:55:45 marcm Exp $
---- ltmain.sh.orig	Sat Jan 11 19:16:30 2003
+--- ltmain.sh.orig	2003-06-25 03:46:26.000000000 -0700
-+++ ltmain.sh	Sat May 31 06:22:02 2003
++++ ltmain.sh	2003-08-06 14:05:10.000000000 -0700
 @@ -1082,6 +1082,17 @@ compiler."
  	continue
  	;;
@@ -19,17 +19,27 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 20:22:04 marcm Exp $
        -module)
  	module=yes
  	continue
-@@ -1522,6 +1533,9 @@ compiler."
+@@ -1522,6 +1533,19 @@ compiler."
  	  fi
  	  continue
  	  ;;
 +	-pthread)
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    newdependency_libs="$deplib $newdependency_libs"
++	    ;;
++	  prog)
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	    ;;
++	  esac
 +	  continue
 +	  ;;
  	%DEPLIBS%)
  	  alldeplibs=yes
  	  continue
-@@ -4575,40 +4589,6 @@ relink_command=\"$relink_command\""
+@@ -4569,40 +4593,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = ":" && exit 0
  

x11/gnome/yelp/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/06/12 20:22:04 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.3 2003/08/07 05:55:45 marcm Exp $
 bin/gman
 bin/gnome-help
 bin/yelp
@@ -14,24 +14,33 @@ share/locale/ar/LC_MESSAGES/yelp.mo
 share/locale/az/LC_MESSAGES/yelp.mo
 share/locale/be/LC_MESSAGES/yelp.mo
 share/locale/bg/LC_MESSAGES/yelp.mo
+share/locale/bn/LC_MESSAGES/yelp.mo
 share/locale/ca/LC_MESSAGES/yelp.mo
 share/locale/cs/LC_MESSAGES/yelp.mo
 share/locale/da/LC_MESSAGES/yelp.mo
 share/locale/de/LC_MESSAGES/yelp.mo
 share/locale/el/LC_MESSAGES/yelp.mo
+share/locale/eo/LC_MESSAGES/yelp.mo
 share/locale/es/LC_MESSAGES/yelp.mo
 share/locale/et/LC_MESSAGES/yelp.mo
+share/locale/fa/LC_MESSAGES/yelp.mo
 share/locale/fi/LC_MESSAGES/yelp.mo
 share/locale/fr/LC_MESSAGES/yelp.mo
+share/locale/ga/LC_MESSAGES/yelp.mo
 share/locale/gl/LC_MESSAGES/yelp.mo
 share/locale/he/LC_MESSAGES/yelp.mo
 share/locale/hi/LC_MESSAGES/yelp.mo
 share/locale/hu/LC_MESSAGES/yelp.mo
+share/locale/id/LC_MESSAGES/yelp.mo
+share/locale/is/LC_MESSAGES/yelp.mo
 share/locale/it/LC_MESSAGES/yelp.mo
 share/locale/ja/LC_MESSAGES/yelp.mo
+share/locale/kn/LC_MESSAGES/yelp.mo
 share/locale/ko/LC_MESSAGES/yelp.mo
 share/locale/lv/LC_MESSAGES/yelp.mo
 share/locale/mk/LC_MESSAGES/yelp.mo
+share/locale/ml/LC_MESSAGES/yelp.mo
+share/locale/mn/LC_MESSAGES/yelp.mo
 share/locale/ms/LC_MESSAGES/yelp.mo
 share/locale/nl/LC_MESSAGES/yelp.mo
 share/locale/nn/LC_MESSAGES/yelp.mo
@@ -44,8 +53,11 @@ share/locale/ru/LC_MESSAGES/yelp.mo
 share/locale/sk/LC_MESSAGES/yelp.mo
 share/locale/sl/LC_MESSAGES/yelp.mo
 share/locale/sq/LC_MESSAGES/yelp.mo
+share/locale/sr/LC_MESSAGES/yelp.mo
+share/locale/sr@Latn/LC_MESSAGES/yelp.mo
 share/locale/sv/LC_MESSAGES/yelp.mo
 share/locale/ta/LC_MESSAGES/yelp.mo
+share/locale/th/LC_MESSAGES/yelp.mo
 share/locale/tr/LC_MESSAGES/yelp.mo
 share/locale/uk/LC_MESSAGES/yelp.mo
 share/locale/vi/LC_MESSAGES/yelp.mo
@@ -205,10 +217,16 @@ share/yelp/ui/yelp.glade
 @comment @dirrm share/locale/uk
 @comment @dirrm share/locale/tr/LC_MESSAGES
 @comment @dirrm share/locale/tr
+@comment @dirrm share/locale/th/LC_MESSAGES
+@comment @dirrm share/locale/th
 @comment @dirrm share/locale/ta/LC_MESSAGES
 @comment @dirrm share/locale/ta
 @comment @dirrm share/locale/sv/LC_MESSAGES
 @comment @dirrm share/locale/sv
+@comment @dirrm share/locale/sr@Latn/LC_MESSAGES
+@comment @dirrm share/locale/sr@Latn
+@comment @dirrm share/locale/sr/LC_MESSAGES
+@comment @dirrm share/locale/sr
 @comment @dirrm share/locale/sq/LC_MESSAGES
 @comment @dirrm share/locale/sq
 @comment @dirrm share/locale/sl/LC_MESSAGES
@@ -233,16 +251,26 @@ share/yelp/ui/yelp.glade
 @comment @dirrm share/locale/nl
 @comment @dirrm share/locale/ms/LC_MESSAGES
 @comment @dirrm share/locale/ms
+@comment @dirrm share/locale/mn/LC_MESSAGES
+@comment @dirrm share/locale/mn
+@comment @dirrm share/locale/ml/LC_MESSAGES
+@comment @dirrm share/locale/ml
 @comment @dirrm share/locale/mk/LC_MESSAGES
 @comment @dirrm share/locale/mk
 @comment @dirrm share/locale/lv/LC_MESSAGES
 @comment @dirrm share/locale/lv
 @comment @dirrm share/locale/ko/LC_MESSAGES
 @comment @dirrm share/locale/ko
+@comment @dirrm share/locale/kn/LC_MESSAGES
+@comment @dirrm share/locale/kn
 @comment @dirrm share/locale/ja/LC_MESSAGES
 @comment @dirrm share/locale/ja
 @comment @dirrm share/locale/it/LC_MESSAGES
 @comment @dirrm share/locale/it
+@comment @dirrm share/locale/is/LC_MESSAGES
+@comment @dirrm share/locale/is
+@comment @dirrm share/locale/id/LC_MESSAGES
+@comment @dirrm share/locale/id
 @comment @dirrm share/locale/hu/LC_MESSAGES
 @comment @dirrm share/locale/hu
 @comment @dirrm share/locale/hi/LC_MESSAGES
@@ -251,14 +279,20 @@ share/yelp/ui/yelp.glade
 @comment @dirrm share/locale/he
 @comment @dirrm share/locale/gl/LC_MESSAGES
 @comment @dirrm share/locale/gl
+@comment @dirrm share/locale/ga/LC_MESSAGES
+@comment @dirrm share/locale/ga
 @comment @dirrm share/locale/fr/LC_MESSAGES
 @comment @dirrm share/locale/fr
 @comment @dirrm share/locale/fi/LC_MESSAGES
 @comment @dirrm share/locale/fi
+@comment @dirrm share/locale/fa/LC_MESSAGES
+@comment @dirrm share/locale/fa
 @comment @dirrm share/locale/et/LC_MESSAGES
 @comment @dirrm share/locale/et
 @comment @dirrm share/locale/es/LC_MESSAGES
 @comment @dirrm share/locale/es
+@comment @dirrm share/locale/eo/LC_MESSAGES
+@comment @dirrm share/locale/eo
 @comment @dirrm share/locale/el/LC_MESSAGES
 @comment @dirrm share/locale/el
 @comment @dirrm share/locale/de/LC_MESSAGES
@@ -269,6 +303,8 @@ share/yelp/ui/yelp.glade
 @comment @dirrm share/locale/cs
 @comment @dirrm share/locale/ca/LC_MESSAGES
 @comment @dirrm share/locale/ca
+@comment @dirrm share/locale/bn/LC_MESSAGES
+@comment @dirrm share/locale/bn
 @comment @dirrm share/locale/bg/LC_MESSAGES
 @comment @dirrm share/locale/bg
 @comment @dirrm share/locale/be/LC_MESSAGES