7 files changed, 84 insertions, 108 deletions

diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 218f04927368..098c4e940382 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,36 +1,37 @@
-# New ports collection makefile for:	libglade
+# New ports collection makefile for:	libglade2
 # Date created:				18 August 1999
 # Whom:					Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libglade
-PORTVERSION=	0.17
-PORTREVISION=	1
+PORTNAME=	libglade2
+PORTVERSION=	1.99.6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/libglade
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomedb.0:${PORTSDIR}/databases/gnomedb
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gtk-x11-1.3.13:${PORTSDIR}/x11-toolkits/gtk13
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOMECTRL=	yes
+USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-bonobo --enable-gnomedb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-post-install:
-	@if [ -L ${PREFIX}/include/glade ]; then \
-		${RM} -f ${PREFIX}/include/glade; \
-	fi
-	@${LN} -sf ${PREFIX}/include/libglade-1.0/glade ${PREFIX}/include/glade
+pre-patch:
+	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 2cc60a7658db..6c86b2e1c880 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (libglade-0.17.tar.gz) = 38b2e2cfd813783fe157617813bfe3b3
+MD5 (gnome2/libglade-1.99.6.tar.bz2) = f9711089ae3db3a29d87e0dd5892de0d
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index b176d42e4de6..fd054791244f 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Fri Sep  7 06:00:35 2001
-+++ Makefile.in	Tue Sep 11 15:11:04 2001
+--- Makefile.in.orig	Thu Jan 31 03:44:13 2002
++++ Makefile.in	Thu Feb 14 11:53:48 2002
 @@ -34,7 +34,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include
@@ -12,23 +12,12 @@ $FreeBSD$
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  
-@@ -167,15 +167,15 @@
- bin_SCRIPTS = libglade-config libglade-xgettext
- noinst_PROGRAMS = test-libglade
- test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS)
--SUBDIRS = intl macros glade doc
-+SUBDIRS = intl macros glade
+@@ -100,7 +100,7 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
  
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
- m4data_DATA = libglade.m4
+-SUBDIRS = glade doc tests
++SUBDIRS = glade doc
  
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = libgladeConf.sh
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libglade.pc $(libglade_gnome_pc) $(libglade_bonobo_pc) \
-   $(libglade_gnomedb_pc)
+ INCLUDES = $(LIBGLADE_CFLAGS)
  
diff --git a/devel/libglade2/files/patch-doc::Makefile.in b/devel/libglade2/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..4a5b4b671943
--- /dev/null
+++ b/devel/libglade2/files/patch-doc::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in	2002/02/14 10:10:45	1.1
++++ doc/Makefile.in	2002/02/14 10:11:18
+@@ -110,7 +110,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = ../glade
+ 
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(datadir)/doc
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/devel/libglade2/files/patch-glade::glade-gnomedb.c b/devel/libglade2/files/patch-glade::glade-gnomedb.c
deleted file mode 100644
index a6c1f722a921..000000000000
--- a/devel/libglade2/files/patch-glade::glade-gnomedb.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- glade/glade-gnomedb.c.orig	Tue Feb 13 03:37:54 2001
-+++ glade/glade-gnomedb.c	Tue Aug 14 11:07:27 2001
-@@ -44,7 +44,7 @@
- {
- 	GtkWidget *wid;
-      
--	wid = gnome_db_login_new (NULL, NULL, NULL);
-+	wid = gnome_db_login_new (NULL);
-      
- 	return wid;
- }
-@@ -55,7 +55,7 @@
- 	GtkWidget *wid = NULL;
- 	GtkWidget *wid2 = NULL;
-      
--	wid2 = gnome_db_login_new (NULL,NULL,NULL);
-+	wid2 = gnome_db_login_new (NULL);
-           
- 	wid = gnome_db_logindlg_new (GNOME_DB_LOGIN (wid2), NULL);
-      
-@@ -150,7 +150,7 @@
- {
- 	GtkWidget *wid;
-        
--	wid = gnome_db_error_new (NULL);
-+	wid = gnome_db_error_new ();
-      
- 	return (wid);
- }
-@@ -160,7 +160,7 @@
- {
- 	GtkWidget *wid;
-        
--	wid = gnome_db_errordlg_new (NULL, NULL);
-+	wid = gnome_db_error_dialog_new (NULL);
-      
- 	return (wid);
- }
diff --git a/devel/libglade2/files/patch-ltmain.sh b/devel/libglade2/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/devel/libglade2/files/patch-ltmain.sh
+++ b/devel/libglade2/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,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
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index b642fde4ccf4..dbb654084d9e 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -1,29 +1,25 @@
-bin/libglade-config
-bin/libglade-xgettext
-etc/libgladeConf.sh
-include/libglade-1.0/glade/glade-build.h
-include/libglade-1.0/glade/glade-widget-tree.h
-include/libglade-1.0/glade/glade-xml.h
-include/libglade-1.0/glade/glade.h
-lib/libglade-bonobo.a
-lib/libglade-bonobo.so
-lib/libglade-bonobo.so.4
-lib/libglade-gnome.a
-lib/libglade-gnome.so
-lib/libglade-gnome.so.4
-lib/libglade-gnomedb.a
-lib/libglade-gnomedb.so
-lib/libglade-gnomedb.so.4
-lib/libglade.a
-lib/libglade.so
-lib/libglade.so.4
-libdata/pkgconfig/libglade-bonobo.pc
-libdata/pkgconfig/libglade-gnome.pc
-libdata/pkgconfig/libglade-gnomedb.pc
-libdata/pkgconfig/libglade.pc
-share/aclocal/libglade.m4
-@dirrm include/libglade-1.0/glade
-@dirrm include/libglade-1.0
-@exec /bin/rm -rf %D/include/glade
-@exec /bin/ln -sf libglade-1.0/glade %D/include/glade
-@unexec /bin/rm -f %D/include/glade
+bin/libglade-convert
+include/libglade-2.0/glade/glade-build.h
+include/libglade-2.0/glade/glade-init.h
+include/libglade-2.0/glade/glade-parser.h
+include/libglade-2.0/glade/glade-xml.h
+include/libglade-2.0/glade/glade.h
+lib/libglade-2.0.a
+lib/libglade-2.0.so
+lib/libglade-2.0.so.0
+libdata/pkgconfig/libglade-2.0.pc
+share/doc/libglade/gladexml.html
+share/doc/libglade/libglade-dtd.html
+share/doc/libglade/libglade-embedding.html
+share/doc/libglade/libglade-extending.html
+share/doc/libglade/libglade-gnome.html
+share/doc/libglade/libglade-i18n.html
+share/doc/libglade/libglade-lib.html
+share/doc/libglade/libglade-libglade-build.html
+share/doc/libglade/libglade-libglade-initialisation.html
+share/doc/libglade/libglade-libglade-sax-parser.html
+share/doc/libglade/libglade-notes.html
+share/doc/libglade/libglade.html
+@dirrm share/doc/libglade
+@dirrm include/libglade-2.0/glade
+@dirrm include/libglade-2.0