summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2002-06-11 16:07:59 +0000
committermarcus <marcus@FreeBSD.org>2002-06-11 16:07:59 +0000
commit85e7a77044984ee0193804680e089e035036d0fb (patch)
treea09327b28e874b6488bc8a17efd9b78b6e154558
parentf060b1fed66041370cc5e1949b769b8e5ccea94c (diff)
downloadFreeBSD-ports-85e7a77044984ee0193804680e089e035036d0fb.zip
FreeBSD-ports-85e7a77044984ee0193804680e089e035036d0fb.tar.gz
Add glade2 and GNOME DB 2 to the tree. These are still beta versions of the
software, but it gives GNOME 2 testers some more stuff to play with.
-rw-r--r--CVSROOT/modules3
-rw-r--r--databases/gnomedb2/Makefile31
-rw-r--r--databases/gnomedb2/distinfo2
-rw-r--r--databases/gnomedb2/files/patch-components::Makefile.in14
-rw-r--r--databases/gnomedb2/files/patch-configure28
-rw-r--r--databases/gnomedb2/files/patch-doc::C::reference::Makefile.in14
-rw-r--r--databases/gnomedb2/files/patch-idl::Makefile.in9
-rw-r--r--databases/gnomedb2/files/patch-lib_Makefile.in11
-rw-r--r--databases/gnomedb2/files/patch-po::Makefile.in.in7
-rw-r--r--databases/gnomedb2/pkg-comment2
-rw-r--r--databases/gnomedb2/pkg-plist206
-rw-r--r--databases/libgda2/Makefile54
-rw-r--r--databases/libgda2/distinfo2
-rw-r--r--databases/libgda2/files/patch-aa19
-rw-r--r--databases/libgda2/files/patch-configure9
-rw-r--r--databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in14
-rw-r--r--databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in14
-rw-r--r--databases/libgda2/files/patch-doc_C_Makefile.in11
-rw-r--r--databases/libgda2/files/patch-po::Makefile.in.in7
-rw-r--r--databases/libgda2/files/patch-tools::gda-buildserver.in14
-rw-r--r--databases/libgda2/files/patch-tools::templates::Makefile.in14
-rw-r--r--databases/libgda2/pkg-plist375
-rw-r--r--databases/libgda3/Makefile54
-rw-r--r--databases/libgda3/distinfo2
-rw-r--r--databases/libgda3/files/patch-aa19
-rw-r--r--databases/libgda3/files/patch-configure9
-rw-r--r--databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in14
-rw-r--r--databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in14
-rw-r--r--databases/libgda3/files/patch-doc_C_Makefile.in11
-rw-r--r--databases/libgda3/files/patch-po::Makefile.in.in7
-rw-r--r--databases/libgda3/files/patch-tools::gda-buildserver.in14
-rw-r--r--databases/libgda3/files/patch-tools::templates::Makefile.in14
-rw-r--r--databases/libgda3/pkg-plist375
-rw-r--r--devel/glade2/Makefile31
-rw-r--r--devel/glade2/distinfo2
-rw-r--r--devel/glade2/files/patch-configure10
-rw-r--r--devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c14
-rw-r--r--devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c14
-rw-r--r--devel/glade2/files/patch-ltmain.sh45
-rw-r--r--devel/glade2/pkg-plist248
40 files changed, 645 insertions, 1112 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules
index cf90ab5..5fc4959 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -1912,6 +1912,7 @@ gkrellweather ports/misc/gkrellweather
glacier ports/mail/glacier
glade ports/devel/glade
glade-- ports/devel/glade--
+glade2 ports/devel/glade2
glame ports/audio/glame
glass ports/graphics/glass
glasteroids ports/games/glasteroids
@@ -1997,6 +1998,7 @@ gnomecontrolcenter2 ports/sysutils/gnomecontrolcenter2
gnomecore ports/x11/gnomecore
gnomecrash ports/devel/gnomecrash
gnomedb ports/databases/gnomedb
+gnomedb2 ports/databases/gnomedb2
gnomedebug ports/devel/gnomedebug
gnomedesktop ports/x11/gnomedesktop
gnomefind ports/sysutils/gnomefind
@@ -3538,6 +3540,7 @@ libfxp ports/ftp/libfxp
libg++ ports/devel/libg++
libgail-gnome ports/x11-toolkits/libgail-gnome
libgda ports/databases/libgda
+libgda2 ports/databases/libgda2
libgdgeda ports/graphics/libgdgeda
libgeda ports/cad/libgeda
libgetline ports/devel/libgetline
diff --git a/databases/gnomedb2/Makefile b/databases/gnomedb2/Makefile
index f0a1ace..496aa9c 100644
--- a/databases/gnomedb2/Makefile
+++ b/databases/gnomedb2/Makefile
@@ -1,42 +1,41 @@
-# New ports collection makefile for: gnomedb
-# Date created: 19th June 2001
-# Whom: Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for: gnomedb2
+# Date created: 02 June 2002
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
#
-PORTNAME= gnomedb
-PORTVERSION= 0.2.96
-PORTREVISION= 1
+PORTNAME= gnomedb2
+PORTVERSION= 0.8.191
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-db
+MASTER_SITE_SUBDIR= pre-gnome2/sources/gnome-db
DISTNAME= gnome-db-${PORTVERSION}
-DIST_SUBDIR= gnome
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gda-client.0:${PORTSDIR}/databases/libgda
+LIB_DEPENDS= gnomedb-2.1:${PORTSDIR}/databases/libgnomedb
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOMECTRL= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --disable-gtk-doc
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-pthread -L${LOCALBASE}/lib -lintl"
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB= VERSION=${PORTVERSION}
+#PLIST_SUB= VERSION=${PORTVERSION}
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
- s|\$\(GNOME_datadir\)/gnome/|\$\(datadir\)/|g ; \
- s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
- s|\$\(GNOME_datadir\)/locale|\$\(prefix\)/share/locale|g'
+ s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
+ s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
diff --git a/databases/gnomedb2/distinfo b/databases/gnomedb2/distinfo
index 4b083ba..6c37868 100644
--- a/databases/gnomedb2/distinfo
+++ b/databases/gnomedb2/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-db-0.2.96.tar.bz2) = 718d3761ef96f83c02d34c16627d8579
+MD5 (gnome2/gnome-db-0.8.191.tar.bz2) = 30d9a7d2ff059719b8b5a482743c1cae
diff --git a/databases/gnomedb2/files/patch-components::Makefile.in b/databases/gnomedb2/files/patch-components::Makefile.in
deleted file mode 100644
index 2591b83..0000000
--- a/databases/gnomedb2/files/patch-components::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- components/Makefile.in 2002/01/22 13:14:51 1.1
-+++ components/Makefile.in 2002/01/22 13:15:50
-@@ -177,7 +177,7 @@
-
- libdatabase_moniker_la_SOURCES = gnomedb-monikers-database.c gnomedb-monikers.h
-
--libdatabase_moniker_la_LIBADD = $(GNOMEDB_LIBS)
-+libdatabase_moniker_la_LIBADD = $(GNOMEDB_LIBS) -module -avoid-version
-
-
- oafdir = $(datadir)/oaf
diff --git a/databases/gnomedb2/files/patch-configure b/databases/gnomedb2/files/patch-configure
index 8925b93..cbcb925 100644
--- a/databases/gnomedb2/files/patch-configure
+++ b/databases/gnomedb2/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig Mon Apr 15 15:30:28 2002
-+++ configure Wed May 1 11:51:50 2002
-@@ -5905,6 +5905,7 @@
+--- configure.orig Tue May 21 12:06:21 2002
++++ configure Mon Jun 3 00:24:38 2002
+@@ -8082,6 +8082,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,21 +8,22 @@ $FreeBSD$
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8876,7 +8877,7 @@
+@@ -10568,8 +10569,7 @@
PERL_CC=`perl -MConfig -e 'print $Config{cc},"\n";'`
PERL_LD=`perl -MConfig -e 'print $Config{ld},"\n";'`
PERL_CCOPTS=`perl -MExtUtils::Embed -e ccopts`
- PERL_LDOPTS=`perl -MExtUtils::Embed -e ldopts`
+-
+ PERL_LDOPTS=`perl -MExtUtils::Embed -e '$_ = ldopts(1); s/-lc //g; print $_ . "\n"'`
-
-
-
-@@ -8906,7 +8907,7 @@
- GNOMEDB_CFLAGS="`gda-config --cflags client` `gnome-config --cflags xml oaf bonobox print gdk_pixbuf`"
- GNOMEDB_LIBS="`gda-config --libs client` `gnome-config --libs xml oaf bonobox print gdk_pixbuf`"
--GNOMEDB_CFLAGS="${GNOMEDB_CFLAGS} -DGNOMELOCALEDIR=\\\"${datadir}/locale\\\""
-+GNOMEDB_CFLAGS="${GNOMEDB_CFLAGS} -DGNOMELOCALEDIR=\\\"${prefix}/share/locale\\\""
+@@ -10589,7 +10589,7 @@
+
+
+-if test $perl_val == true; then
++if test $perl_val = true; then
+ WITH_PERL_TRUE=
+ WITH_PERL_FALSE='#'
+ else
diff --git a/databases/gnomedb2/files/patch-doc::C::reference::Makefile.in b/databases/gnomedb2/files/patch-doc::C::reference::Makefile.in
deleted file mode 100644
index b9c8dda..0000000
--- a/databases/gnomedb2/files/patch-doc::C::reference::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/Makefile.in 2002/05/01 08:49:53 1.1
-+++ doc/C/reference/Makefile.in 2002/05/01 08:50:40
-@@ -174,7 +174,7 @@
-
-
- DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/gnomedb
- TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
-
- DOC_DIR_INSTALL_FILES = libgnomedb.args libgnomedb.hierarchy libgnomedb.signals libgnomedb.types libgnomedb-decl.txt libgnomedb-sections.txt
diff --git a/databases/gnomedb2/files/patch-idl::Makefile.in b/databases/gnomedb2/files/patch-idl::Makefile.in
index da60a4c..6b6f9a2 100644
--- a/databases/gnomedb2/files/patch-idl::Makefile.in
+++ b/databases/gnomedb2/files/patch-idl::Makefile.in
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- idl/Makefile.in 2001/07/26 14:06:24 1.1
-+++ idl/Makefile.in 2001/07/26 14:06:37
-@@ -153,7 +153,7 @@
+--- idl/Makefile.in.orig Sun Jun 2 23:17:56 2002
++++ idl/Makefile.in Sun Jun 2 23:17:42 2002
+@@ -137,7 +137,7 @@
EXTRA_DIST = $(IDL_FILES)
diff --git a/databases/gnomedb2/files/patch-lib_Makefile.in b/databases/gnomedb2/files/patch-lib_Makefile.in
new file mode 100644
index 0000000..ad41b37
--- /dev/null
+++ b/databases/gnomedb2/files/patch-lib_Makefile.in
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig Mon Jun 3 00:45:03 2002
++++ lib/Makefile.in Mon Jun 3 00:46:10 2002
+@@ -133,7 +133,7 @@
+
+ noinst_LTLIBRARIES = libgnomedbfe-2.la
+
+-INCLUDES = $(GNOMEDB_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_GLADEDIR=\""$(datadir)/share/gnome-db/glade"\" -DGNOMEDB_LOCALEDIR=\""$(datair)/locale"\"
++INCLUDES = $(GNOMEDB_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_GLADEDIR=\""$(datadir)/gnome-db/glade"\" -DGNOMEDB_LOCALEDIR=\""$(datair)/locale"\"
+
+
+ idlfiles = $(top_builddir)/idl/GNOME_Database_UI.idl
diff --git a/databases/gnomedb2/files/patch-po::Makefile.in.in b/databases/gnomedb2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 490f48af..0000000
--- a/databases/gnomedb2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- po/Makefile.in.in.orig Fri Jun 15 15:38:54 2001
-+++ po/Makefile.in.in Tue Jun 19 02:37:06 2001
-@@ -25,3 +25,3 @@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
diff --git a/databases/gnomedb2/pkg-comment b/databases/gnomedb2/pkg-comment
index ce1aae1..e61986f 100644
--- a/databases/gnomedb2/pkg-comment
+++ b/databases/gnomedb2/pkg-comment
@@ -1 +1 @@
-Provide uniform access to data sources for the GNOME environment
+Provide uniform access to data sources for the GNOME 2.0 environment
diff --git a/databases/gnomedb2/pkg-plist b/databases/gnomedb2/pkg-plist
index 51f76be..a1bc581 100644
--- a/databases/gnomedb2/pkg-plist
+++ b/databases/gnomedb2/pkg-plist
@@ -1,167 +1,49 @@
-bin/gnomedb-builder
-bin/gnomedb-components
-bin/gnomedb-config
-bin/gnomedb-fe
-bin/gnomedb-mgr
-include/libgnomedb-%%VERSION%%/gnome-db/GNOME_Database_UI.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-browser.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-combo.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-component.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-config.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-control-defprops.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-control-widget.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-control.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-dataset.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-designer.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-dsn-config-druid.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-dsn-config.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-embeddable.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-entry.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-error-dlg.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-error.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-export.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-grid.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-icon-list.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-label.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-list.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-log-viewer.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-login-dlg.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-login.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-moniker.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-report.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-shortcut.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-table-editor.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-util.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-window.h
-include/libgnomedb-%%VERSION%%/gnome-db/gnome-db.h
-lib/bonobo/monikers/libdatabase_moniker.so
-lib/libgnomedb.a
-lib/libgnomedb.so
-lib/libgnomedb.so.0
-share/doc/gnomedb/libgnomedb-decl.txt
-share/doc/gnomedb/libgnomedb-sections.txt
-share/doc/gnomedb/libgnomedb.args
-share/doc/gnomedb/libgnomedb.hierarchy
-share/doc/gnomedb/libgnomedb.types
-share/gnome/apps/Applications/gnomedb-fe.desktop
-share/gnome/help/gnome-db/C/comlib.html
-share/gnome/help/gnome-db/C/components.html
-share/gnome/help/gnome-db/C/fdl-appendix.sgml
-share/gnome/help/gnome-db/C/fdl-section1.html
-share/gnome/help/gnome-db/C/fdl-section10.html
-share/gnome/help/gnome-db/C/fdl-section2.html
-share/gnome/help/gnome-db/C/fdl-section3.html
-share/gnome/help/gnome-db/C/fdl-section4.html
-share/gnome/help/gnome-db/C/fdl-section5.html
-share/gnome/help/gnome-db/C/fdl-section6.html
-share/gnome/help/gnome-db/C/fdl-section7.html
-share/gnome/help/gnome-db/C/fdl-section8.html
-share/gnome/help/gnome-db/C/fdl-section9.html
-share/gnome/help/gnome-db/C/fdl-using.html
-share/gnome/help/gnome-db/C/fdl.html
-share/gnome/help/gnome-db/C/fe.html
-share/gnome/help/gnome-db/C/gnome-db.sgml
-share/gnome/help/gnome-db/C/index.html
-share/gnome/help/gnome-db/C/introduction.html
-share/gnome/help/gnome-db/C/manager-config-components.html
-share/gnome/help/gnome-db/C/manager.html
+bin/gnome-db
+bin/gnome-db-components
+libdata/bonobo/servers/GNOME_Database_UIComponents.server
+share/gnome/applications/gnome-db.desktop
+share/gnome/gnome-2.0/ui/gnome-db-database.xml
+share/gnome/gnome-2.0/ui/gnome-db-manager.xml
+share/gnome/gnome-2.0/ui/gnome-db.xml
+share/gnome/gnome-db/glade/connection-properties.glade
share/gnome/help/gnome-db/C/topic.dat
-share/gnome/help/gnome-db/C/widgetlib-overview.html
-share/gnome/help/gnome-db/C/widgetlib.html
-share/gnome/help/gnome-db/es/comlib.html
-share/gnome/help/gnome-db/es/components.html
-share/gnome/help/gnome-db/es/fe.html
-share/gnome/help/gnome-db/es/gnome-db.html
-share/gnome/help/gnome-db/es/gnome-db.sgml
-share/gnome/help/gnome-db/es/index.html
-share/gnome/help/gnome-db/es/introduction.html
-share/gnome/help/gnome-db/es/manager-config-components.html
-share/gnome/help/gnome-db/es/manager.html
share/gnome/help/gnome-db/es/topic.dat
-share/gnome/help/gnome-db/es/widgetlib-overview.html
-share/gnome/help/gnome-db/es/widgetlib.html
-share/gnome/help/gnome-db/it/comlib.html
-share/gnome/help/gnome-db/it/components.html
-share/gnome/help/gnome-db/it/fdl-appendix.sgml
-share/gnome/help/gnome-db/it/fdl-section1.html
-share/gnome/help/gnome-db/it/fdl-section10.html
-share/gnome/help/gnome-db/it/fdl-section2.html
-share/gnome/help/gnome-db/it/fdl-section3.html
-share/gnome/help/gnome-db/it/fdl-section4.html
-share/gnome/help/gnome-db/it/fdl-section5.html
-share/gnome/help/gnome-db/it/fdl-section6.html
-share/gnome/help/gnome-db/it/fdl-section7.html
-share/gnome/help/gnome-db/it/fdl-section8.html
-share/gnome/help/gnome-db/it/fdl-section9.html
-share/gnome/help/gnome-db/it/fdl-using.html
-share/gnome/help/gnome-db/it/fdl.html
-share/gnome/help/gnome-db/it/fe.html
-share/gnome/help/gnome-db/it/gnome-db.sgml
-share/gnome/help/gnome-db/it/index.html
-share/gnome/help/gnome-db/it/introduction.html
-share/gnome/help/gnome-db/it/manager-config-components.html
-share/gnome/help/gnome-db/it/manager.html
share/gnome/help/gnome-db/it/topic.dat
-share/gnome/help/gnome-db/it/widgetlib-overview.html
-share/gnome/help/gnome-db/it/widgetlib.html
-share/gnome/help/gnome-db/pt_BR/comlib.html
-share/gnome/help/gnome-db/pt_BR/components.html
-share/gnome/help/gnome-db/pt_BR/fe.html
-share/gnome/help/gnome-db/pt_BR/gnome-db.sgml
-share/gnome/help/gnome-db/pt_BR/index.html
-share/gnome/help/gnome-db/pt_BR/introduction.html
-share/gnome/help/gnome-db/pt_BR/manager-config-components.html
-share/gnome/help/gnome-db/pt_BR/manager.html
share/gnome/help/gnome-db/pt_BR/topic.dat
-share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
-share/gnome/help/gnome-db/pt_BR/widgetlib.html
share/gnome/idl/GNOME_Database_UI.idl
-share/gnome/oaf/GNOME_DB_Builder.oaf
-share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
-share/gnome/oaf/GNOME_DB_Connection.oaf
-share/gnome/oaf/GNOME_DB_Designer.oaf
-share/gnome/oaf/GNOME_DB_Export.oaf
-share/gnome/oaf/GNOME_DB_Log.oaf
-share/gnome/oaf/GNOME_DB_Manager.oaf
-share/gnome/oaf/GNOME_DB_Monikers.oaf
-share/gnome/omf/gnome-db/gnome-db-C.omf
-share/gnome/omf/gnome-db/gnome-db-es.omf
-share/gnome/omf/gnome-db/gnome-db-it.omf
-share/gnome/omf/gnome-db/gnome-db-pt_BR.omf
-share/gnome/pixmaps/gnome-db.png
-share/gnome/ui/gnomedb-com-connection.xml
-share/gnome/ui/gnomedb-com-designer.xml
-share/gnome/ui/gnomedb-com-log.xml
-share/gnome/ui/gnomedb-fe.xml
-share/gnome/ui/gnomedb-manager.xml
-share/locale/az/LC_MESSAGES/gnome-db.mo
-share/locale/ca/LC_MESSAGES/gnome-db.mo
-share/locale/da/LC_MESSAGES/gnome-db.mo
-share/locale/de/LC_MESSAGES/gnome-db.mo
-share/locale/el/LC_MESSAGES/gnome-db.mo
-share/locale/es/LC_MESSAGES/gnome-db.mo
-share/locale/fi/LC_MESSAGES/gnome-db.mo
-share/locale/fr/LC_MESSAGES/gnome-db.mo
-share/locale/ga/LC_MESSAGES/gnome-db.mo
-share/locale/gl/LC_MESSAGES/gnome-db.mo
-share/locale/hu/LC_MESSAGES/gnome-db.mo
-share/locale/it/LC_MESSAGES/gnome-db.mo
-share/locale/ja/LC_MESSAGES/gnome-db.mo
-share/locale/ko/LC_MESSAGES/gnome-db.mo
-share/locale/nl/LC_MESSAGES/gnome-db.mo
-share/locale/nn/LC_MESSAGES/gnome-db.mo
-share/locale/no/LC_MESSAGES/gnome-db.mo
-share/locale/pl/LC_MESSAGES/gnome-db.mo
-share/locale/pt/LC_MESSAGES/gnome-db.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-db.mo
-share/locale/ru/LC_MESSAGES/gnome-db.mo
-share/locale/sk/LC_MESSAGES/gnome-db.mo
-share/locale/sl/LC_MESSAGES/gnome-db.mo
-share/locale/sv/LC_MESSAGES/gnome-db.mo
-share/locale/tr/LC_MESSAGES/gnome-db.mo
-share/locale/uk/LC_MESSAGES/gnome-db.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
-@dirrm share/gnome/omf/gnome-db
+share/locale/az/LC_MESSAGES/gnomedb-2.mo
+share/locale/ca/LC_MESSAGES/gnomedb-2.mo
+share/locale/da/LC_MESSAGES/gnomedb-2.mo
+share/locale/de/LC_MESSAGES/gnomedb-2.mo
+share/locale/el/LC_MESSAGES/gnomedb-2.mo
+share/locale/es/LC_MESSAGES/gnomedb-2.mo
+share/locale/fi/LC_MESSAGES/gnomedb-2.mo
+share/locale/fr/LC_MESSAGES/gnomedb-2.mo
+share/locale/ga/LC_MESSAGES/gnomedb-2.mo
+share/locale/gl/LC_MESSAGES/gnomedb-2.mo
+share/locale/hu/LC_MESSAGES/gnomedb-2.mo
+share/locale/it/LC_MESSAGES/gnomedb-2.mo
+share/locale/ja/LC_MESSAGES/gnomedb-2.mo
+share/locale/ko/LC_MESSAGES/gnomedb-2.mo
+share/locale/lv/LC_MESSAGES/gnomedb-2.mo
+share/locale/ms/LC_MESSAGES/gnomedb-2.mo
+share/locale/nl/LC_MESSAGES/gnomedb-2.mo
+share/locale/nn/LC_MESSAGES/gnomedb-2.mo
+share/locale/no/LC_MESSAGES/gnomedb-2.mo
+share/locale/pl/LC_MESSAGES/gnomedb-2.mo
+share/locale/pt/LC_MESSAGES/gnomedb-2.mo
+share/locale/pt_BR/LC_MESSAGES/gnomedb-2.mo
+share/locale/ro/LC_MESSAGES/gnomedb-2.mo
+share/locale/ru/LC_MESSAGES/gnomedb-2.mo
+share/locale/sk/LC_MESSAGES/gnomedb-2.mo
+share/locale/sl/LC_MESSAGES/gnomedb-2.mo
+share/locale/sv/LC_MESSAGES/gnomedb-2.mo
+share/locale/ta/LC_MESSAGES/gnomedb-2.mo
+share/locale/tr/LC_MESSAGES/gnomedb-2.mo
+share/locale/uk/LC_MESSAGES/gnomedb-2.mo
+share/locale/vi/LC_MESSAGES/gnomedb-2.mo
+share/locale/zh_CN/LC_MESSAGES/gnomedb-2.mo
+share/locale/zh_TW/LC_MESSAGES/gnomedb-2.mo
@dirrm share/gnome/help/gnome-db/pt_BR/images
@dirrm share/gnome/help/gnome-db/pt_BR
@dirrm share/gnome/help/gnome-db/it/images
@@ -171,7 +53,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
@dirrm share/gnome/help/gnome-db/C/images
@dirrm share/gnome/help/gnome-db/C
@dirrm share/gnome/help/gnome-db
-@dirrm share/gnome/apps/Applications
-@dirrm share/doc/gnomedb
-@dirrm include/libgnomedb-%%VERSION%%/gnome-db
-@dirrm include/libgnomedb-%%VERSION%%
+@dirrm share/gnome/gnome-db/glade
+@dirrm share/gnome/gnome-db
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 0fb8c43..31cd76e 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -1,41 +1,65 @@
-# New ports collection makefile for: libgda
-# Date created: 8th March 2001
-# Whom: Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for: libgda2
+# Date created: 02 June 2002
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
#
-PORTNAME= libgda
-PORTVERSION= 0.2.96
-PORTREVISION= 1
+PORTNAME= libgda2
+PORTVERSION= 0.8.191
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
-DIST_SUBDIR= gnome
+MASTER_SITE_SUBDIR= pre-gnome2/sources/libgda
+DISTNAME= libgda-${PORTVERSION}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
- bonobo.2:${PORTSDIR}/devel/bonobo
+LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \
+ xslt.1:${PORTSDIR}/textproc/libxslt
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOMECTRL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --disable-gtk-doc
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
+ --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB= VERSION=${PORTVERSION}
+
+.if defined(WITH_MYSQL)
+LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
+PLIST_SUB= MYSQL=""
+.else
+PLIST_SUB= MYSQL="@comment "
+.endif
+
+.if defined(WITH_POSTGRES)
+LIB_DEPENDS+= pq.2:${PORTSDIR}/databases/postgres7
+CONFIGURE_ARGS+= --with-postgres=${LOCALBASE}
+PLIST_SUB+= POSTGRES=""
+.else
+PLIST_SUB+= POSTGRES="@comment "
+.endif
+
+pre-extract:
+.if !defined(WITH_MYSQL)
+ @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
+.endif
+.if !defined(WITH_POSTGRES)
+ @${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES."
+.endif
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
- s|share/idl|share/gnome/idl|g ; \
+ s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index 6859d9c..bddbb8f 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1 +1 @@
-MD5 (gnome/libgda-0.2.96.tar.bz2) = f9975f05dfb2144e5470b792f2319987
+MD5 (gnome2/libgda-0.8.191.tar.bz2) = fc8d35ef19fe7c8b7a4261d5a20800b8
diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa
index 8f9cc8f..6892fe3 100644
--- a/databases/libgda2/files/patch-aa
+++ b/databases/libgda2/files/patch-aa
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig Wed Nov 21 10:29:52 2001
-+++ Makefile.in Wed Nov 21 10:30:19 2001
-@@ -158,7 +158,7 @@
- YACC = @YACC@
- l = @l@
+--- Makefile.in.orig Sun Jun 2 22:13:42 2002
++++ Makefile.in Sun Jun 2 22:13:50 2002
+@@ -149,7 +149,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ cxxflags_set = @cxxflags_set@
--SUBDIRS = po intl macros idl lib bindings providers tools testing doc
-+SUBDIRS = po intl macros idl lib bindings providers tools doc
+-SUBDIRS = po idl libgda providers report tools testing data doc
++SUBDIRS = po idl libgda providers report tools data doc
- EXTRA_DIST = COPYING libgda.spec.in xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in
+ EXTRA_DIST = COPYING libgda.spec.in libgda.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/databases/libgda2/files/patch-configure b/databases/libgda2/files/patch-configure
index 948849e..d744b24 100644
--- a/databases/libgda2/files/patch-configure
+++ b/databases/libgda2/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure 2002/05/01 08:18:05 1.1
-+++ configure 2002/05/01 08:19:03
-@@ -5785,6 +5785,7 @@
+--- configure.orig Sun Jun 2 22:12:29 2002
++++ configure Sun Jun 2 22:13:06 2002
+@@ -8429,6 +8429,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in
deleted file mode 100644
index 463f043..0000000
--- a/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1
-+++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40
-@@ -171,7 +171,7 @@
- LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.so $(top_builddir)/lib/gda-client/.libs/libgda-client.a "
-
-
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
-
- DOC_DIR_INSTALL_FILES = libgda-client.args libgda-client.hierarchy libgda-client.signals libgda-client.types libgda-client-decl.txt libgda-client-sections.txt
-
diff --git a/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in
deleted file mode 100644
index 25b6b1d..0000000
--- a/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1
-+++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35
-@@ -171,7 +171,7 @@
- LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.a "
-
-
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
-
- DOC_DIR_INSTALL_FILES = libgda-common.args libgda-common.hierarchy libgda-common.signals libgda-common.types libgda-common-decl.txt libgda-common-sections.txt
-
diff --git a/databases/libgda2/files/patch-doc_C_Makefile.in b/databases/libgda2/files/patch-doc_C_Makefile.in
new file mode 100644
index 0000000..718a4a1
--- /dev/null
+++ b/databases/libgda2/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002
++++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002
+@@ -152,7 +152,7 @@
+ cxxflags_set = @cxxflags_set@
+
+ DOC_MODULE = libgda
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+
+ # The top-level SGML file. Change it if you want.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/libgda2/files/patch-po::Makefile.in.in b/databases/libgda2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 3f425ff..0000000
--- a/databases/libgda2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- po/Makefile.in.in.orig Wed Jun 13 15:55:50 2001
-+++ po/Makefile.in.in Tue Jun 19 01:14:13 2001
-@@ -25,3 +25,3 @@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
diff --git a/databases/libgda2/files/patch-tools::gda-buildserver.in b/databases/libgda2/files/patch-tools::gda-buildserver.in
deleted file mode 100644
index fa75e2d..0000000
--- a/databases/libgda2/files/patch-tools::gda-buildserver.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/gda-buildserver.in 2001/08/06 08:16:41 1.1
-+++ tools/gda-buildserver.in 2001/08/06 08:16:54
-@@ -7,7 +7,7 @@
- CC=@CC@
- shell=@shell@
-
--TEMPLATES_DIR="${prefix}/share/gda/templates"
-+TEMPLATES_DIR="${prefix}/share/gnome/gda/templates"
- TMPL_C_FILES="gda-srv-command.c gda-srv-connection.c gda-srv-recordset.c main-srv.c"
- TMPL_H_FILES="gda-srv.h"
-
diff --git a/databases/libgda2/files/patch-tools::templates::Makefile.in b/databases/libgda2/files/patch-tools::templates::Makefile.in
deleted file mode 100644
index 2ca62bf..0000000
--- a/databases/libgda2/files/patch-tools::templates::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/templates/Makefile.in 2001/08/06 08:15:18 1.1
-+++ tools/templates/Makefile.in 2001/08/06 08:15:53
-@@ -148,7 +148,7 @@
-
- EXTRA_DIST = $(TEMPLATE_FILES)
-
--gdatemplatesdir = $(prefix)/share/gda/templates
-+gdatemplatesdir = $(prefix)/share/gnome/gda/templates
- gdatemplates_DATA = $(TEMPLATE_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 60028e4..6d25a2f 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -1,212 +1,167 @@
-bin/gda-buildclient
-bin/gda-buildserver
-bin/gda-config
-bin/gda-default-srv
bin/gda-run
-include/libgda-%%VERSION%%/gda++/gdaBatch.h
-include/libgda-%%VERSION%%/gda++/gdaCommand.h
-include/libgda-%%VERSION%%/gda++/gdaConnection.h
-include/libgda-%%VERSION%%/gda++/gdaError.h
-include/libgda-%%VERSION%%/gda++/gdaErrorList.h
-include/libgda-%%VERSION%%/gda++/gdaField.h
-include/libgda-%%VERSION%%/gda++/gdaHelpers.h
-include/libgda-%%VERSION%%/gda++/gdaIncludes.h
-include/libgda-%%VERSION%%/gda++/gdaRecordset.h
-include/libgda-%%VERSION%%/gda++/gdaValue.h
-include/libgda-%%VERSION%%/gda/GDA.h
-include/libgda-%%VERSION%%/gda/gda-batch.h
-include/libgda-%%VERSION%%/gda/gda-client.h
-include/libgda-%%VERSION%%/gda/gda-command.h
-include/libgda-%%VERSION%%/gda/gda-common-defs.h
-include/libgda-%%VERSION%%/gda/gda-common.h
-include/libgda-%%VERSION%%/gda/gda-config.h
-include/libgda-%%VERSION%%/gda/gda-connection-pool.h
-include/libgda-%%VERSION%%/gda/gda-connection.h
-include/libgda-%%VERSION%%/gda/gda-corba.h
-include/libgda-%%VERSION%%/gda/gda-error.h
-include/libgda-%%VERSION%%/gda/gda-export.h
-include/libgda-%%VERSION%%/gda/gda-field.h
-include/libgda-%%VERSION%%/gda/gda-listener.h
-include/libgda-%%VERSION%%/gda/gda-log.h
-include/libgda-%%VERSION%%/gda/gda-quark-list.h
-include/libgda-%%VERSION%%/gda/gda-recordset.h
-include/libgda-%%VERSION%%/gda/gda-server-command.h
-include/libgda-%%VERSION%%/gda/gda-server-connection.h
-include/libgda-%%VERSION%%/gda/gda-server-error.h
-include/libgda-%%VERSION%%/gda/gda-server-field.h
-include/libgda-%%VERSION%%/gda/gda-server-recordset.h
-include/libgda-%%VERSION%%/gda/gda-server.h
-include/libgda-%%VERSION%%/gda/gda-thread.h
-include/libgda-%%VERSION%%/gda/gda-util.h
-include/libgda-%%VERSION%%/gda/gda-value.h
-include/libgda-%%VERSION%%/gda/gda-xml-atom-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-bin-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-database.h
-include/libgda-%%VERSION%%/gda/gda-xml-document.h
-include/libgda-%%VERSION%%/gda/gda-xml-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-list-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-util.h
-lib/libgda-client.a
-lib/libgda-client.so
-lib/libgda-client.so.0
-lib/libgda-clientcpp.a
-lib/libgda-clientcpp.so
-lib/libgda-clientcpp.so.0
-lib/libgda-common.a
-lib/libgda-common.so
-lib/libgda-common.so.0
-lib/libgda-server.a
-lib/libgda-server.so
-lib/libgda-server.so.0
-share/doc/libgda/libgda-client-decl.txt
-share/doc/libgda/libgda-client-sections.txt
-share/doc/libgda/libgda-client.args
-share/doc/libgda/libgda-client.hierarchy
-share/doc/libgda/libgda-client.signals
-share/doc/libgda/libgda-client.types
-share/doc/libgda/libgda-common-decl.txt
-share/doc/libgda/libgda-common-sections.txt
-share/doc/libgda/libgda-common.args
-share/doc/libgda/libgda-common.hierarchy
-share/doc/libgda/libgda-common.signals
-share/doc/libgda/libgda-common.types
-share/gnome/gda/templates/gda-srv-command.c.tmpl
-share/gnome/gda/templates/gda-srv-connection.c.tmpl
-share/gnome/gda/templates/gda-srv-recordset.c.tmpl
-share/gnome/gda/templates/gda-srv.h.tmpl
-share/gnome/gda/templates/main-srv.c.tmpl
-share/gnome/help/libgda/C/architecture.html
-share/gnome/help/libgda/C/clients-building-corba.html
-share/gnome/help/libgda/C/clients-building.html
-share/gnome/help/libgda/C/clients.html
-share/gnome/help/libgda/C/fdl-section1.html
-share/gnome/help/libgda/C/fdl-section10.html
-share/gnome/help/libgda/C/fdl-section2.html
-share/gnome/help/libgda/C/fdl-section3.html
-share/gnome/help/libgda/C/fdl-section4.html
-share/gnome/help/libgda/C/fdl-section5.html
-share/gnome/help/libgda/C/fdl-section6.html
-share/gnome/help/libgda/C/fdl-section7.html
-share/gnome/help/libgda/C/fdl-section8.html
-share/gnome/help/libgda/C/fdl-section9.html
-share/gnome/help/libgda/C/fdl-using.html
-share/gnome/help/libgda/C/fdl.html
-share/gnome/help/libgda/C/gda-client-batch.html
-share/gnome/help/libgda/C/gda-client-meta.html
-share/gnome/help/libgda/C/gda-client-objects.html
-share/gnome/help/libgda/C/gda-client-types.html
-share/gnome/help/libgda/C/gda-client.html
-share/gnome/help/libgda/C/gda-common-logs.html
-share/gnome/help/libgda/C/gda-common-xml-databases.html
-share/gnome/help/libgda/C/gda-common-xml-queries.html
-share/gnome/help/libgda/C/gda-common.html
-share/gnome/help/libgda/C/index.html
-share/gnome/help/libgda/C/installation-configuring.html
-share/gnome/help/libgda/C/installation-installing.html
-share/gnome/help/libgda/C/installation.html
-share/gnome/help/libgda/C/introduction.html
-share/gnome/help/libgda/C/libgda.html
-share/gnome/help/libgda/C/providers-actual-implementation.html
-share/gnome/help/libgda/C/providers-examples.html
-share/gnome/help/libgda/C/providers-implementation.html
-share/gnome/help/libgda/C/providers.html
-share/gnome/help/libgda/C/reports.html
-share/gnome/help/libgda/C/topic.dat
-share/gnome/help/libgda/es/architecture.html
-share/gnome/help/libgda/es/clients-building-corba.html
-share/gnome/help/libgda/es/clients-building.html
-share/gnome/help/libgda/es/clients.html
-share/gnome/help/libgda/es/gda-client-batch.html
-share/gnome/help/libgda/es/gda-client-meta.html
-share/gnome/help/libgda/es/gda-client-objects.html
-share/gnome/help/libgda/es/gda-client-types.html
-share/gnome/help/libgda/es/gda-client.html
-share/gnome/help/libgda/es/gda-common-logs.html
-share/gnome/help/libgda/es/gda-common-xml-databases.html
-share/gnome/help/libgda/es/gda-common-xml-queries.html
-share/gnome/help/libgda/es/gda-common.html
-share/gnome/help/libgda/es/index.html
-share/gnome/help/libgda/es/installation-configuring.html
-share/gnome/help/libgda/es/installation-installing.html
-share/gnome/help/libgda/es/installation.html
-share/gnome/help/libgda/es/introduction.html
-share/gnome/help/libgda/es/libgda.html
-share/gnome/help/libgda/es/providers-actual-implementation.html
-share/gnome/help/libgda/es/providers-examples.html
-share/gnome/help/libgda/es/providers-implementation.html
-share/gnome/help/libgda/es/providers.html
-share/gnome/help/libgda/es/reports.html
-share/gnome/help/libgda/es/topic.dat
-share/gnome/help/libgda/pt_BR/architecture.html
-share/gnome/help/libgda/pt_BR/c162.html
-share/gnome/help/libgda/pt_BR/c182.html
-share/gnome/help/libgda/pt_BR/c323.html
-share/gnome/help/libgda/pt_BR/c350.html
-share/gnome/help/libgda/pt_BR/clients-building-corba.html
-share/gnome/help/libgda/pt_BR/clients-building.html
-share/gnome/help/libgda/pt_BR/gda-client-batch.html
-share/gnome/help/libgda/pt_BR/gda-client-meta.html
-share/gnome/help/libgda/pt_BR/gda-client-objects.html
-share/gnome/help/libgda/pt_BR/gda-client-types.html
-share/gnome/help/libgda/pt_BR/gda-common-logs.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html
-share/gnome/help/libgda/pt_BR/index.html
-share/gnome/help/libgda/pt_BR/installation-configuring.html
-share/gnome/help/libgda/pt_BR/installation-installing.html
-share/gnome/help/libgda/pt_BR/installation.html
-share/gnome/help/libgda/pt_BR/introduction.html
-share/gnome/help/libgda/pt_BR/libgda.html
-share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
-share/gnome/help/libgda/pt_BR/providers-examples.html
-share/gnome/help/libgda/pt_BR/providers-implementation.html
-share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/idl/GDA.idl
-share/gnome/idl/GDA_Command.idl
-share/gnome/idl/GDA_Connection.idl
-share/gnome/idl/GDA_Error.idl
-share/gnome/idl/GDA_Field.idl
-share/gnome/idl/GDA_Listener.idl
-share/gnome/idl/GDA_Parameter.idl
-share/gnome/idl/GDA_Recordset.idl
-share/gnome/oaf/GNOME_GDA_Provider_Default.oaf
-share/gnome/omf/libgda/libgda-C.omf
-share/gnome/omf/libgda/libgda-es.omf
-share/gnome/omf/libgda/libgda-pt_BR.omf
-share/locale/ca/LC_MESSAGES/libgda.mo
-share/locale/da/LC_MESSAGES/libgda.mo
-share/locale/de/LC_MESSAGES/libgda.mo
-share/locale/el/LC_MESSAGES/libgda.mo
-share/locale/es/LC_MESSAGES/libgda.mo
-share/locale/fi/LC_MESSAGES/libgda.mo
-share/locale/fr/LC_MESSAGES/libgda.mo
-share/locale/ga/LC_MESSAGES/libgda.mo
-share/locale/gl/LC_MESSAGES/libgda.mo
-share/locale/hu/LC_MESSAGES/libgda.mo
-share/locale/it/LC_MESSAGES/libgda.mo
-share/locale/ja/LC_MESSAGES/libgda.mo
-share/locale/nl/LC_MESSAGES/libgda.mo
-share/locale/nn/LC_MESSAGES/libgda.mo
-share/locale/no/LC_MESSAGES/libgda.mo
-share/locale/pl/LC_MESSAGES/libgda.mo
-share/locale/pt/LC_MESSAGES/libgda.mo
-share/locale/pt_BR/LC_MESSAGES/libgda.mo
-share/locale/ru/LC_MESSAGES/libgda.mo
-share/locale/sk/LC_MESSAGES/libgda.mo
-share/locale/sl/LC_MESSAGES/libgda.mo
-share/locale/sv/LC_MESSAGES/libgda.mo
-share/locale/uk/LC_MESSAGES/libgda.mo
-@dirrm share/gnome/omf/libgda
-@dirrm share/gnome/help/libgda/pt_BR/images
-@dirrm share/gnome/help/libgda/pt_BR
-@dirrm share/gnome/help/libgda/es/images
-@dirrm share/gnome/help/libgda/es
-@dirrm share/gnome/help/libgda/C/images
-@dirrm share/gnome/help/libgda/C
-@dirrm share/gnome/help/libgda
-@dirrm share/gnome/gda/templates
-@dirrm share/gnome/gda
+etc/libgda/config
+include/libgda-report/gda-report-document.h
+include/libgda-report/gda-report.h
+include/libgda/gda-client.h
+include/libgda/gda-command.h
+include/libgda/gda-config.h
+include/libgda/gda-connection.h
+include/libgda/gda-data-model-array.h
+include/libgda/gda-data-model-hash.h
+include/libgda/gda-data-model-list.h
+include/libgda/gda-data-model.h
+include/libgda/gda-error.h
+include/libgda/gda-export.h
+include/libgda/gda-field.h
+include/libgda/gda-log.h
+include/libgda/gda-marshal.h
+include/libgda/gda-parameter.h
+include/libgda/gda-quark-list.h
+include/libgda/gda-row.h
+include/libgda/gda-select.h
+include/libgda/gda-server-provider.h
+include/libgda/gda-table.h
+include/libgda/gda-util.h
+include/libgda/gda-value.h
+include/libgda/gda-xml-connection.h
+include/libgda/gda-xml-database.h
+include/libgda/gda-xml-document.h
+include/libgda/gda-xql-atom.h
+include/libgda/gda-xql-bin.h
+include/libgda/gda-xql-column.h
+include/libgda/gda-xql-const.h
+include/libgda/gda-xql-delete.h
+include/libgda/gda-xql-dml.h
+include/libgda/gda-xql-dual.h
+include/libgda/gda-xql-field.h
+include/libgda/gda-xql-func.h
+include/libgda/gda-xql-insert.h
+include/libgda/gda-xql-item.h
+include/libgda/gda-xql-join.h
+include/libgda/gda-xql-list.h
+include/libgda/gda-xql-query.h
+include/libgda/gda-xql-select.h
+include/libgda/gda-xql-stack.h
+include/libgda/gda-xql-target.h
+include/libgda/gda-xql-update.h
+include/libgda/gda-xql-utils.h
+include/libgda/gda-xql-value.h
+include/libgda/gda-xql-valueref.h
+include/libgda/libgda.h
+lib/libgda-2.a
+lib/libgda-2.so
+lib/libgda-2.so.1
+lib/libgda-report-2.a
+lib/libgda-report-2.so
+lib/libgda-report-2.so.1
+lib/libgda/providers/libgda-default.so
+%%MYSQL%%lib/libgda/providers/libgda-mysql.so
+%%POSTGRES%%lib/libgda/providers/libgda-postgres.so
+libdata/pkgconfig/libgda.pc
+share/doc/libgda/architecture.html
+share/doc/libgda/fdl-section1.html
+share/doc/libgda/fdl-section10.html
+share/doc/libgda/fdl-section2.html
+share/doc/libgda/fdl-section3.html
+share/doc/libgda/fdl-section4.html
+share/doc/libgda/fdl-section5.html
+share/doc/libgda/fdl-section6.html
+share/doc/libgda/fdl-section7.html
+share/doc/libgda/fdl-section8.html
+share/doc/libgda/fdl-section9.html
+share/doc/libgda/fdl-using.html
+share/doc/libgda/fdl.html
+share/doc/libgda/index.html
+share/doc/libgda/index.sgml
+share/doc/libgda/installation-configuring.html
+share/doc/libgda/installation-installing.html
+share/doc/libgda/installation.html
+share/doc/libgda/introduction.html
+share/doc/libgda/libgda-api.html
+share/doc/libgda/libgda-gda-command.html
+share/doc/libgda/libgda-gda-config.html
+share/doc/libgda/libgda-gda-field.html
+share/doc/libgda/libgda-gda-log.html
+share/doc/libgda/libgda-gda-parameter.html
+share/doc/libgda/libgda-gda-quark-list.html
+share/doc/libgda/libgda-gda-row.html
+share/doc/libgda/libgda-gda-util.html
+share/doc/libgda/libgda-gda-value.html
+share/doc/libgda/libgda-gda-xql-utils.html
+share/doc/libgda/libgda-gdabatch.html
+share/doc/libgda/libgda-gdaclient.html
+share/doc/libgda/libgda-gdaconnection.html
+share/doc/libgda/libgda-gdadatamodel.html
+share/doc/libgda/libgda-gdadatamodelarray.html
+share/doc/libgda/libgda-gdadatamodelhash.html
+share/doc/libgda/libgda-gdadatamodellist.html
+share/doc/libgda/libgda-gdaerror.html
+share/doc/libgda/libgda-gdaexport.html
+share/doc/libgda/libgda-gdareportdocument.html
+share/doc/libgda/libgda-gdaselect.html
+share/doc/libgda/libgda-gdaserverprovider.html
+share/doc/libgda/libgda-gdatable.html
+share/doc/libgda/libgda-gdaxmlconnection.html
+share/doc/libgda/libgda-gdaxmldatabase.html
+share/doc/libgda/libgda-gdaxmldocument.html
+share/doc/libgda/libgda-gdaxqlatom.html
+share/doc/libgda/libgda-gdaxqlbin.html
+share/doc/libgda/libgda-gdaxqlcolumn.html
+share/doc/libgda/libgda-gdaxqlconst.html
+share/doc/libgda/libgda-gdaxqldelete.html
+share/doc/libgda/libgda-gdaxqldml.html
+share/doc/libgda/libgda-gdaxqldual.html
+share/doc/libgda/libgda-gdaxqlfield.html
+share/doc/libgda/libgda-gdaxqlfunc.html
+share/doc/libgda/libgda-gdaxqlinsert.html
+share/doc/libgda/libgda-gdaxqlitem.html
+share/doc/libgda/libgda-gdaxqljoin.html
+share/doc/libgda/libgda-gdaxqllist.html
+share/doc/libgda/libgda-gdaxqlquery.html
+share/doc/libgda/libgda-gdaxqlselect.html
+share/doc/libgda/libgda-gdaxqlstack.html
+share/doc/libgda/libgda-gdaxqltarget.html
+share/doc/libgda/libgda-gdaxqlupdate.html
+share/doc/libgda/libgda-gdaxqlvalue.html
+share/doc/libgda/libgda-gdaxqlvalueref.html
+share/doc/libgda/libgda-libgda.html
+share/doc/libgda/libgda-providers.html
+share/doc/libgda/libgda-reports.html
+share/doc/libgda/libgda-xql.html
+share/gnome/idl/libgda/GNOME_Database.idl
+share/gnome/libgda/dtd/gda-report.dtd
+share/locale/az/LC_MESSAGES/libgda-2.mo
+share/locale/ca/LC_MESSAGES/libgda-2.mo
+share/locale/da/LC_MESSAGES/libgda-2.mo
+share/locale/de/LC_MESSAGES/libgda-2.mo
+share/locale/el/LC_MESSAGES/libgda-2.mo
+share/locale/es/LC_MESSAGES/libgda-2.mo
+share/locale/fi/LC_MESSAGES/libgda-2.mo
+share/locale/fr/LC_MESSAGES/libgda-2.mo
+share/locale/ga/LC_MESSAGES/libgda-2.mo
+share/locale/gl/LC_MESSAGES/libgda-2.mo
+share/locale/hu/LC_MESSAGES/libgda-2.mo
+share/locale/it/LC_MESSAGES/libgda-2.mo
+share/locale/ja/LC_MESSAGES/libgda-2.mo
+share/locale/ms/LC_MESSAGES/libgda-2.mo
+share/locale/nl/LC_MESSAGES/libgda-2.mo
+share/locale/no/LC_MESSAGES/libgda-2.mo
+share/locale/pl/LC_MESSAGES/libgda-2.mo
+share/locale/pt/LC_MESSAGES/libgda-2.mo
+share/locale/pt_BR/LC_MESSAGES/libgda-2.mo
+share/locale/ru/LC_MESSAGES/libgda-2.mo
+share/locale/sk/LC_MESSAGES/libgda-2.mo
+share/locale/sl/LC_MESSAGES/libgda-2.mo
+share/locale/sv/LC_MESSAGES/libgda-2.mo
+share/locale/tr/LC_MESSAGES/libgda-2.mo
+share/locale/uk/LC_MESSAGES/libgda-2.mo
+share/locale/vi/LC_MESSAGES/libgda-2.mo
+share/locale/zh_CN/LC_MESSAGES/libgda-2.mo
+@dirrm share/gnome/libgda/dtd
+@dirrm share/gnome/libgda
@dirrm share/doc/libgda
-@dirrm include/libgda-%%VERSION%%/gda++
-@dirrm include/libgda-%%VERSION%%/gda
-@dirrm include/libgda-%%VERSION%%
+@dirrm lib/libgda/providers
+@dirrm lib/libgda
+@dirrm include/libgda
+@dirrm include/libgda-report
+@dirrm etc/libgda
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 0fb8c43..31cd76e 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -1,41 +1,65 @@
-# New ports collection makefile for: libgda
-# Date created: 8th March 2001
-# Whom: Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for: libgda2
+# Date created: 02 June 2002
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
#
-PORTNAME= libgda
-PORTVERSION= 0.2.96
-PORTREVISION= 1
+PORTNAME= libgda2
+PORTVERSION= 0.8.191
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
-DIST_SUBDIR= gnome
+MASTER_SITE_SUBDIR= pre-gnome2/sources/libgda
+DISTNAME= libgda-${PORTVERSION}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
- bonobo.2:${PORTSDIR}/devel/bonobo
+LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \
+ xslt.1:${PORTSDIR}/textproc/libxslt
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOMECTRL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --disable-gtk-doc
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
+ --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB= VERSION=${PORTVERSION}
+
+.if defined(WITH_MYSQL)
+LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
+PLIST_SUB= MYSQL=""
+.else
+PLIST_SUB= MYSQL="@comment "
+.endif
+
+.if defined(WITH_POSTGRES)
+LIB_DEPENDS+= pq.2:${PORTSDIR}/databases/postgres7
+CONFIGURE_ARGS+= --with-postgres=${LOCALBASE}
+PLIST_SUB+= POSTGRES=""
+.else
+PLIST_SUB+= POSTGRES="@comment "
+.endif
+
+pre-extract:
+.if !defined(WITH_MYSQL)
+ @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
+.endif
+.if !defined(WITH_POSTGRES)
+ @${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES."
+.endif
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
- s|share/idl|share/gnome/idl|g ; \
+ s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo
index 6859d9c..bddbb8f 100644
--- a/databases/libgda3/distinfo
+++ b/databases/libgda3/distinfo
@@ -1 +1 @@
-MD5 (gnome/libgda-0.2.96.tar.bz2) = f9975f05dfb2144e5470b792f2319987
+MD5 (gnome2/libgda-0.8.191.tar.bz2) = fc8d35ef19fe7c8b7a4261d5a20800b8
diff --git a/databases/libgda3/files/patch-aa b/databases/libgda3/files/patch-aa
index 8f9cc8f..6892fe3 100644
--- a/databases/libgda3/files/patch-aa
+++ b/databases/libgda3/files/patch-aa
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig Wed Nov 21 10:29:52 2001
-+++ Makefile.in Wed Nov 21 10:30:19 2001
-@@ -158,7 +158,7 @@
- YACC = @YACC@
- l = @l@
+--- Makefile.in.orig Sun Jun 2 22:13:42 2002
++++ Makefile.in Sun Jun 2 22:13:50 2002
+@@ -149,7 +149,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ cxxflags_set = @cxxflags_set@
--SUBDIRS = po intl macros idl lib bindings providers tools testing doc
-+SUBDIRS = po intl macros idl lib bindings providers tools doc
+-SUBDIRS = po idl libgda providers report tools testing data doc
++SUBDIRS = po idl libgda providers report tools data doc
- EXTRA_DIST = COPYING libgda.spec.in xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in
+ EXTRA_DIST = COPYING libgda.spec.in libgda.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/databases/libgda3/files/patch-configure b/databases/libgda3/files/patch-configure
index 948849e..d744b24 100644
--- a/databases/libgda3/files/patch-configure
+++ b/databases/libgda3/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure 2002/05/01 08:18:05 1.1
-+++ configure 2002/05/01 08:19:03
-@@ -5785,6 +5785,7 @@
+--- configure.orig Sun Jun 2 22:12:29 2002
++++ configure Sun Jun 2 22:13:06 2002
+@@ -8429,6 +8429,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
deleted file mode 100644
index 463f043..0000000
--- a/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1
-+++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40
-@@ -171,7 +171,7 @@
- LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.so $(top_builddir)/lib/gda-client/.libs/libgda-client.a "
-
-
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
-
- DOC_DIR_INSTALL_FILES = libgda-client.args libgda-client.hierarchy libgda-client.signals libgda-client.types libgda-client-decl.txt libgda-client-sections.txt
-
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
deleted file mode 100644
index 25b6b1d..0000000
--- a/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1
-+++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35
-@@ -171,7 +171,7 @@
- LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.a "
-
-
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
-
- DOC_DIR_INSTALL_FILES = libgda-common.args libgda-common.hierarchy libgda-common.signals libgda-common.types libgda-common-decl.txt libgda-common-sections.txt
-
diff --git a/databases/libgda3/files/patch-doc_C_Makefile.in b/databases/libgda3/files/patch-doc_C_Makefile.in
new file mode 100644
index 0000000..718a4a1
--- /dev/null
+++ b/databases/libgda3/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002
++++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002
+@@ -152,7 +152,7 @@
+ cxxflags_set = @cxxflags_set@
+
+ DOC_MODULE = libgda
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+
+ # The top-level SGML file. Change it if you want.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/libgda3/files/patch-po::Makefile.in.in b/databases/libgda3/files/patch-po::Makefile.in.in
deleted file mode 100644
index 3f425ff..0000000
--- a/databases/libgda3/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- po/Makefile.in.in.orig Wed Jun 13 15:55:50 2001
-+++ po/Makefile.in.in Tue Jun 19 01:14:13 2001
-@@ -25,3 +25,3 @@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
diff --git a/databases/libgda3/files/patch-tools::gda-buildserver.in b/databases/libgda3/files/patch-tools::gda-buildserver.in
deleted file mode 100644
index fa75e2d..0000000
--- a/databases/libgda3/files/patch-tools::gda-buildserver.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/gda-buildserver.in 2001/08/06 08:16:41 1.1
-+++ tools/gda-buildserver.in 2001/08/06 08:16:54
-@@ -7,7 +7,7 @@
- CC=@CC@
- shell=@shell@
-
--TEMPLATES_DIR="${prefix}/share/gda/templates"
-+TEMPLATES_DIR="${prefix}/share/gnome/gda/templates"
- TMPL_C_FILES="gda-srv-command.c gda-srv-connection.c gda-srv-recordset.c main-srv.c"
- TMPL_H_FILES="gda-srv.h"
-
diff --git a/databases/libgda3/files/patch-tools::templates::Makefile.in b/databases/libgda3/files/patch-tools::templates::Makefile.in
deleted file mode 100644
index 2ca62bf..0000000
--- a/databases/libgda3/files/patch-tools::templates::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/templates/Makefile.in 2001/08/06 08:15:18 1.1
-+++ tools/templates/Makefile.in 2001/08/06 08:15:53
-@@ -148,7 +148,7 @@
-
- EXTRA_DIST = $(TEMPLATE_FILES)
-
--gdatemplatesdir = $(prefix)/share/gda/templates
-+gdatemplatesdir = $(prefix)/share/gnome/gda/templates
- gdatemplates_DATA = $(TEMPLATE_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 60028e4..6d25a2f 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -1,212 +1,167 @@
-bin/gda-buildclient
-bin/gda-buildserver
-bin/gda-config
-bin/gda-default-srv
bin/gda-run
-include/libgda-%%VERSION%%/gda++/gdaBatch.h
-include/libgda-%%VERSION%%/gda++/gdaCommand.h
-include/libgda-%%VERSION%%/gda++/gdaConnection.h
-include/libgda-%%VERSION%%/gda++/gdaError.h
-include/libgda-%%VERSION%%/gda++/gdaErrorList.h
-include/libgda-%%VERSION%%/gda++/gdaField.h
-include/libgda-%%VERSION%%/gda++/gdaHelpers.h
-include/libgda-%%VERSION%%/gda++/gdaIncludes.h
-include/libgda-%%VERSION%%/gda++/gdaRecordset.h
-include/libgda-%%VERSION%%/gda++/gdaValue.h
-include/libgda-%%VERSION%%/gda/GDA.h
-include/libgda-%%VERSION%%/gda/gda-batch.h
-include/libgda-%%VERSION%%/gda/gda-client.h
-include/libgda-%%VERSION%%/gda/gda-command.h
-include/libgda-%%VERSION%%/gda/gda-common-defs.h
-include/libgda-%%VERSION%%/gda/gda-common.h
-include/libgda-%%VERSION%%/gda/gda-config.h
-include/libgda-%%VERSION%%/gda/gda-connection-pool.h
-include/libgda-%%VERSION%%/gda/gda-connection.h
-include/libgda-%%VERSION%%/gda/gda-corba.h
-include/libgda-%%VERSION%%/gda/gda-error.h
-include/libgda-%%VERSION%%/gda/gda-export.h
-include/libgda-%%VERSION%%/gda/gda-field.h
-include/libgda-%%VERSION%%/gda/gda-listener.h
-include/libgda-%%VERSION%%/gda/gda-log.h
-include/libgda-%%VERSION%%/gda/gda-quark-list.h
-include/libgda-%%VERSION%%/gda/gda-recordset.h
-include/libgda-%%VERSION%%/gda/gda-server-command.h
-include/libgda-%%VERSION%%/gda/gda-server-connection.h
-include/libgda-%%VERSION%%/gda/gda-server-error.h
-include/libgda-%%VERSION%%/gda/gda-server-field.h
-include/libgda-%%VERSION%%/gda/gda-server-recordset.h
-include/libgda-%%VERSION%%/gda/gda-server.h
-include/libgda-%%VERSION%%/gda/gda-thread.h
-include/libgda-%%VERSION%%/gda/gda-util.h
-include/libgda-%%VERSION%%/gda/gda-value.h
-include/libgda-%%VERSION%%/gda/gda-xml-atom-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-bin-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-database.h
-include/libgda-%%VERSION%%/gda/gda-xml-document.h
-include/libgda-%%VERSION%%/gda/gda-xml-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-list-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-util.h
-lib/libgda-client.a
-lib/libgda-client.so
-lib/libgda-client.so.0
-lib/libgda-clientcpp.a
-lib/libgda-clientcpp.so
-lib/libgda-clientcpp.so.0
-lib/libgda-common.a
-lib/libgda-common.so
-lib/libgda-common.so.0
-lib/libgda-server.a
-lib/libgda-server.so
-lib/libgda-server.so.0
-share/doc/libgda/libgda-client-decl.txt
-share/doc/libgda/libgda-client-sections.txt
-share/doc/libgda/libgda-client.args
-share/doc/libgda/libgda-client.hierarchy
-share/doc/libgda/libgda-client.signals
-share/doc/libgda/libgda-client.types
-share/doc/libgda/libgda-common-decl.txt
-share/doc/libgda/libgda-common-sections.txt
-share/doc/libgda/libgda-common.args
-share/doc/libgda/libgda-common.hierarchy
-share/doc/libgda/libgda-common.signals
-share/doc/libgda/libgda-common.types
-share/gnome/gda/templates/gda-srv-command.c.tmpl
-share/gnome/gda/templates/gda-srv-connection.c.tmpl
-share/gnome/gda/templates/gda-srv-recordset.c.tmpl
-share/gnome/gda/templates/gda-srv.h.tmpl
-share/gnome/gda/templates/main-srv.c.tmpl
-share/gnome/help/libgda/C/architecture.html
-share/gnome/help/libgda/C/clients-building-corba.html
-share/gnome/help/libgda/C/clients-building.html
-share/gnome/help/libgda/C/clients.html
-share/gnome/help/libgda/C/fdl-section1.html
-share/gnome/help/libgda/C/fdl-section10.html
-share/gnome/help/libgda/C/fdl-section2.html
-share/gnome/help/libgda/C/fdl-section3.html
-share/gnome/help/libgda/C/fdl-section4.html
-share/gnome/help/libgda/C/fdl-section5.html
-share/gnome/help/libgda/C/fdl-section6.html
-share/gnome/help/libgda/C/fdl-section7.html
-share/gnome/help/libgda/C/fdl-section8.html
-share/gnome/help/libgda/C/fdl-section9.html
-share/gnome/help/libgda/C/fdl-using.html
-share/gnome/help/libgda/C/fdl.html
-share/gnome/help/libgda/C/gda-client-batch.html
-share/gnome/help/libgda/C/gda-client-meta.html
-share/gnome/help/libgda/C/gda-client-objects.html
-share/gnome/help/libgda/C/gda-client-types.html
-share/gnome/help/libgda/C/gda-client.html
-share/gnome/help/libgda/C/gda-common-logs.html
-share/gnome/help/libgda/C/gda-common-xml-databases.html
-share/gnome/help/libgda/C/gda-common-xml-queries.html
-share/gnome/help/libgda/C/gda-common.html
-share/gnome/help/libgda/C/index.html
-share/gnome/help/libgda/C/installation-configuring.html
-share/gnome/help/libgda/C/installation-installing.html
-share/gnome/help/libgda/C/installation.html
-share/gnome/help/libgda/C/introduction.html
-share/gnome/help/libgda/C/libgda.html
-share/gnome/help/libgda/C/providers-actual-implementation.html
-share/gnome/help/libgda/C/providers-examples.html
-share/gnome/help/libgda/C/providers-implementation.html
-share/gnome/help/libgda/C/providers.html
-share/gnome/help/libgda/C/reports.html
-share/gnome/help/libgda/C/topic.dat
-share/gnome/help/libgda/es/architecture.html
-share/gnome/help/libgda/es/clients-building-corba.html
-share/gnome/help/libgda/es/clients-building.html
-share/gnome/help/libgda/es/clients.html
-share/gnome/help/libgda/es/gda-client-batch.html
-share/gnome/help/libgda/es/gda-client-meta.html
-share/gnome/help/libgda/es/gda-client-objects.html
-share/gnome/help/libgda/es/gda-client-types.html
-share/gnome/help/libgda/es/gda-client.html
-share/gnome/help/libgda/es/gda-common-logs.html
-share/gnome/help/libgda/es/gda-common-xml-databases.html
-share/gnome/help/libgda/es/gda-common-xml-queries.html
-share/gnome/help/libgda/es/gda-common.html
-share/gnome/help/libgda/es/index.html
-share/gnome/help/libgda/es/installation-configuring.html
-share/gnome/help/libgda/es/installation-installing.html
-share/gnome/help/libgda/es/installation.html
-share/gnome/help/libgda/es/introduction.html
-share/gnome/help/libgda/es/libgda.html
-share/gnome/help/libgda/es/providers-actual-implementation.html
-share/gnome/help/libgda/es/providers-examples.html
-share/gnome/help/libgda/es/providers-implementation.html
-share/gnome/help/libgda/es/providers.html
-share/gnome/help/libgda/es/reports.html
-share/gnome/help/libgda/es/topic.dat
-share/gnome/help/libgda/pt_BR/architecture.html
-share/gnome/help/libgda/pt_BR/c162.html
-share/gnome/help/libgda/pt_BR/c182.html
-share/gnome/help/libgda/pt_BR/c323.html
-share/gnome/help/libgda/pt_BR/c350.html
-share/gnome/help/libgda/pt_BR/clients-building-corba.html
-share/gnome/help/libgda/pt_BR/clients-building.html
-share/gnome/help/libgda/pt_BR/gda-client-batch.html
-share/gnome/help/libgda/pt_BR/gda-client-meta.html
-share/gnome/help/libgda/pt_BR/gda-client-objects.html
-share/gnome/help/libgda/pt_BR/gda-client-types.html
-share/gnome/help/libgda/pt_BR/gda-common-logs.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html
-share/gnome/help/libgda/pt_BR/index.html
-share/gnome/help/libgda/pt_BR/installation-configuring.html
-share/gnome/help/libgda/pt_BR/installation-installing.html
-share/gnome/help/libgda/pt_BR/installation.html
-share/gnome/help/libgda/pt_BR/introduction.html
-share/gnome/help/libgda/pt_BR/libgda.html
-share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
-share/gnome/help/libgda/pt_BR/providers-examples.html
-share/gnome/help/libgda/pt_BR/providers-implementation.html
-share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/idl/GDA.idl
-share/gnome/idl/GDA_Command.idl
-share/gnome/idl/GDA_Connection.idl
-share/gnome/idl/GDA_Error.idl
-share/gnome/idl/GDA_Field.idl
-share/gnome/idl/GDA_Listener.idl
-share/gnome/idl/GDA_Parameter.idl
-share/gnome/idl/GDA_Recordset.idl
-share/gnome/oaf/GNOME_GDA_Provider_Default.oaf
-share/gnome/omf/libgda/libgda-C.omf
-share/gnome/omf/libgda/libgda-es.omf
-share/gnome/omf/libgda/libgda-pt_BR.omf
-share/locale/ca/LC_MESSAGES/libgda.mo
-share/locale/da/LC_MESSAGES/libgda.mo
-share/locale/de/LC_MESSAGES/libgda.mo
-share/locale/el/LC_MESSAGES/libgda.mo
-share/locale/es/LC_MESSAGES/libgda.mo
-share/locale/fi/LC_MESSAGES/libgda.mo
-share/locale/fr/LC_MESSAGES/libgda.mo
-share/locale/ga/LC_MESSAGES/libgda.mo
-share/locale/gl/LC_MESSAGES/libgda.mo
-share/locale/hu/LC_MESSAGES/libgda.mo
-share/locale/it/LC_MESSAGES/libgda.mo
-share/locale/ja/LC_MESSAGES/libgda.mo
-share/locale/nl/LC_MESSAGES/libgda.mo
-share/locale/nn/LC_MESSAGES/libgda.mo
-share/locale/no/LC_MESSAGES/libgda.mo
-share/locale/pl/LC_MESSAGES/libgda.mo
-share/locale/pt/LC_MESSAGES/libgda.mo
-share/locale/pt_BR/LC_MESSAGES/libgda.mo
-share/locale/ru/LC_MESSAGES/libgda.mo
-share/locale/sk/LC_MESSAGES/libgda.mo
-share/locale/sl/LC_MESSAGES/libgda.mo
-share/locale/sv/LC_MESSAGES/libgda.mo
-share/locale/uk/LC_MESSAGES/libgda.mo
-@dirrm share/gnome/omf/libgda
-@dirrm share/gnome/help/libgda/pt_BR/images
-@dirrm share/gnome/help/libgda/pt_BR
-@dirrm share/gnome/help/libgda/es/images
-@dirrm share/gnome/help/libgda/es
-@dirrm share/gnome/help/libgda/C/images
-@dirrm share/gnome/help/libgda/C
-@dirrm share/gnome/help/libgda
-@dirrm share/gnome/gda/templates
-@dirrm share/gnome/gda
+etc/libgda/config
+include/libgda-report/gda-report-document.h
+include/libgda-report/gda-report.h
+include/libgda/gda-client.h
+include/libgda/gda-command.h
+include/libgda/gda-config.h
+include/libgda/gda-connection.h
+include/libgda/gda-data-model-array.h
+include/libgda/gda-data-model-hash.h
+include/libgda/gda-data-model-list.h
+include/libgda/gda-data-model.h
+include/libgda/gda-error.h
+include/libgda/gda-export.h
+include/libgda/gda-field.h
+include/libgda/gda-log.h
+include/libgda/gda-marshal.h
+include/libgda/gda-parameter.h
+include/libgda/gda-quark-list.h
+include/libgda/gda-row.h
+include/libgda/gda-select.h
+include/libgda/gda-server-provider.h
+include/libgda/gda-table.h
+include/libgda/gda-util.h
+include/libgda/gda-value.h
+include/libgda/gda-xml-connection.h
+include/libgda/gda-xml-database.h
+include/libgda/gda-xml-document.h
+include/libgda/gda-xql-atom.h
+include/libgda/gda-xql-bin.h
+include/libgda/gda-xql-column.h
+include/libgda/gda-xql-const.h
+include/libgda/gda-xql-delete.h
+include/libgda/gda-xql-dml.h
+include/libgda/gda-xql-dual.h
+include/libgda/gda-xql-field.h
+include/libgda/gda-xql-func.h
+include/libgda/gda-xql-insert.h
+include/libgda/gda-xql-item.h
+include/libgda/gda-xql-join.h
+include/libgda/gda-xql-list.h
+include/libgda/gda-xql-query.h
+include/libgda/gda-xql-select.h
+include/libgda/gda-xql-stack.h
+include/libgda/gda-xql-target.h
+include/libgda/gda-xql-update.h
+include/libgda/gda-xql-utils.h
+include/libgda/gda-xql-value.h
+include/libgda/gda-xql-valueref.h
+include/libgda/libgda.h
+lib/libgda-2.a
+lib/libgda-2.so
+lib/libgda-2.so.1
+lib/libgda-report-2.a
+lib/libgda-report-2.so
+lib/libgda-report-2.so.1
+lib/libgda/providers/libgda-default.so
+%%MYSQL%%lib/libgda/providers/libgda-mysql.so
+%%POSTGRES%%lib/libgda/providers/libgda-postgres.so
+libdata/pkgconfig/libgda.pc
+share/doc/libgda/architecture.html
+share/doc/libgda/fdl-section1.html
+share/doc/libgda/fdl-section10.html
+share/doc/libgda/fdl-section2.html
+share/doc/libgda/fdl-section3.html
+share/doc/libgda/fdl-section4.html
+share/doc/libgda/fdl-section5.html
+share/doc/libgda/fdl-section6.html
+share/doc/libgda/fdl-section7.html
+share/doc/libgda/fdl-section8.html
+share/doc/libgda/fdl-section9.html
+share/doc/libgda/fdl-using.html
+share/doc/libgda/fdl.html
+share/doc/libgda/index.html
+share/doc/libgda/index.sgml
+share/doc/libgda/installation-configuring.html
+share/doc/libgda/installation-installing.html
+share/doc/libgda/installation.html
+share/doc/libgda/introduction.html
+share/doc/libgda/libgda-api.html
+share/doc/libgda/libgda-gda-command.html
+share/doc/libgda/libgda-gda-config.html
+share/doc/libgda/libgda-gda-field.html
+share/doc/libgda/libgda-gda-log.html
+share/doc/libgda/libgda-gda-parameter.html
+share/doc/libgda/libgda-gda-quark-list.html
+share/doc/libgda/libgda-gda-row.html
+share/doc/libgda/libgda-gda-util.html
+share/doc/libgda/libgda-gda-value.html
+share/doc/libgda/libgda-gda-xql-utils.html
+share/doc/libgda/libgda-gdabatch.html
+share/doc/libgda/libgda-gdaclient.html
+share/doc/libgda/libgda-gdaconnection.html
+share/doc/libgda/libgda-gdadatamodel.html
+share/doc/libgda/libgda-gdadatamodelarray.html
+share/doc/libgda/libgda-gdadatamodelhash.html
+share/doc/libgda/libgda-gdadatamodellist.html
+share/doc/libgda/libgda-gdaerror.html
+share/doc/libgda/libgda-gdaexport.html
+share/doc/libgda/libgda-gdareportdocument.html
+share/doc/libgda/libgda-gdaselect.html
+share/doc/libgda/libgda-gdaserverprovider.html
+share/doc/libgda/libgda-gdatable.html
+share/doc/libgda/libgda-gdaxmlconnection.html
+share/doc/libgda/libgda-gdaxmldatabase.html
+share/doc/libgda/libgda-gdaxmldocument.html
+share/doc/libgda/libgda-gdaxqlatom.html
+share/doc/libgda/libgda-gdaxqlbin.html
+share/doc/libgda/libgda-gdaxqlcolumn.html
+share/doc/libgda/libgda-gdaxqlconst.html
+share/doc/libgda/libgda-gdaxqldelete.html
+share/doc/libgda/libgda-gdaxqldml.html
+share/doc/libgda/libgda-gdaxqldual.html
+share/doc/libgda/libgda-gdaxqlfield.html
+share/doc/libgda/libgda-gdaxqlfunc.html
+share/doc/libgda/libgda-gdaxqlinsert.html
+share/doc/libgda/libgda-gdaxqlitem.html
+share/doc/libgda/libgda-gdaxqljoin.html
+share/doc/libgda/libgda-gdaxqllist.html
+share/doc/libgda/libgda-gdaxqlquery.html
+share/doc/libgda/libgda-gdaxqlselect.html
+share/doc/libgda/libgda-gdaxqlstack.html
+share/doc/libgda/libgda-gdaxqltarget.html
+share/doc/libgda/libgda-gdaxqlupdate.html
+share/doc/libgda/libgda-gdaxqlvalue.html
+share/doc/libgda/libgda-gdaxqlvalueref.html
+share/doc/libgda/libgda-libgda.html
+share/doc/libgda/libgda-providers.html
+share/doc/libgda/libgda-reports.html
+share/doc/libgda/libgda-xql.html
+share/gnome/idl/libgda/GNOME_Database.idl
+share/gnome/libgda/dtd/gda-report.dtd
+share/locale/az/LC_MESSAGES/libgda-2.mo
+share/locale/ca/LC_MESSAGES/libgda-2.mo
+share/locale/da/LC_MESSAGES/libgda-2.mo
+share/locale/de/LC_MESSAGES/libgda-2.mo
+share/locale/el/LC_MESSAGES/libgda-2.mo
+share/locale/es/LC_MESSAGES/libgda-2.mo
+share/locale/fi/LC_MESSAGES/libgda-2.mo
+share/locale/fr/LC_MESSAGES/libgda-2.mo
+share/locale/ga/LC_MESSAGES/libgda-2.mo
+share/locale/gl/LC_MESSAGES/libgda-2.mo
+share/locale/hu/LC_MESSAGES/libgda-2.mo
+share/locale/it/LC_MESSAGES/libgda-2.mo
+share/locale/ja/LC_MESSAGES/libgda-2.mo
+share/locale/ms/LC_MESSAGES/libgda-2.mo
+share/locale/nl/LC_MESSAGES/libgda-2.mo
+share/locale/no/LC_MESSAGES/libgda-2.mo
+share/locale/pl/LC_MESSAGES/libgda-2.mo
+share/locale/pt/LC_MESSAGES/libgda-2.mo
+share/locale/pt_BR/LC_MESSAGES/libgda-2.mo
+share/locale/ru/LC_MESSAGES/libgda-2.mo
+share/locale/sk/LC_MESSAGES/libgda-2.mo
+share/locale/sl/LC_MESSAGES/libgda-2.mo
+share/locale/sv/LC_MESSAGES/libgda-2.mo
+share/locale/tr/LC_MESSAGES/libgda-2.mo
+share/locale/uk/LC_MESSAGES/libgda-2.mo
+share/locale/vi/LC_MESSAGES/libgda-2.mo
+share/locale/zh_CN/LC_MESSAGES/libgda-2.mo
+@dirrm share/gnome/libgda/dtd
+@dirrm share/gnome/libgda
@dirrm share/doc/libgda
-@dirrm include/libgda-%%VERSION%%/gda++
-@dirrm include/libgda-%%VERSION%%/gda
-@dirrm include/libgda-%%VERSION%%
+@dirrm lib/libgda/providers
+@dirrm lib/libgda
+@dirrm include/libgda
+@dirrm include/libgda-report
+@dirrm etc/libgda
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index d8e10f0..e90b5fa 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,31 +1,36 @@
-# New ports collection makefile for: glade
-# Date created: 29 June 1998
-# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
+# New ports collection makefile for: glade2
+# Date created: 02 June 2002
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
#
-PORTNAME= glade
-PORTVERSION= 0.6.4
+PORTNAME= glade2
+PORTVERSION= 1.1.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/glade
+MASTER_SITE_SUBDIR= pre-gnome2/sources/glade
+DISTNAME= glade-${PORTVERSION}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+LIB_DEPENDS= gnomedb-2.1:${PORTSDIR}/databases/libgnomedb \
+ gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+
+USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOME= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-bonobo --enable-gnome-db
+USE_LIBTOOL= yes
+USE_GMAKE= yes
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/libs"
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
- s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
- s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index aab36fd..236b46d 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (glade-0.6.4.tar.gz) = 6bae18e2fd323d64168992e126e27efb
+MD5 (gnome2/glade-1.1.0.tar.bz2) = da40a2c2a55e2e25dcc7f893cc896dd4
diff --git a/devel/glade2/files/patch-configure b/devel/glade2/files/patch-configure
new file mode 100644
index 0000000..886a0a5
--- /dev/null
+++ b/devel/glade2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sun Jun 2 22:01:19 2002
++++ configure Sun Jun 2 22:01:34 2002
+@@ -7089,6 +7089,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c b/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c
deleted file mode 100644
index 11dbae3..0000000
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- glade/gnome-db/gnomedberrordlg.c 2002/01/28 13:15:07 1.1
-+++ glade/gnome-db/gnomedberrordlg.c 2002/01/28 13:14:41
-@@ -155,7 +155,7 @@
- gchar *title;
-
- title = GTK_WINDOW (widget)->title;
-- source_add (data, " %s = gnome_db_error_dialog_new (NULL, %s);\n",
-+ source_add (data, " %s = gnome_db_error_dialog_new (%s);\n",
- data->wname,
- title ? source_make_string (title, data->use_gettext)
- : "NULL");
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c b/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c
deleted file mode 100644
index cc0b6d8..0000000
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- glade/gnome-db/gnomedblogin.c 2002/01/28 13:18:44 1.1
-+++ glade/gnome-db/gnomedblogin.c 2002/01/28 13:19:07
-@@ -117,7 +117,7 @@
- {
- if (data->create_widget)
- {
-- source_add (data, " %s = gnome_db_login_new (NULL, NULL, NULL);\n",
-+ source_add (data, " %s = gnome_db_login_new (NULL);\n",
- data->wname);
- }
- gb_widget_write_standard_source (widget, data);
diff --git a/devel/glade2/files/patch-ltmain.sh b/devel/glade2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2..0000000
--- a/devel/glade2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- 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.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index ea2c051..a96a950 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -1,176 +1,72 @@
-bin/glade
-share/gnome/apps/Development/glade.desktop
-share/gnome/glade/gnome/Makefile.am
-share/gnome/glade/gnome/aclocal-include.m4
-share/gnome/glade/gnome/autogen.sh
-share/gnome/glade/gnome/compiler-flags.m4
-share/gnome/glade/gnome/curses.m4
-share/gnome/glade/gnome/gnome-bonobo-check.m4
-share/gnome/glade/gnome/gnome-common.m4
-share/gnome/glade/gnome/gnome-fileutils.m4
-share/gnome/glade/gnome/gnome-gettext.m4
-share/gnome/glade/gnome/gnome-ghttp-check.m4
-share/gnome/glade/gnome/gnome-gnorba-check.m4
-share/gnome/glade/gnome/gnome-guile-checks.m4
-share/gnome/glade/gnome/gnome-libgtop-check.m4
-share/gnome/glade/gnome/gnome-objc-checks.m4
-share/gnome/glade/gnome/gnome-orbit-check.m4
-share/gnome/glade/gnome/gnome-print-check.m4
-share/gnome/glade/gnome/gnome-pthread-check.m4
-share/gnome/glade/gnome/gnome-support.m4
-share/gnome/glade/gnome/gnome-undelfs.m4
-share/gnome/glade/gnome/gnome-vfs.m4
-share/gnome/glade/gnome/gnome-x-checks.m4
-share/gnome/glade/gnome/gnome-xml-check.m4
-share/gnome/glade/gnome/gnome.m4
-share/gnome/glade/gnome/gperf-check.m4
-share/gnome/glade/gnome/linger.m4
-share/gnome/glade/gnome/need-declaration.m4
-share/gnome/glade/gtk/autogen.sh
-share/gnome/help/glade/C/faq/faq.sgml
-share/gnome/help/glade/C/faq/index.html
-share/gnome/help/glade/C/faq/ln7.html
-share/gnome/help/glade/C/topic.dat
-share/gnome/help/glade/C/turbo-start/index.html
-share/gnome/help/glade/C/turbo-start/ln7.html
-share/gnome/help/glade/C/turbo-start/turbo-start.sgml
-share/gnome/help/glade/C/user-guide/authors.html
-share/gnome/help/glade/C/user-guide/edit-menu.html
-share/gnome/help/glade/C/user-guide/helloworld.html
-share/gnome/help/glade/C/user-guide/help-menu.html
-share/gnome/help/glade/C/user-guide/index.html
-share/gnome/help/glade/C/user-guide/introduction.html
-share/gnome/help/glade/C/user-guide/libglade.html
-share/gnome/help/glade/C/user-guide/ln7.html
-share/gnome/help/glade/C/user-guide/menus.html
-share/gnome/help/glade/C/user-guide/output.html
-share/gnome/help/glade/C/user-guide/project-options.html
-share/gnome/help/glade/C/user-guide/quickstart.html
-share/gnome/help/glade/C/user-guide/settings-menu.html
-share/gnome/help/glade/C/user-guide/toolbar.html
-share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/file-menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/grid-options.png
-share/gnome/help/glade/C/user-guide/user-guide-images/help-menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/options-c.png
-share/gnome/help/glade/C/user-guide/user-guide-images/options-general.png
-share/gnome/help/glade/C/user-guide/user-guide-images/options-libglade.png
-share/gnome/help/glade/C/user-guide/user-guide-images/settings-menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/snap-options.png
-share/gnome/help/glade/C/user-guide/user-guide-images/toolbar.png
-share/gnome/help/glade/C/user-guide/user-guide-images/view-menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/window-main.png
-share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-add.png
-share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-basic.png
-share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-gnome.png
-share/gnome/help/glade/C/user-guide/user-guide.sgml
-share/gnome/help/glade/C/user-guide/using.html
-share/gnome/help/glade/C/user-guide/view-menu.html
-share/gnome/help/glade/C/user-guide/windows-clipboard.html
-share/gnome/help/glade/C/user-guide/windows-editor.html
-share/gnome/help/glade/C/user-guide/windows-palette.html
-share/gnome/help/glade/C/user-guide/windows-tree.html
-share/gnome/help/glade/C/user-guide/windows.html
-share/gnome/help/glade/C/user-guide/x225.html
-share/gnome/help/glade/C/user-guide/x324.html
-share/gnome/help/glade/it/faq/faq.sgml
-share/gnome/help/glade/it/faq/index.html
-share/gnome/help/glade/it/faq/ln10.html
-share/gnome/help/glade/it/topic.dat
-share/gnome/help/glade/it/turbo-start/index.html
-share/gnome/help/glade/it/turbo-start/ln10.html
-share/gnome/help/glade/it/turbo-start/turbo-start.sgml
-share/gnome/help/glade/it/user-guide/authors.html
-share/gnome/help/glade/it/user-guide/edit-menu.html
-share/gnome/help/glade/it/user-guide/helloworld.html
-share/gnome/help/glade/it/user-guide/help-menu.html
-share/gnome/help/glade/it/user-guide/index.html
-share/gnome/help/glade/it/user-guide/introduction.html
-share/gnome/help/glade/it/user-guide/libglade.html
-share/gnome/help/glade/it/user-guide/ln7.html
-share/gnome/help/glade/it/user-guide/menus.html
-share/gnome/help/glade/it/user-guide/output.html
-share/gnome/help/glade/it/user-guide/project-options.html
-share/gnome/help/glade/it/user-guide/quickstart.html
-share/gnome/help/glade/it/user-guide/settings-menu.html
-share/gnome/help/glade/it/user-guide/toolbar.html
-share/gnome/help/glade/it/user-guide/user-guide-images/edit-menu.png
-share/gnome/help/glade/it/user-guide/user-guide-images/file-menu.png
-share/gnome/help/glade/it/user-guide/user-guide-images/grid-options.png
-share/gnome/help/glade/it/user-guide/user-guide-images/help-menu.png
-share/gnome/help/glade/it/user-guide/user-guide-images/menu.png
-share/gnome/help/glade/it/user-guide/user-guide-images/options-c.png
-share/gnome/help/glade/it/user-guide/user-guide-images/options-general.png
-share/gnome/help/glade/it/user-guide/user-guide-images/options-libglade.png
-share/gnome/help/glade/it/user-guide/user-guide-images/settings-menu.png
-share/gnome/help/glade/it/user-guide/user-guide-images/snap-options.png
-share/gnome/help/glade/it/user-guide/user-guide-images/toolbar.png
-share/gnome/help/glade/it/user-guide/user-guide-images/view-menu.png
-share/gnome/help/glade/it/user-guide/user-guide-images/window-main.png
-share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-add.png
-share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-basic.png
-share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-gnome.png
-share/gnome/help/glade/it/user-guide/user-guide.sgml
-share/gnome/help/glade/it/user-guide/using.html
-share/gnome/help/glade/it/user-guide/view-menu.html
-share/gnome/help/glade/it/user-guide/windows-clipboard.html
-share/gnome/help/glade/it/user-guide/windows-editor.html
-share/gnome/help/glade/it/user-guide/windows-palette.html
-share/gnome/help/glade/it/user-guide/windows-tree.html
-share/gnome/help/glade/it/user-guide/windows.html
-share/gnome/help/glade/it/user-guide/x225.html
-share/gnome/help/glade/it/user-guide/x324.html
-share/gnome/omf/glade/faq-C.omf
-share/gnome/omf/glade/faq-it.omf
-share/gnome/omf/glade/turbo-start-C.omf
-share/gnome/omf/glade/turbo-start-it.omf
-share/gnome/omf/glade/user-guide-C.omf
-share/gnome/omf/glade/user-guide-it.omf
-share/gnome/pixmaps/glade.png
-share/gnome/pixmaps/glade/glade_logo.png
-share/locale/az/LC_MESSAGES/glade.mo
-share/locale/ca/LC_MESSAGES/glade.mo
-share/locale/cs/LC_MESSAGES/glade.mo
-share/locale/da/LC_MESSAGES/glade.mo
-share/locale/de/LC_MESSAGES/glade.mo
-share/locale/el/LC_MESSAGES/glade.mo
-share/locale/en_GB/LC_MESSAGES/glade.mo
-share/locale/es/LC_MESSAGES/glade.mo
-share/locale/fr/LC_MESSAGES/glade.mo
-share/locale/ga/LC_MESSAGES/glade.mo
-share/locale/gl/LC_MESSAGES/glade.mo
-share/locale/hu/LC_MESSAGES/glade.mo
-share/locale/it/LC_MESSAGES/glade.mo
-share/locale/ja/LC_MESSAGES/glade.mo
-share/locale/ko/LC_MESSAGES/glade.mo
-share/locale/lv/LC_MESSAGES/glade.mo
-share/locale/nl/LC_MESSAGES/glade.mo
-share/locale/nn/LC_MESSAGES/glade.mo
-share/locale/no/LC_MESSAGES/glade.mo
-share/locale/pl/LC_MESSAGES/glade.mo
-share/locale/pt/LC_MESSAGES/glade.mo
-share/locale/pt_BR/LC_MESSAGES/glade.mo
-share/locale/ro/LC_MESSAGES/glade.mo
-share/locale/ru/LC_MESSAGES/glade.mo
-share/locale/sk/LC_MESSAGES/glade.mo
-share/locale/sv/LC_MESSAGES/glade.mo
-share/locale/tr/LC_MESSAGES/glade.mo
-share/locale/uk/LC_MESSAGES/glade.mo
-share/locale/zh_CN/LC_MESSAGES/glade.mo
-@dirrm share/gnome/pixmaps/glade
-@dirrm share/gnome/omf/glade
-@dirrm share/gnome/help/glade/it/user-guide/user-guide-images
-@dirrm share/gnome/help/glade/it/user-guide
-@dirrm share/gnome/help/glade/it/turbo-start
-@dirrm share/gnome/help/glade/it/faq
-@dirrm share/gnome/help/glade/it
-@dirrm share/gnome/help/glade/C/user-guide/user-guide-images
-@dirrm share/gnome/help/glade/C/user-guide
-@dirrm share/gnome/help/glade/C/turbo-start
-@dirrm share/gnome/help/glade/C/faq
-@dirrm share/gnome/help/glade/C
-@dirrm share/gnome/help/glade
-@dirrm share/gnome/glade/gtk
-@dirrm share/gnome/glade/gnome
-@dirrm share/gnome/glade
+bin/glade-2
+share/gnome/applications/glade-2.desktop
+share/gnome/glade-2/gtk/autogen.sh
+share/gnome/help/glade-faq/C/glade-faq.xml
+share/gnome/help/glade-faq/C/legal.xml
+share/gnome/help/glade-turbo-start/C/glade-turbo-start.xml
+share/gnome/help/glade-turbo-start/C/legal.xml
+share/gnome/help/glade-user-guide/C/figures/edit-menu.png
+share/gnome/help/glade-user-guide/C/figures/file-menu.png
+share/gnome/help/glade-user-guide/C/figures/grid-options.png
+share/gnome/help/glade-user-guide/C/figures/help-menu.png
+share/gnome/help/glade-user-guide/C/figures/menu.png
+share/gnome/help/glade-user-guide/C/figures/options-c.png
+share/gnome/help/glade-user-guide/C/figures/options-general.png
+share/gnome/help/glade-user-guide/C/figures/options-libglade.png
+share/gnome/help/glade-user-guide/C/figures/settings-menu.png
+share/gnome/help/glade-user-guide/C/figures/snap-options.png
+share/gnome/help/glade-user-guide/C/figures/toolbar.png
+share/gnome/help/glade-user-guide/C/figures/view-menu.png
+share/gnome/help/glade-user-guide/C/figures/window-main.png
+share/gnome/help/glade-user-guide/C/figures/window-palette-add.png
+share/gnome/help/glade-user-guide/C/figures/window-palette-basic.png
+share/gnome/help/glade-user-guide/C/figures/window-palette-gnome.png
+share/gnome/help/glade-user-guide/C/glade-user-guide.xml
+share/gnome/help/glade-user-guide/C/legal.xml
+share/gnome/omf/glade-2/glade-faq-C.omf
+share/gnome/omf/glade-2/glade-turbo-start-C.omf
+share/gnome/omf/glade-2/glade-user-guide-C.omf
+share/gnome/pixmaps/glade-2.png
+share/gnome/pixmaps/glade-2/glade_logo.png
+share/locale/az/LC_MESSAGES/glade-2.0.mo
+share/locale/ca/LC_MESSAGES/glade-2.0.mo
+share/locale/cs/LC_MESSAGES/glade-2.0.mo
+share/locale/da/LC_MESSAGES/glade-2.0.mo
+share/locale/de/LC_MESSAGES/glade-2.0.mo
+share/locale/el/LC_MESSAGES/glade-2.0.mo
+share/locale/en_GB/LC_MESSAGES/glade-2.0.mo
+share/locale/es/LC_MESSAGES/glade-2.0.mo
+share/locale/fr/LC_MESSAGES/glade-2.0.mo
+share/locale/ga/LC_MESSAGES/glade-2.0.mo
+share/locale/gl/LC_MESSAGES/glade-2.0.mo
+share/locale/hu/LC_MESSAGES/glade-2.0.mo
+share/locale/it/LC_MESSAGES/glade-2.0.mo
+share/locale/ja/LC_MESSAGES/glade-2.0.mo
+share/locale/ko/LC_MESSAGES/glade-2.0.mo
+share/locale/lv/LC_MESSAGES/glade-2.0.mo
+share/locale/nn/LC_MESSAGES/glade-2.0.mo
+share/locale/no/LC_MESSAGES/glade-2.0.mo
+share/locale/pl/LC_MESSAGES/glade-2.0.mo
+share/locale/pt/LC_MESSAGES/glade-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/glade-2.0.mo
+share/locale/ro/LC_MESSAGES/glade-2.0.mo
+share/locale/ru/LC_MESSAGES/glade-2.0.mo
+share/locale/sk/LC_MESSAGES/glade-2.0.mo
+share/locale/sv/LC_MESSAGES/glade-2.0.mo
+share/locale/tr/LC_MESSAGES/glade-2.0.mo
+share/locale/uk/LC_MESSAGES/glade-2.0.mo
+share/locale/vi/LC_MESSAGES/glade-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/glade-2.0.mo
+@dirrm share/gnome/pixmaps/glade-2
+@dirrm share/gnome/omf/glade-2
+@dirrm share/gnome/help/glade-user-guide/C/figures
+@dirrm share/gnome/help/glade-user-guide/C
+@dirrm share/gnome/help/glade-user-guide
+@dirrm share/gnome/help/glade-turbo-start/C/figures
+@dirrm share/gnome/help/glade-turbo-start/C
+@dirrm share/gnome/help/glade-turbo-start
+@dirrm share/gnome/help/glade-faq/C/figures
+@dirrm share/gnome/help/glade-faq/C
+@dirrm share/gnome/help/glade-faq
+@dirrm share/gnome/glade-2/gtk
+@dirrm share/gnome/glade-2
OpenPOWER on IntegriCloud