5 files changed, 29 insertions, 28 deletions

diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index fd0f19aba369..6439dfd9c037 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	decurs
-PORTVERSION=	0.50.1
-PORTREVISION=	1
+PORTVERSION=	0.55.1
 CATEGORIES=	x11
 MASTER_SITES=	http://varg.dyndns.org/psi/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK+ based program that lets you edit you XFree86 mouse cursors
 
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
+LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "/^CXXFLAGS/s|-O2||" ${WRKSRC}/src/Makefile.in
+	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
+		${FILESDIR}/decurs.exec > ${WRKSRC}/decurs.exec
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/decurs ${X11BASE}/bin/decurs-real
+	${INSTALL_PROGRAM} ${WRKSRC}/src/decurs ${PREFIX}/bin/decurs.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/decurs.exec ${PREFIX}/bin/decurs
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/src/cursor.bdf ${DATADIR}
-	${SED} -e "s|%%DECURS_DIR%%|${DATADIR}|; s|%%PREFIX%%|${PREFIX}|" \
-		${FILESDIR}/decurs.exec > ${WRKSRC}/decurs.exec
-	${INSTALL_SCRIPT} ${WRKSRC}/decurs.exec ${X11BASE}/bin/decurs
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.bdf ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/decurs/distinfo b/x11/decurs/distinfo
index ae6dd47fe095..c69c18ef7048 100644
--- a/x11/decurs/distinfo
+++ b/x11/decurs/distinfo
@@ -1 +1 @@
-MD5 (decurs-0.50.1.tar.gz) = 4b3baa686d752d9683a7a00702888fc1
+MD5 (decurs-0.55.1.tar.gz) = eff87b5343729dd2010698deda0c2ceb
diff --git a/x11/decurs/files/decurs.exec b/x11/decurs/files/decurs.exec
index 955f81c11feb..a02a9e65bfaf 100644
--- a/x11/decurs/files/decurs.exec
+++ b/x11/decurs/files/decurs.exec
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd %%DECURS_DIR%%
-exec %%PREFIX%%/bin/decurs-real
+cd %%PREFIX%%/share/decurs
+exec %%PREFIX%%/bin/decurs.bin "$@"
diff --git a/x11/decurs/pkg-descr b/x11/decurs/pkg-descr
index 55b0504823e5..c43aee740085 100644
--- a/x11/decurs/pkg-descr
+++ b/x11/decurs/pkg-descr
@@ -1,7 +1,7 @@
-DeCurs is a GTK+ based program that lets you edit you XFree86 mouse cursors.
-It reads them from "bdf" -formatted font files. Now, don't worry, DeCurs comes
-with one handy =). 
+DeCurs is a GTK+ based program that lets you edit you XFree86 mouse
+cursors. It reads them from "bdf" -formatted font files. Now, don't
+worry, DeCurs comes with one handy =).
 
-WWW:	http://www.hut.fi/~pvsavola/decurs.html
+WWW: http://varg.dyndns.org/psi/pub/code/decurs/index.html
 
 -Adam Weinberger <adamw@FreeBSD.org>
diff --git a/x11/decurs/pkg-plist b/x11/decurs/pkg-plist
index 5d52b5585ebd..359ac2fb99c7 100644
--- a/x11/decurs/pkg-plist
+++ b/x11/decurs/pkg-plist
@@ -1,4 +1,14 @@
 bin/decurs
-bin/decurs-real
-share/decurs/cursor.bdf
-@dirrm share/decurs
+bin/decurs.bin
+%%DATADIR%%/DeCurs-cursor.bdf
+%%DATADIR%%/XFree86-4-cursor.bdf
+%%DATADIR%%/cursor.bdf
+%%DATADIR%%/helvBO24.bdf
+%%DATADIR%%/mod.bdf
+%%DATADIR%%/modified.bdf
+%%DATADIR%%/modified.old.bdf
+%%DATADIR%%/modified.save.bdf
+%%DATADIR%%/modified2.bdf
+%%DATADIR%%/pieces.bdf
+%%DATADIR%%/simple.bdf
+@dirrm %%DATADIR%%