11 files changed, 142 insertions, 0 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 5dc9ba600bdf..69110e4d81a7 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -48,6 +48,7 @@
     SUBDIR += lsdb
     SUBDIR += lsdb-emacs20
     SUBDIR += mdbtools
+    SUBDIR += mergeant
     SUBDIR += metakit
     SUBDIR += mird
     SUBDIR += msql
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
new file mode 100644
index 000000000000..693365125ed5
--- /dev/null
+++ b/databases/mergeant/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	mergeant
+# Date created:				14 September 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mergeant
+PORTVERSION=	0.8.193
+CATEGORIES=	databases gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	2.0.2/sources/mergeant
+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_GMAKE=	yes
+USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
+USE_PERL5=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
new file mode 100644
index 000000000000..989a1964af5f
--- /dev/null
+++ b/databases/mergeant/distinfo
@@ -0,0 +1 @@
+MD5 (gnome2/mergeant-0.8.193.tar.bz2) = 5573b261acbc53b335991c09399db506
diff --git a/databases/mergeant/files/patch-configure b/databases/mergeant/files/patch-configure
new file mode 100644
index 000000000000..3934ab56cd38
--- /dev/null
+++ b/databases/mergeant/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Mon Sep  9 17:46:33 2002
++++ configure	Sat Sep 14 19:12:39 2002
+@@ -7596,6 +7596,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'
+@@ -10071,7 +10072,7 @@
+ 
+ MERGEANT_Plugdir=${datadir}/${PACKAGE}/plugins
+ 
+-MERGEANT_Helpdir=${datadir}/doc/${PACKAGE}
++MERGEANT_Helpdir=${prefix}/share/doc/${PACKAGE}
+ 
+ 
+ 
diff --git a/databases/mergeant/files/patch-lib_Makefile.in b/databases/mergeant/files/patch-lib_Makefile.in
new file mode 100644
index 000000000000..f65cecae49d6
--- /dev/null
+++ b/databases/mergeant/files/patch-lib_Makefile.in
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	Sat Sep 14 18:40:05 2002
++++ lib/Makefile.in	Sat Sep 14 18:40:22 2002
+@@ -120,7 +120,7 @@
+ 
+ noinst_LTLIBRARIES = libgdbshared.la
+ 
+-INCLUDES =  	$(MERGEANT_CFLAGS) 	-DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" 	-DGNOMEDB_DATADIR=\""$(datadir)"\" 	-DGNOMEDB_LOCALEDIR=\""$(prefix)/share/locale"\"
++INCLUDES =  	$(MERGEANT_CFLAGS) 	-DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" 	-DGNOMEDB_DATADIR=\""$(datadir)"\" 	-DGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\"
+ 
+ 
+ libgdbshared_headers =  	gnome-db-shortcut.h
diff --git a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in b/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
new file mode 100644
index 000000000000..65ae9e7248d0
--- /dev/null
+++ b/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
@@ -0,0 +1,11 @@
+--- src/plugins/netaddr/Makefile.in.orig	Sat Sep 14 18:56:12 2002
++++ src/plugins/netaddr/Makefile.in	Sat Sep 14 18:57:13 2002
+@@ -125,7 +125,7 @@
+ lib_LTLIBRARIES_PLUGIN = libPnetaddr.la
+ libPnetaddr_la_SOURCES = netaddr.c baseplugin.h
+ libPnetaddr_la_LIBADD = 
+-libPnetaddr_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
++libPnetaddr_la_LDFLAGS = -module -avoid-version -export-dynamic
+ 
+ # Build a libtool library, for installation in libdir.
+ lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) 
diff --git a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in b/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
new file mode 100644
index 000000000000..3c54fdcd0135
--- /dev/null
+++ b/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
@@ -0,0 +1,11 @@
+--- src/plugins/picts/Makefile.in.orig	Sat Sep 14 18:57:58 2002
++++ src/plugins/picts/Makefile.in	Sat Sep 14 18:58:15 2002
+@@ -127,7 +127,7 @@
+ libPpicts_la_SOURCES = picts_plugin.c baseplugin.h
+ libPpicts_la_LIBADD = 
+ 
+-libPpicts_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
++libPpicts_la_LDFLAGS = -module -export-dynamic -avoid-version
+ 
+ # Build a libtool library, libggnomedb.la for installation in libdir.
+ lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) 
diff --git a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in b/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
new file mode 100644
index 000000000000..ae8b1158cd68
--- /dev/null
+++ b/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
@@ -0,0 +1,11 @@
+--- src/plugins/sample/Makefile.in.orig	Sat Sep 14 18:58:54 2002
++++ src/plugins/sample/Makefile.in	Sat Sep 14 18:59:04 2002
+@@ -127,7 +127,7 @@
+ libPsample_la_SOURCES = sample_plugin.c baseplugin.h
+ libPsample_la_LIBADD = 
+ 
+-libPsample_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
++libPsample_la_LDFLAGS = -module -export-dynamic -avoid-version
+ 
+ # Build a libtool library, libggnomedb.la for installation in libdir.
+ lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) 
diff --git a/databases/mergeant/pkg-comment b/databases/mergeant/pkg-comment
new file mode 100644
index 000000000000..e61986f6e753
--- /dev/null
+++ b/databases/mergeant/pkg-comment
@@ -0,0 +1 @@
+Provide uniform access to data sources for the GNOME 2.0 environment
diff --git a/databases/mergeant/pkg-descr b/databases/mergeant/pkg-descr
new file mode 100644
index 000000000000..7e19742611d2
--- /dev/null
+++ b/databases/mergeant/pkg-descr
@@ -0,0 +1,9 @@
+mergeant can be considered as an extension of the libgda project.
+
+Its aims are the same: to provide universal data source access for
+client applications, as well as development tools and libraries
+for doing so. mergeant; is an extension to libgda; because it adds
+support to the architecture for the GNOME project.  mergeant was formed
+by merging components from gnome-db and gASQL.
+
+WWW: http://www.gnome-db.org/
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
new file mode 100644
index 000000000000..f62fbffb3036
--- /dev/null
+++ b/databases/mergeant/pkg-plist
@@ -0,0 +1,31 @@
+bin/mergeant
+share/doc/mergeant/C/topic.dat
+share/doc/mergeant/fr/topic.dat
+share/gnome/gnome/apps/Applications/mergeant.desktop
+share/gnome/mergeant/dtd/mergeant.dtd
+share/gnome/mergeant/plugins/libPnetaddr.so
+share/gnome/mergeant/plugins/libPpicts.so
+share/gnome/mergeant/plugins/libPsample.so
+share/gnome/pixmaps/mergeant/mergeant.png
+share/gnome/pixmaps/mergeant/mergeant_connect.png
+share/gnome/pixmaps/mergeant/mergeant_connect_small.png
+share/gnome/pixmaps/mergeant/mergeant_disconnect.png
+share/gnome/pixmaps/mergeant/mergeant_disconnect_small.png
+share/gnome/pixmaps/mergeant/mergeant_foot.png
+share/gnome/pixmaps/mergeant/mergeant_forms.png
+share/gnome/pixmaps/mergeant/mergeant_queries.png
+share/gnome/pixmaps/mergeant/mergeant_rels.png
+share/gnome/pixmaps/mergeant/mergeant_rels_small.png
+share/gnome/pixmaps/mergeant/mergeant_sequences.png
+share/gnome/pixmaps/mergeant/mergeant_tables.png
+share/locale/de/LC_MESSAGES/mergeant.mo
+share/locale/fr/LC_MESSAGES/mergeant.mo
+share/locale/it/LC_MESSAGES/mergeant.mo
+share/locale/ru/LC_MESSAGES/mergeant.mo
+share/locale/sk/LC_MESSAGES/mergeant.mo
+share/locale/tr/LC_MESSAGES/mergeant.mo
+@dirrm share/gnome/pixmaps/mergeant
+@dirrm share/gnome/mergeant/plugins
+@dirrm share/gnome/mergeant/dtd
+@dirrm share/gnome/mergeant
+@dirrm share/doc/mergeant