Update to 0.41

5 files changed, 28 insertions, 70 deletions

diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 9390a548ab2f..3c944979917e 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dctc
-PORTVERSION=	0.35
+PORTVERSION=	0.41
 CATEGORIES=	net gnome
 MASTER_SITES=	http://ac2i.tzo.com/dctc/
 PKGNAMESUFFIX=	-gui
@@ -28,7 +28,20 @@ CONFIGURE_ARGS=	--with-gnome=${X11BASE} \
 		--with-gtk-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE}
 
-DOC_FILES=	COPYING ChangeLog
+DOC_FILES= COPYING ChangeLog README
+
+post-patch:
+	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${PERL} -pi -e \
+		's|(hublist)|dc_\1|;s|(\$$\(datadir\))/gnome|\1|; \
+		s|include.+<linux/sem.h>|include <sys/ipc.h>\n#include <sys/sem.h>|'
+	@${PERL} -pi -e 's|(<stdio.h>.*)$$|\1\n#include <config.h>|' \
+		${WRKSRC}/src/init_fnc.c
+
+post-configure:
+	@${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO} '#ifndef SEMVMX' >> ${WRKSRC}/config.h
+	@${ECHO} '#define SEMVMX 32767' >> ${WRKSRC}/config.h
+	@${ECHO} '#endif' >> ${WRKSRC}/config.h
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/net-p2p/dctc-gui/distinfo b/net-p2p/dctc-gui/distinfo
index 00a40a1baf18..9e84795274c2 100644
--- a/net-p2p/dctc-gui/distinfo
+++ b/net-p2p/dctc-gui/distinfo
@@ -1 +1 @@
-MD5 (dc_gui-0.35.tar.gz) = e9a5e723e6424e98e813060b1a4e1412
+MD5 (dc_gui-0.41.tar.gz) = ee8bd78162b5d77b573ada6c8c3081fb
diff --git a/net-p2p/dctc-gui/files/patch-src:callbacks.c b/net-p2p/dctc-gui/files/patch-src:callbacks.c
deleted file mode 100644
index 26cd4f4342ed..000000000000
--- a/net-p2p/dctc-gui/files/patch-src:callbacks.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/callbacks.c.orig	Sat Nov 24 07:38:45 2001
-+++ src/callbacks.c	Sat Nov 24 16:22:22 2001
-@@ -2,12 +2,22 @@
- #  include <config.h>
- #endif
- 
-+#ifdef HAVE_SYS_PARAM_H
-+#  include <sys/param.h>
-+#endif
-+
- #include <math.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <gdk/gdkkeysyms.h>
-+#if !(defined(BSD) && (BSD >= 199103)) /* !BSD */
- #include <linux/sem.h>
-+#endif
- #include <gnome.h>
-+
-+#ifndef SEMVMX
-+#define SEMVMX	32767
-+#endif
- 
- #include "callbacks.h"
- #include "interface.h"
diff --git a/net-p2p/dctc-gui/files/patch-src:init_fnc.c b/net-p2p/dctc-gui/files/patch-src:init_fnc.c
deleted file mode 100644
index 693fdbc955db..000000000000
--- a/net-p2p/dctc-gui/files/patch-src:init_fnc.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/init_fnc.c.orig	Sat Nov 24 07:23:17 2001
-+++ src/init_fnc.c	Sat Nov 24 16:37:43 2001
-@@ -1,3 +1,11 @@
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#ifdef HAVE_SYS_PARAM_H
-+#  include <sys/param.h>
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -7,11 +15,17 @@
- #include <math.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <linux/sem.h>		/* for the value of SEMVMX */
-+#if !(defined(BSD) && (BSD >= 199103))  /* Not BSD */
-+#  include <linux/sem.h>		/* for the value of SEMVMX */
-+#endif
- #include <dirent.h>
- #include <string.h>
- #include <gnome.h>
- 
-+#ifndef SEMVMX
-+#define SEMVMX	32767
-+#endif
-+
- #include "misc_gtk.h"
- #include "init_fnc.h"
- #include "main.h"
-@@ -411,7 +425,7 @@
- 		gtk_clist_freeze(GTK_CLIST(rhcw));
- 		gtk_clist_clear(GTK_CLIST(rhcw));
- 
--		f=popen("hublist","r");
-+		f=popen("dc_hublist","r");
- 		if(f!=NULL)
- 		{
- 			char *ent[4];
diff --git a/net-p2p/dctc-gui/pkg-plist b/net-p2p/dctc-gui/pkg-plist
index fe7fd3eb7b4b..148a004eeefa 100644
--- a/net-p2p/dctc-gui/pkg-plist
+++ b/net-p2p/dctc-gui/pkg-plist
@@ -1,4 +1,16 @@
 bin/dc_gui
 %%PORTDOCS%%share/doc/dctc-gui/COPYING
 %%PORTDOCS%%share/doc/dctc-gui/ChangeLog
+%%PORTDOCS%%share/doc/dctc-gui/README
+share/gnome/help/dc_gui/C/index.html
+share/gnome/help/dc_gui/C/topic.dat
+share/locale/nl/LC_MESSAGES/dc_gui.mo
+@unexec %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec %D/share/locale/nl 2>/dev/null || true
+@unexec %D/share/locale 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
 %%PORTDOCS%%@dirrm share/doc/dctc-gui