- Fix build with gcc 4.2

PR:		118006
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
Approved by:	portmgr (erwin)

3 files changed, 23 insertions, 5 deletions

diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile
index e2f16a7774d5..46144cbc464b 100644
--- a/net-p2p/teknap/Makefile
+++ b/net-p2p/teknap/Makefile
@@ -35,10 +35,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if ${HAVE_GNOME:Mgtk12}!=""
 USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=--with-gtk
@@ -67,7 +63,7 @@ pre-configure:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/TekNap
-	${TAR} --directory ${WRKSRC}/teknap-help -cf - . --exclude CVS | \
+	${TAR} --directory ${WRKSRC}/teknap-help -cf - . | \
 	${TAR} --directory ${PREFIX}/share/TekNap/help -xf -
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/TekNap
 	@${ECHO}
diff --git a/net-p2p/teknap/files/patch-source_share.c b/net-p2p/teknap/files/patch-source_share.c
new file mode 100644
index 000000000000..265b8f6d82b3
--- /dev/null
+++ b/net-p2p/teknap/files/patch-source_share.c
@@ -0,0 +1,11 @@
+--- source/share.c.orig	2007-11-12 15:41:18.000000000 +0100
++++ source/share.c	2007-11-12 15:43:42.000000000 +0100
+@@ -38,7 +38,7 @@
+ 
+ static pthread_mutex_t quit_mutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+-static pthread_mutex_t fserv_struct_mutex = PTHREAD_MUTEX_INITIALIZER;
++pthread_mutex_t fserv_struct_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_t shared_count_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static void share_thread_signal_setup(void);
+ 
diff --git a/net-p2p/teknap/files/patch-source_timer.c b/net-p2p/teknap/files/patch-source_timer.c
new file mode 100644
index 000000000000..d1d8c5de7784
--- /dev/null
+++ b/net-p2p/teknap/files/patch-source_timer.c
@@ -0,0 +1,11 @@
+--- source/timer.c.orig	2007-11-12 15:43:52.000000000 +0100
++++ source/timer.c	2007-11-12 15:44:47.000000000 +0100
+@@ -145,7 +145,7 @@
+  * This is put here on purpose -- we dont want any of the above functions
+  * to have any knowledge of this struct.
+  */
+-static TimerList *PendingTimers;
++TimerList *PendingTimers;
+ static char *schedule_timer (TimerList *ntimer);
+ 
+ static char *current_exec_timer = empty_string;