4 files changed, 38 insertions, 24 deletions

diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index 8b88e3d99e15..9d61f4b32b01 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -2,27 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	gdmap
-PORTVERSION=	0.7.5
-PORTREVISION=	7
+PORTVERSION=	0.8.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical disk map Utility
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_GNOME=	gnomeprefix gnomehack gtk20
-USES=		gmake perl5 pkgconfig
+USES=		gettext gmake pathfix perl5 pkgconfig
+USE_PERL5=	build
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
-MAN1=	gdmap.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's,<sys/vfs.h>,<sys/statvfs.h>,' \
-		${WRKSRC}/src/gui_main.c
-	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+	@${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|<sys/vfs.h>|<sys/statvfs.h>|' \
+		${WRKSRC}/src/gui_main.c
+	@${REINPLACE_CMD} -e \
+		's|=\(gdmap_icon.png\)|=${PREFIX}/share/pixmaps/\1|' \
+		${WRKSRC}/data/gdmap.desktop.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/gdmap/distinfo b/sysutils/gdmap/distinfo
index a2e2c07cb961..1228ef5d2f65 100644
--- a/sysutils/gdmap/distinfo
+++ b/sysutils/gdmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdmap-0.7.5.tar.gz) = 466cd3bac08bec655af18419bf7aa6d7143ac5fbb31ddf8cb75b02bcc27fae6f
-SIZE (gdmap-0.7.5.tar.gz) = 175869
+SHA256 (gdmap-0.8.1.tar.gz) = a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+SIZE (gdmap-0.8.1.tar.gz) = 190823
diff --git a/sysutils/gdmap/pkg-descr b/sysutils/gdmap/pkg-descr
index 89d8fe997cbe..1f9460b6a471 100644
--- a/sysutils/gdmap/pkg-descr
+++ b/sysutils/gdmap/pkg-descr
@@ -1,12 +1,5 @@
-GdMap is a tool which allows to visualize disk space.
-Ever wondered why your hard disk is full or what directory and 
-files take up most of the space? With GdMap these questions can
-be answered quickly. To display directory structures cushion 
-treemaps are used which visualize a complete folder or even the 
-whole hard drive with one picture.
-
-Cushion treemaps display directories and files in rectangular areas.
-The larger a file is the larger is the rectangle which represents it.
-All files in one directory are painted within the rectangle of that directory.
+GdMap is a tool to inspect the used space of folders. Files are
+displayed in a cushioned tree map. Useful if you wonder where all your
+free space went to.
 
 WWW: http://gdmap.sourceforge.net/ 
diff --git a/sysutils/gdmap/pkg-plist b/sysutils/gdmap/pkg-plist
index 55d62af4f443..8517eba06425 100644
--- a/sysutils/gdmap/pkg-plist
+++ b/sysutils/gdmap/pkg-plist
@@ -1,6 +1,20 @@
 bin/gdmap
+man/man1/gdmap.1.gz
 share/applications/gdmap.desktop
-share/gdmap/pixmaps/gdmap_icon.png
+%%DATADIR%%/pixmaps/gdmap_icon.png
+share/locale/bg/LC_MESSAGES/GdMap.mo
+share/locale/de/LC_MESSAGES/GdMap.mo
+share/locale/dk/LC_MESSAGES/GdMap.mo
+share/locale/es/LC_MESSAGES/GdMap.mo
+share/locale/fr/LC_MESSAGES/GdMap.mo
+share/locale/he/LC_MESSAGES/GdMap.mo
+share/locale/hr/LC_MESSAGES/GdMap.mo
+share/locale/it/LC_MESSAGES/GdMap.mo
+share/locale/nb/LC_MESSAGES/GdMap.mo
+share/locale/no/LC_MESSAGES/GdMap.mo
+share/locale/ru/LC_MESSAGES/GdMap.mo
+share/locale/sv/LC_MESSAGES/GdMap.mo
+share/locale/tr/LC_MESSAGES/GdMap.mo
 share/pixmaps/gdmap_icon.png
-@dirrm share/gdmap/pixmaps
-@dirrm share/gdmap
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%