ports/118006: [patch] audio/teknap unbreak fix build with GCC 4.2

["Pietro Cerutti" <Pietro Cerutti]

>Number:         118006
>Category:       ports
>Synopsis:       [patch] audio/teknap unbreak fix build with GCC 4.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 12 15:00:04 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
Bern University of Applied Sciences 
>Environment:


System: FreeBSD 8.0-CURRENT #9: Fri Nov  9 14:50:37 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


- fixed a few "static declaration follows non-static declaration" errors
- fixed a ${TAR} option in the Makefile


>How-To-Repeat:


cd /usr/ports/audio/teknap && make


>Fix:


--- _teknap.diff begins here ---
--- Makefile.orig	2007-11-12 15:39:03.000000000 +0100
+++ Makefile	2007-11-12 15:46:47.000000000 +0100
@@ -35,10 +35,6 @@
 
 .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 @@
 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}
--- /dev/null	2007-11-12 15:47:50.000000000 +0100
+++ files/patch-source_share.c	2007-11-12 15:45:30.000000000 +0100
@@ -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);
+ 
--- /dev/null	2007-11-12 15:47:50.000000000 +0100
+++ files/patch-source_timer.c	2007-11-12 15:45:44.000000000 +0100
@@ -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;
--- _teknap.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: