- Remove libgnomedb# and gda#, libgnomedb and gda are no lobnger part

  of Gnome.
- Add support for gtkhtml 3.8
- Correct pkg-plist for gacutil changes with Mono 1.1.9.x
- Include bsd.mono.mk.

Approved by:	ahze (mentor)
Project by:	BSD# <http://www.mono-project.com/Mono:FreeBSD>

5 files changed, 149 insertions, 31 deletions

diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 9c55bd884fcf..01399dcb80e8 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -2,13 +2,13 @@
 # Date created:         2003-01-01
 # Whom:                 Juli Mallett
 #
-# $Id: Makefile,v 1.17 2005/06/07 01:01:09 mezz7 Exp $
 # $FreeBSD$
+#   $Id: Makefile,v 1.8 2005/11/01 04:25:38 tmclau02 Exp $
 #
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	1.0.10
-PORTREVISION=	2
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://go-mono.com/sources/${PORTNAME}/
 
@@ -25,15 +25,18 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5_RUN=	yes
-USE_GNOME=	gnomehack libgnomedb gtkhtml3 vte librsvg2
+USE_GNOME=	gnomehack gtkhtml3 vte librsvg2
 
 MAKE_ENV=MONO_SHARED_DIR=${WRKDIR}
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|^#!/usr/bin/perl|#!${PERL}|'
+	@${REINPLACE_CMD} -e 's|enable_gda=yes|enable_gda=no|g ; \
+		s|enable_gnomedb=yes|enable_gnomedb=no|g' ${WRKSRC}/configure
 
 pre-su-install:
 	${MKDIR} ${LOCALBASE}/share/gapi
 
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-configure b/x11-toolkits/gtk-sharp10/files/patch-configure
index af874a056abd..59cb9b542090 100644
--- a/x11-toolkits/gtk-sharp10/files/patch-configure
+++ b/x11-toolkits/gtk-sharp10/files/patch-configure
@@ -18,3 +18,120 @@
  GENERATED_SOURCES=generated/*.cs
  # Extract the first word of "mono", so it can be a program name with args.
  set dummy mono; ac_word=$2
+@@ -22229,6 +22229,107 @@
+   fi
+ 
+ 
++GTKHTML_REQUIRED_VERSION=3.7.0
++
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
++if test -n "$PKG_CONFIG"; then
++  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo "$as_me:$LINENO: checking for libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION" >&5
++echo $ECHO_N "checking for libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION... $ECHO_C" >&6
++
++        if $PKG_CONFIG --exists "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION" ; then
++            echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++            succeeded=yes
++
++            echo "$as_me:$LINENO: checking GTKHTML_DEPENDENCIES_CFLAGS" >&5
++echo $ECHO_N "checking GTKHTML_DEPENDENCIES_CFLAGS... $ECHO_C" >&6
++            GTKHTML_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION"`
++            echo "$as_me:$LINENO: result: $GTKHTML_DEPENDENCIES_CFLAGS" >&5
++echo "${ECHO_T}$GTKHTML_DEPENDENCIES_CFLAGS" >&6
++
++            echo "$as_me:$LINENO: checking GTKHTML_DEPENDENCIES_LIBS" >&5
++echo $ECHO_N "checking GTKHTML_DEPENDENCIES_LIBS... $ECHO_C" >&6
++            GTKHTML_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION"`
++            echo "$as_me:$LINENO: result: $GTKHTML_DEPENDENCIES_LIBS" >&5
++echo "${ECHO_T}$GTKHTML_DEPENDENCIES_LIBS" >&6
++        else
++            GTKHTML_DEPENDENCIES_CFLAGS=""
++            GTKHTML_DEPENDENCIES_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but
++            ## do set a variable so people can do so.
++            GTKHTML_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION"`
++
++        fi
++
++
++
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     enable_gtkhtml=yes
++  else
++     enable_gtkhtml=no
++  fi
++
++if test "x$enable_gtkhtml" = "xyes"; then
++GTKHTML_VERSION=3.8
++GTKHTML_SOVERSION=18
++else
+ GTKHTML_REQUIRED_VERSION=3.6.0
+ 
+   succeeded=no
+@@ -22639,7 +22740,7 @@
+ fi
+ fi
+ fi
+-
++fi
+ 
+ 
+ if test "x$enable_gnome" = "xyes"; then
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gda_gda-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gda_gda-sharp.dll.config.in
deleted file mode 100644
index dd496cd4542a..000000000000
--- a/x11-toolkits/gtk-sharp10/files/patch-gda_gda-sharp.dll.config.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- gda/gda-sharp.dll.config.in.orig	Wed Jul 14 22:12:50 2004
-+++ gda/gda-sharp.dll.config.in	Wed Jul 14 22:13:11 2004
-@@ -1,3 +1,3 @@
- <configuration>
--  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/x11-toolkits/gtk-sharp10/files/patch-gnomedb_gnomedb-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-gnomedb_gnomedb-sharp.dll.config.in
deleted file mode 100644
index 9a420cea3d69..000000000000
--- a/x11-toolkits/gtk-sharp10/files/patch-gnomedb_gnomedb-sharp.dll.config.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- gnomedb/gnomedb-sharp.dll.config.in.orig	Tue Jun 22 11:19:01 2004
-+++ gnomedb/gnomedb-sharp.dll.config.in	Thu Aug 12 22:39:24 2004
-@@ -1,3 +1,3 @@
- <configuration>
--  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/x11-toolkits/gtk-sharp10/pkg-plist b/x11-toolkits/gtk-sharp10/pkg-plist
index b25ad52dc1e4..caeaf1334869 100644
--- a/x11-toolkits/gtk-sharp10/pkg-plist
+++ b/x11-toolkits/gtk-sharp10/pkg-plist
@@ -22,8 +22,6 @@ lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f/atk-sharp.dll.config
 lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
 lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll
 lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f/gconf-sharp.dll.config
-lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll
-lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f/gda-sharp.dll.config
 lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll
 lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f/gdk-sharp.dll.config
 lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f/glade-sharp.dll
@@ -32,8 +30,6 @@ lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll
 lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f/glib-sharp.dll.config
 lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll
 lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f/gnome-sharp.dll.config
-lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll
-lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f/gnomedb-sharp.dll.config
 lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll
 lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f/gtk-sharp.dll.config
 lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
@@ -45,27 +41,49 @@ lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f/rsvg-sharp.dll.config
 lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll
 lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f/vte-sharp.dll.config
 lib/mono/gtk-sharp/art-sharp.dll
+lib/mono/gtk-sharp/art-sharp.dll.config
+lib/mono/gtk-sharp/art-sharp.dll.mdb
 lib/mono/gtk-sharp/atk-sharp.dll
+lib/mono/gtk-sharp/atk-sharp.dll.config
+lib/mono/gtk-sharp/atk-sharp.dll.mdb
 lib/mono/gtk-sharp/gconf-sharp-peditors.dll
+lib/mono/gtk-sharp/gconf-sharp-peditors.dll.config
+lib/mono/gtk-sharp/gconf-sharp-peditors.dll.mdb
 lib/mono/gtk-sharp/gconf-sharp.dll
-lib/mono/gtk-sharp/gda-sharp.dll
+lib/mono/gtk-sharp/gconf-sharp.dll.config
+lib/mono/gtk-sharp/gconf-sharp.dll.mdb
 lib/mono/gtk-sharp/gdk-sharp.dll
+lib/mono/gtk-sharp/gdk-sharp.dll.config
+lib/mono/gtk-sharp/gdk-sharp.dll.mdb
 lib/mono/gtk-sharp/glade-sharp.dll
+lib/mono/gtk-sharp/glade-sharp.dll.config
+lib/mono/gtk-sharp/glade-sharp.dll.mdb
 lib/mono/gtk-sharp/glib-sharp.dll
+lib/mono/gtk-sharp/glib-sharp.dll.config
+lib/mono/gtk-sharp/glib-sharp.dll.mdb
 lib/mono/gtk-sharp/gnome-sharp.dll
-lib/mono/gtk-sharp/gnomedb-sharp.dll
+lib/mono/gtk-sharp/gnome-sharp.dll.config
+lib/mono/gtk-sharp/gnome-sharp.dll.mdb
 lib/mono/gtk-sharp/gtk-sharp.dll
+lib/mono/gtk-sharp/gtk-sharp.dll.config
+lib/mono/gtk-sharp/gtk-sharp.dll.mdb
 lib/mono/gtk-sharp/gtkhtml-sharp.dll
+lib/mono/gtk-sharp/gtkhtml-sharp.dll.config
+lib/mono/gtk-sharp/gtkhtml-sharp.dll.mdb
 lib/mono/gtk-sharp/pango-sharp.dll
+lib/mono/gtk-sharp/pango-sharp.dll.config
+lib/mono/gtk-sharp/pango-sharp.dll.mdb
 lib/mono/gtk-sharp/rsvg-sharp.dll
+lib/mono/gtk-sharp/rsvg-sharp.dll.config
+lib/mono/gtk-sharp/rsvg-sharp.dll.mdb
 lib/mono/gtk-sharp/vte-sharp.dll
+lib/mono/gtk-sharp/vte-sharp.dll.config
+lib/mono/gtk-sharp/vte-sharp.dll.mdb
 libdata/pkgconfig/art-sharp.pc
 libdata/pkgconfig/gapi.pc
 libdata/pkgconfig/gconf-sharp.pc
-libdata/pkgconfig/gda-sharp.pc
 libdata/pkgconfig/glade-sharp.pc
 libdata/pkgconfig/gnome-sharp.pc
-libdata/pkgconfig/gnomedb-sharp.pc
 libdata/pkgconfig/gtk-sharp.pc
 libdata/pkgconfig/gtkhtml-sharp.pc
 libdata/pkgconfig/rsvg-sharp.pc
@@ -73,12 +91,10 @@ libdata/pkgconfig/vte-sharp.pc
 share/gapi/art-api.xml
 share/gapi/art-symbols.xml
 share/gapi/atk-api.xml
-share/gapi/gda-api.xml
 share/gapi/gdk-api.xml
 share/gapi/gdk-symbols.xml
 share/gapi/glade-api.xml
 share/gapi/gnome-api.xml
-share/gapi/gnomedb-api.xml
 share/gapi/gtk-api.xml
 share/gapi/gtk-symbols.xml
 share/gapi/gtkhtml-api.xml
@@ -97,8 +113,6 @@ share/gapi/vte-api.xml
 @unexec rmdir %D/lib/mono/gac/gtkhtml-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f
 @unexec rmdir %D/lib/mono/gac/gtk-sharp 2> /dev/null || true
-@dirrm lib/mono/gac/gnomedb-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gnomedb-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f
 @unexec rmdir %D/lib/mono/gac/gnome-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f
@@ -107,8 +121,6 @@ share/gapi/vte-api.xml
 @unexec rmdir %D/lib/mono/gac/glade-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f
 @unexec rmdir %D/lib/mono/gac/gdk-sharp 2> /dev/null || true
-@dirrm lib/mono/gac/gda-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gda-sharp 2> /dev/null || true
 @dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f
 @unexec rmdir %D/lib/mono/gac/gconf-sharp-peditors 2> /dev/null || true