Update to 0.12.0.

4 files changed, 57 insertions, 13 deletions

diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index d38a98a59b3b..e8a9887405e8 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	mergeant
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Provide uniform access to data sources for the GNOME 2.0 environment
+COMMENT=	Provide uniform access to data sources for the GNOME 2 environment
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -23,7 +23,7 @@ USE_GNOME=	gnomeprefix gnomehack libgnomedb libgnomeprintui
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index 8989c2cb1c5e..0cccbb998664 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1 +1 @@
-MD5 (gnome2/mergeant-0.11.0.tar.bz2) = 137b73af05fffed1be0dd470e66e9620
+MD5 (gnome2/mergeant-0.12.0.tar.bz2) = 93bb562a010c2fbab600bed9626f7e15
diff --git a/databases/mergeant/files/patch-configure b/databases/mergeant/files/patch-configure
index 522cb695567f..0152e87ad7a3 100644
--- a/databases/mergeant/files/patch-configure
+++ b/databases/mergeant/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Jan 27 20:50:17 2003
-+++ configure	Fri Feb  7 01:02:04 2003
+--- configure.orig	Wed May 28 19:35:54 2003
++++ configure	Wed May 28 23:22:14 2003
 @@ -7948,6 +7948,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9405,13 +9406,13 @@
+@@ -9407,13 +9408,13 @@
  
  MERGEANT_Pixmapdir=${datadir}/pixmaps/${PACKAGE}
  
@@ -17,7 +17,7 @@
  
  MERGEANT_DTDdir=${datadir}/${PACKAGE}/dtd
  
- MERGEANT_Plugdir=${datadir}/${PACKAGE}/plugins
+ MERGEANT_Plugdir=${libdir}/${PACKAGE}/plugins
  
 -MERGEANT_Helpdir=${datadir}/gnome/help/${PACKAGE}
 +MERGEANT_Helpdir=${datadir}/help/${PACKAGE}
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index ce43289e58ea..42a3db768379 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -1,11 +1,50 @@
 bin/mergeant
+lib/mergeant/plugins/libPnetaddr.so
+lib/mergeant/plugins/libPpicts.so
+lib/mergeant/plugins/libPsample.so
 share/gnome/application-registry/mergeant.applications
 share/gnome/applications/mergeant.desktop
+share/gnome/help/mergeant/C/c137.html
+share/gnome/help/mergeant/C/c220.html
+share/gnome/help/mergeant/C/c25.html
+share/gnome/help/mergeant/C/c254.html
+share/gnome/help/mergeant/C/c342.html
+share/gnome/help/mergeant/C/c372.html
+share/gnome/help/mergeant/C/c375.html
+share/gnome/help/mergeant/C/f20.html
+share/gnome/help/mergeant/C/images/env_form.jpg
+share/gnome/help/mergeant/C/images/env_grid.jpg
+share/gnome/help/mergeant/C/images/env_prop.jpg
+share/gnome/help/mergeant/C/images/framework.eps
+share/gnome/help/mergeant/C/images/framework.fig
+share/gnome/help/mergeant/C/images/framework.jpg
+share/gnome/help/mergeant/C/images/gas.gif
+share/gnome/help/mergeant/C/images/main.jpg
+share/gnome/help/mergeant/C/images/plugins_dt.jpg
+share/gnome/help/mergeant/C/images/plugins_objects.jpg
+share/gnome/help/mergeant/C/images/plugins_sum.jpg
+share/gnome/help/mergeant/C/images/properties.jpg
+share/gnome/help/mergeant/C/images/queryprop.jpg
+share/gnome/help/mergeant/C/images/queryprop_cond.jpg
+share/gnome/help/mergeant/C/images/queryprop_joins.jpg
+share/gnome/help/mergeant/C/images/queryprop_objects.jpg
+share/gnome/help/mergeant/C/images/queryprop_sql.jpg
+share/gnome/help/mergeant/C/images/rels.jpg
+share/gnome/help/mergeant/C/images/sysinfo.jpg
+share/gnome/help/mergeant/C/index.html
 share/gnome/help/mergeant/C/topic.dat
+share/gnome/help/mergeant/C/x110.html
+share/gnome/help/mergeant/C/x168.html
+share/gnome/help/mergeant/C/x210.html
+share/gnome/help/mergeant/C/x236.html
+share/gnome/help/mergeant/C/x245.html
+share/gnome/help/mergeant/C/x313.html
+share/gnome/help/mergeant/C/x32.html
+share/gnome/help/mergeant/C/x350.html
+share/gnome/help/mergeant/C/x66.html
+share/gnome/help/mergeant/C/x80.html
+share/gnome/help/mergeant/C/x92.html
 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/mime-info/mergeant.keys
 share/gnome/mime-info/mergeant.mime
 share/gnome/omf/mergeant/mergeant-C.omf
@@ -27,10 +66,12 @@ share/gnome/pixmaps/mergeant/query-view-query_16x16.png
 share/gnome/pixmaps/mergeant/query-view-table_16x16.png
 share/gnome/pixmaps/mergeant/query-view-view_16x16.png
 share/locale/am/LC_MESSAGES/mergeant.mo
+share/locale/ca/LC_MESSAGES/mergeant.mo
 share/locale/cs/LC_MESSAGES/mergeant.mo
 share/locale/da/LC_MESSAGES/mergeant.mo
 share/locale/de/LC_MESSAGES/mergeant.mo
 share/locale/es/LC_MESSAGES/mergeant.mo
+share/locale/fa/LC_MESSAGES/mergeant.mo
 share/locale/fr/LC_MESSAGES/mergeant.mo
 share/locale/it/LC_MESSAGES/mergeant.mo
 share/locale/ms/LC_MESSAGES/mergeant.mo
@@ -41,17 +82,20 @@ share/locale/pt/LC_MESSAGES/mergeant.mo
 share/locale/pt_BR/LC_MESSAGES/mergeant.mo
 share/locale/ru/LC_MESSAGES/mergeant.mo
 share/locale/sk/LC_MESSAGES/mergeant.mo
+share/locale/sr/LC_MESSAGES/mergeant.mo
+share/locale/sr@Latn/LC_MESSAGES/mergeant.mo
 share/locale/sv/LC_MESSAGES/mergeant.mo
 share/locale/tr/LC_MESSAGES/mergeant.mo
 share/locale/uk/LC_MESSAGES/mergeant.mo
 share/locale/vi/LC_MESSAGES/mergeant.mo
 @dirrm share/gnome/pixmaps/mergeant
 @dirrm share/gnome/omf/mergeant
-@dirrm share/gnome/mergeant/plugins
 @dirrm share/gnome/mergeant/dtd
 @dirrm share/gnome/mergeant
 @dirrm share/gnome/help/mergeant/C/stylesheet-images
 @dirrm share/gnome/help/mergeant/C/images
 @dirrm share/gnome/help/mergeant/C
 @dirrm share/gnome/help/mergeant
+@dirrm lib/mergeant/plugins
+@dirrm lib/mergeant
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/mergeant/mergeant-C.omf 2>/dev/null || /usr/bin/true