3 files changed, 39 insertions, 17 deletions

diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 61d676925c91..8ee81bf187b9 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -7,17 +7,17 @@
 #
 
 PORTNAME=	glom
-PORTVERSION=	0.8.30
-PORTREVISION=	3
+PORTVERSION=	1.0.4
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNOME database designed
+COMMENT=	GNOME database designer and user interface
 
 LIB_DEPENDS=	bakery-2.4:${PORTSDIR}/x11-toolkits/bakery \
-		gdamm-1.3:${PORTSDIR}/databases/libgdamm
+		gdamm-1.3:${PORTSDIR}/databases/libgdamm \
+		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
@@ -27,15 +27,12 @@ USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix pygnomeextras
+USE_GNOME=	gnomedocutils gnomehack gnomeprefix pygnomeextras
+USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-INSTALLS_OMF=	yes
-
-BROKEN=	needs an update to 1.0
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
+INSTALLS_ICONS=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -43,4 +40,10 @@ EXPIRATION_DATE=2006-12-01
 BROKEN=		doesn't play well with 4.X.
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' ${WRKSRC}/Makefile.in
+
+post-install:
+	@-update-mime-database ${PREFIX}/share/mime
+
 .include <bsd.port.post.mk>
diff --git a/databases/glom/distinfo b/databases/glom/distinfo
index ae8230583694..f004b68f9da1 100644
--- a/databases/glom/distinfo
+++ b/databases/glom/distinfo
@@ -1,3 +1,3 @@
-MD5 (glom-0.8.30.tar.bz2) = 5cd522f7f6bb34667bc184fb42a4ce8d
-SHA256 (glom-0.8.30.tar.bz2) = 6cc96c2b4e3edf9385b2b3141e756dc8352d2499294667465d7c737d0f97df9f
-SIZE (glom-0.8.30.tar.bz2) = 593130
+MD5 (glom-1.0.4.tar.bz2) = 1bb06562bf52a66747b4ac4a2aefa3a7
+SHA256 (glom-1.0.4.tar.bz2) = 05f1f401fb4655c98ffec906878b9d21ed3e5830ea03b0962dcfbee2057c4768
+SIZE (glom-1.0.4.tar.bz2) = 882714
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index b85a2ea0e874..f9bd0bb892b1 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -1,7 +1,13 @@
 bin/glom
+lib/libglom.a
+lib/libglom.la
+lib/libglom.so
+lib/libglom.so.0
+%%PYTHON_SITELIBDIR%%/glom.a
+%%PYTHON_SITELIBDIR%%/glom.la
 %%PYTHON_SITELIBDIR%%/glom.so
-share/gnome/application-registry/glom.applications
-share/gnome/apps/Applications/glom.desktop
+share/gnome/applications/glom.desktop
+share/gnome/glom/doc/examples/example_smallbusiness.glom
 share/gnome/glom/glade/glom.glade
 share/gnome/glom/glom_document.dtd
 share/gnome/glom/xslt/print_details_to_html.xsl
@@ -9,17 +15,23 @@ share/gnome/glom/xslt/print_report_to_html.xsl
 share/gnome/help/glom/C/figures/start.png
 share/gnome/help/glom/C/glom.xml
 share/gnome/help/glom/C/legal.xml
+share/gnome/help/glom/de/figures/start.png
+share/gnome/help/glom/de/glom.xml
 share/gnome/mime-info/glom.keys
 share/gnome/mime-info/glom.mime
-share/gnome/omf/glom/glom-C.omf
+share/icons/hicolor/48x48/apps/glom.png
+share/icons/hicolor/scalable/apps/glom.svg
+share/locale/ca/LC_MESSAGES/glom.mo
 share/locale/cs/LC_MESSAGES/glom.mo
 share/locale/de/LC_MESSAGES/glom.mo
 share/locale/en_CA/LC_MESSAGES/glom.mo
 share/locale/en_GB/LC_MESSAGES/glom.mo
 share/locale/es/LC_MESSAGES/glom.mo
+share/locale/fi/LC_MESSAGES/glom.mo
 share/locale/fr/LC_MESSAGES/glom.mo
 share/locale/gu/LC_MESSAGES/glom.mo
 share/locale/it/LC_MESSAGES/glom.mo
+share/locale/ne/LC_MESSAGES/glom.mo
 share/locale/nl/LC_MESSAGES/glom.mo
 share/locale/pa/LC_MESSAGES/glom.mo
 share/locale/pt/LC_MESSAGES/glom.mo
@@ -28,13 +40,18 @@ share/locale/rw/LC_MESSAGES/glom.mo
 share/locale/sq/LC_MESSAGES/glom.mo
 share/locale/sv/LC_MESSAGES/glom.mo
 share/locale/tr/LC_MESSAGES/glom.mo
+share/locale/vi/LC_MESSAGES/glom.mo
 share/locale/zh_CN/LC_MESSAGES/glom.mo
 share/mime/packages/glom.xml
+@dirrm share/gnome/help/glom/de/figures
+@dirrm share/gnome/help/glom/de
 @dirrm share/gnome/help/glom/C/figures
 @dirrm share/gnome/help/glom/C
 @dirrm share/gnome/help/glom
 @dirrm share/gnome/glom/xslt
 @dirrm share/gnome/glom/glade
+@dirrm share/gnome/glom/doc/examples
+@dirrm share/gnome/glom/doc
 @dirrm share/gnome/glom
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
@@ -44,3 +61,5 @@ share/mime/packages/glom.xml
 @dirrmtry share/locale/pt
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime