3 files changed, 34 insertions, 23 deletions

diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 94c8599d7abc..fbb5de01571c 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dctc
-PORTVERSION=	0.63
+PORTVERSION=	0.65
 CATEGORIES=	net gnome
 MASTER_SITES=	http://unixpages.org/distfiles/ \
 		http://ac2i.tzo.com/dctc/
@@ -21,31 +21,37 @@ LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomelibs
+USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnome=${X11BASE} \
 		--with-gtk-prefix=${LOCALBASE} \
-		--datadir=${X11BASE}/share/gnome \
 		--enable-manual-db-detect \
 		--with-libiconv-prefix=${LOCALBASE}
 
 DOC_FILES= COPYING ChangeLog README TODO
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${PERL} -pi -e \
-		's|(\$$\(datadir\))/gnome|\1|; \
-		s|ldb-4.0|ldb4|; \
-		s|<(db.h>)|<db4/\1|; \
-		s|include.+<linux/sem.h>|include <sys/ipc.h>\n#include <sys/sem.h>|'
-	@${PERL} -pi -e 's|(hublist)|dc_\1|m' ${WRKSRC}/configure
-	@${PERL} -pi -e 's|(<stdio.h>.*)$$|\1\n#include <config.h>|; \
-		s|(cmdline.+)(hublist)|\1dc_\2|' \
+	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} -E -e \
+		's|ldb-4.0|ldb4|; \
+		s|<(db.h>)|<db4/\1|'
+	@${REINPLACE_CMD} -E -e 's|(hublist)|dc_\1|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -E -e \
+		's|(hublist)(.+argv)|dc_\1\2|' \
 		${WRKSRC}/src/init_fnc.c
 # XXX - revise at every port update
 	@${REINPLACE_CMD} -e "s|%'|%|g" ${WRKSRC}/src/*.c
+#	@${REINPLACE_CMD} -E -e \
+#		's|%lf|%f|; \
+#		s|(%\.[[:digit:]])lf|\1f|' \
+#		${WRKSRC}/src/*.c
+# clean up so as to not break installation
+	@${FIND} ${WRKSRC} -type f \
+		-name "*.bak" \
+		| ${XARGS} -n 10 -x ${RM}
 
 post-configure:
 	@${ECHO_CMD} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h
diff --git a/net-p2p/dctc-gui/distinfo b/net-p2p/dctc-gui/distinfo
index 88724b8a72c1..c9ec335a0635 100644
--- a/net-p2p/dctc-gui/distinfo
+++ b/net-p2p/dctc-gui/distinfo
@@ -1 +1 @@
-MD5 (dc_gui-0.63.tar.gz) = de1eda5d62496575f90410fc0c916b99
+MD5 (dc_gui-0.65.tar.gz) = 282c566d025a4a3e4580868a96437243
diff --git a/net-p2p/dctc-gui/pkg-plist b/net-p2p/dctc-gui/pkg-plist
index 7758b2b6cd9c..1b5bf3c2294d 100644
--- a/net-p2p/dctc-gui/pkg-plist
+++ b/net-p2p/dctc-gui/pkg-plist
@@ -3,8 +3,17 @@ bin/dc_gui
 %%PORTDOCS%%share/doc/dctc-gui/ChangeLog
 %%PORTDOCS%%share/doc/dctc-gui/README
 %%PORTDOCS%%share/doc/dctc-gui/TODO
+share/gnome/help/dc_gui/C/index.html
+share/gnome/help/dc_gui/C/topic.dat
+share/gnome/help/dc_gui/es/index.html
+share/gnome/help/dc_gui/es/topic.dat
+share/gnome/help/dc_gui/nl/index.html
+share/gnome/help/dc_gui/nl/topic.dat
+share/gnome/pixmaps/dc_gui/icon_folder_add.xpm
+share/gnome/pixmaps/dc_gui/icon_folder_del.xpm
 share/gnome/pixmaps/dc_gui/icon_kill.xpm
 share/gnome/pixmaps/dc_gui/icon_refresh.xpm
+share/gnome/pixmaps/dc_gui/icon_remove_all.xpm
 share/gnome/pixmaps/dc_gui/icon_remove_selected.xpm
 share/locale/de/LC_MESSAGES/dc_gui.mo
 share/locale/fr/LC_MESSAGES/dc_gui.mo
@@ -18,16 +27,12 @@ share/locale/sv/LC_MESSAGES/dc_gui.mo
 @unexec %D/share/locale/fr 2>/dev/null || true
 @unexec %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec %D/share/locale/de 2>/dev/null || true
-@unexec %D/share/locale 2>/dev/null || true
 @dirrm share/gnome/pixmaps/dc_gui
-@unexec %D/share/gnome/help/dc_gui/nl/images 2>/dev/null || true
-@unexec %D/share/gnome/help/dc_gui/nl 2>/dev/null || true
-@unexec %D/share/gnome/help/dc_gui/es/images 2>/dev/null || true
-@unexec %D/share/gnome/help/dc_gui/es 2>/dev/null || true
-@unexec %D/share/gnome/help/dc_gui/C/images 2>/dev/null || true
-@unexec %D/share/gnome/help/dc_gui/C 2>/dev/null || true
-@unexec %D/share/gnome/help/dc_gui 2>/dev/null || true
-@unexec %D/share/gnome/help 2>/dev/null || true
-@unexec %D/share/gnome 2>/dev/null || true
+@dirrm share/gnome/help/dc_gui/nl/images
+@dirrm share/gnome/help/dc_gui/nl
+@dirrm share/gnome/help/dc_gui/es/images
+@dirrm share/gnome/help/dc_gui/es
+@dirrm share/gnome/help/dc_gui/C/images
+@dirrm share/gnome/help/dc_gui/C
+@dirrm share/gnome/help/dc_gui
 %%PORTDOCS%%@dirrm share/doc/dctc-gui
-