Update to 0.62.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4397 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 41 insertions, 10 deletions

diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index acc080db7..45de00942 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/mergeant/Makefile,v 1.13 2005/07/09 06:11:49 adamw Exp $
+#   $MCom: ports/databases/mergeant/Makefile,v 1.14 2005/07/12 04:25:56 marcus Exp $
 #
 
 PORTNAME=	mergeant
-PORTVERSION=	0.61
+PORTVERSION=	0.62
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.61
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index 437477485..07d3c52b3 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/mergeant-0.61.tar.bz2) = 04a1728b8c5e3fe9225291227df5f159
-SIZE (gnome2/mergeant-0.61.tar.bz2) = 956350
+MD5 (gnome2/mergeant-0.62.tar.bz2) = acd5dd8d888f8dde8ca0768d081828e3
+SIZE (gnome2/mergeant-0.62.tar.bz2) = 1005279
diff --git a/databases/mergeant/files/patch-configure b/databases/mergeant/files/patch-configure
index 063c411ad..baf457654 100644
--- a/databases/mergeant/files/patch-configure
+++ b/databases/mergeant/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Tue Jun  7 18:51:00 2005
-+++ configure	Tue Jun  7 18:53:54 2005
-@@ -22955,9 +22955,9 @@
+--- configure.orig	Sun Aug  7 17:40:05 2005
++++ configure	Sun Aug  7 17:40:37 2005
+@@ -22920,9 +22920,9 @@
  
  MERGEANT_Pixmapdir=${datadir}/pixmaps/${PACKAGE}
  
--MERGEANT_Appdir=${datadir}/gnome/apps/Applications
-+MERGEANT_Appdir=${datadir}/apps/Applications
+-MERGEANT_Appdir=${datadir}/gnome/applications
++MERGEANT_Appdir=${datadir}/applications
  
 -MERGEANT_Helpdir=${datadir}/gnome/help/${PACKAGE}
 +MERGEANT_Helpdir=${datadir}/help/${PACKAGE}
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index 18b3e9fdc..53fe7bdf3 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -2,7 +2,37 @@ bin/mergeant
 libdata/bonobo/servers/GNOME_Mergeant.server
 share/gnome/application-registry/mergeant.applications
 share/gnome/applications/mergeant.desktop
+share/gnome/help/mergeant/C/book1.html
+share/gnome/help/mergeant/C/c13.html
+share/gnome/help/mergeant/C/c47.html
+share/gnome/help/mergeant/C/c68.html
+share/gnome/help/mergeant/C/c76.html
+share/gnome/help/mergeant/C/c8.html
+share/gnome/help/mergeant/C/c84.html
+share/gnome/help/mergeant/C/c94.html
+share/gnome/help/mergeant/C/docbook.css
+share/gnome/help/mergeant/C/images/datasources.png
+share/gnome/help/mergeant/C/images/dba_properties.png
+share/gnome/help/mergeant/C/images/workspace-data-types.png
+share/gnome/help/mergeant/C/images/workspace-graphs.png
+share/gnome/help/mergeant/C/images/workspace-queries.png
+share/gnome/help/mergeant/C/images/workspace.png
+share/gnome/help/mergeant/C/index.html
+share/gnome/help/mergeant/C/stylesheet-images/caution.gif
+share/gnome/help/mergeant/C/stylesheet-images/home.gif
+share/gnome/help/mergeant/C/stylesheet-images/important.gif
+share/gnome/help/mergeant/C/stylesheet-images/next.gif
+share/gnome/help/mergeant/C/stylesheet-images/note.gif
+share/gnome/help/mergeant/C/stylesheet-images/prev.gif
+share/gnome/help/mergeant/C/stylesheet-images/tip.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-blank.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-minus.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-plus.gif
+share/gnome/help/mergeant/C/stylesheet-images/up.gif
+share/gnome/help/mergeant/C/stylesheet-images/warning.gif
 share/gnome/help/mergeant/C/topic.dat
+share/gnome/help/mergeant/C/x19.html
+share/gnome/help/mergeant/C/x40.html
 share/gnome/mime-info/mergeant.keys
 share/gnome/mime-info/mergeant.mime
 share/gnome/omf/mergeant/mergeant-C.omf
@@ -41,6 +71,7 @@ share/locale/lt/LC_MESSAGES/mergeant.mo
 share/locale/ml/LC_MESSAGES/mergeant.mo
 share/locale/ms/LC_MESSAGES/mergeant.mo
 share/locale/nb/LC_MESSAGES/mergeant.mo
+share/locale/ne/LC_MESSAGES/mergeant.mo
 share/locale/nl/LC_MESSAGES/mergeant.mo
 share/locale/no/LC_MESSAGES/mergeant.mo
 share/locale/pl/LC_MESSAGES/mergeant.mo