svn commit: r314718 - in head/audio/terminatorx: . files

Pietro Cerutti gahr at FreeBSD.org
Wed Mar 20 08:56:10 UTC 2013 

Author: gahr
Date: Wed Mar 20 08:56:07 2013
New Revision: 314718
URL: http://svnweb.freebsd.org/changeset/ports/314718

Log:
  - Fix build with clang
  - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS
  - Get rid of shlib versions in LIB_DEPENDS
  - Trim Makefile headers
  - Pet portlint by renaming patch files

Added:
     - copied unchanged from r313650, head/audio/terminatorx/files/patch-src::main.cc
  head/audio/terminatorx/files/patch-src_tX_dial.c   (contents, props changed)
     - copied unchanged from r314717, head/audio/terminatorx/files/patch-src::tX_dialog.cc
     - copied unchanged from r314717, head/audio/terminatorx/files/patch-src::tX_global.c
     - copied unchanged from r314717, head/audio/terminatorx/files/patch-src::tX_ladspa.cc
     - copied unchanged from r314717, head/audio/terminatorx/files/patch-src__tX_mastergui.cc
     - copied unchanged from r314717, head/audio/terminatorx/files/patch-src__tX_mouse.cc
     - copied unchanged from r314717, head/audio/terminatorx/files/patch-src__tX_mouse.h
Directory Properties:
  head/audio/terminatorx/files/patch-src_main.cc   (props changed)
  head/audio/terminatorx/files/patch-src_tX_dialog.cc   (props changed)
  head/audio/terminatorx/files/patch-src_tX_global.c   (props changed)
  head/audio/terminatorx/files/patch-src_tX_ladspa.cc   (props changed)
  head/audio/terminatorx/files/patch-src_tX_mastergui.cc   (props changed)
  head/audio/terminatorx/files/patch-src_tX_mouse.cc   (props changed)
  head/audio/terminatorx/files/patch-src_tX_mouse.h   (props changed)
Deleted:
  head/audio/terminatorx/files/patch-src::main.cc
  head/audio/terminatorx/files/patch-src::tX_dialog.cc
  head/audio/terminatorx/files/patch-src::tX_global.c
  head/audio/terminatorx/files/patch-src::tX_ladspa.cc
  head/audio/terminatorx/files/patch-src__tX_mastergui.cc
  head/audio/terminatorx/files/patch-src__tX_mouse.cc
  head/audio/terminatorx/files/patch-src__tX_mouse.h
Modified:
  head/audio/terminatorx/Makefile   (contents, props changed)

Modified: head/audio/terminatorx/Makefile
==============================================================================
--- head/audio/terminatorx/Makefile	Wed Mar 20 08:38:51 2013	(r314717)
+++ head/audio/terminatorx/Makefile	Wed Mar 20 08:56:07 2013	(r314718)
@@ -1,7 +1,4 @@
-# New ports collection Makefile for: 	terminatorx
-# Date created:			13 May 2002
-# Whom:				Tilman Linneweh <arved at FreeBSD.org>
-#
+# Created by: Tilman Linneweh <arved at FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/audio/terminatorx/Makefile,v 1.6 2007/08/04 03:51:28 marcus Exp $
 
@@ -20,8 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
 		rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
-		lrdf.2:${PORTSDIR}/textproc/liblrdf
+LIB_DEPENDS=	audiofile:${PORTSDIR}/audio/libaudiofile \
+		lrdf:${PORTSDIR}/textproc/liblrdf
 
 OPTIONS_DEFINE=	ALSA JACK MPG123 SOX VORBIS MAD
 OPTIONS_DEFAULT=	JACK MPG123 SOX VORBIS MAD
@@ -41,19 +38,19 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		terminatorX.1
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
 CONFIGURE_ARGS+=	--disable-alsa
 .else
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--disable-jack
 .endif
@@ -72,13 +69,13 @@ CONFIGURE_ARGS+=	--disable-sox
 
 .if ${PORT_OPTIONS:MVORBIS}
 BUILD_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/mad
+LIB_DEPENDS+=	mad:${PORTSDIR}/audio/mad
 .else
 CONFIGURE_ARGS+=	--disable-mad
 .endif
@@ -96,8 +93,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \
 		${PREFIX}/share/pixmaps
 .endfor
-.for file in terminatorX.mime terminatorX.keys
-	${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \
+.for f in terminatorX.mime terminatorX.keys
+	${INSTALL_DATA} ${WRKSRC}/gnome-support/${f} \
 		${PREFIX}/share/mime-info
 .endfor
 	@${MKDIR} ${PREFIX}/share/applications

Copied: head/audio/terminatorx/files/patch-src_main.cc (from r313650, head/audio/terminatorx/files/patch-src::main.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_main.cc	Wed Mar 20 08:56:07 2013	(r314718, copy of r313650, head/audio/terminatorx/files/patch-src::main.cc)
@@ -0,0 +1,11 @@
+--- src/main.cc.orig	Thu Aug 21 06:41:24 2003
++++ src/main.cc	Sat Aug 23 04:52:05 2003
+@@ -33,7 +33,7 @@
+     4 October 1999: Rewrite ;) - back to C++
+ */
+ 
+-#define TX_GTKRC "/usr/share/themes/terminatorX/gtk/gtkrc"
++#define TX_GTKRC "%%LOCALBASE%%/share/themes/terminatorX/gtk/gtkrc"
+ 
+ #define BENCH_CYCLES 100000
+ 

Added: head/audio/terminatorx/files/patch-src_tX_dial.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_tX_dial.c	Wed Mar 20 08:56:07 2013	(r314718)
@@ -0,0 +1,11 @@
+--- src/tX_dial.c.orig	2013-03-20 09:38:30.000000000 +0100
++++ src/tX_dial.c	2013-03-20 09:38:43.000000000 +0100
+@@ -266,7 +266,7 @@
+ 	}
+ }
+ 
+-inline void gtk_tx_dial_draw (GtkTxDial *tx_dial, GtkWidget *widget)
++static inline void gtk_tx_dial_draw (GtkTxDial *tx_dial, GtkWidget *widget)
+ {
+ 	if (GTK_WIDGET_DRAWABLE (widget)) {
+ 		gdk_pixbuf_render_to_drawable(knob_pixmaps[tx_dial->old_image], 

Copied: head/audio/terminatorx/files/patch-src_tX_dialog.cc (from r314717, head/audio/terminatorx/files/patch-src::tX_dialog.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_tX_dialog.cc	Wed Mar 20 08:56:07 2013	(r314718, copy of r314717, head/audio/terminatorx/files/patch-src::tX_dialog.cc)
@@ -0,0 +1,14 @@
+--- src/tX_dialog.cc.orig	2004-02-06 19:28:21.000000000 +0100
++++ src/tX_dialog.cc	2010-08-14 22:00:50.000000000 +0200
+@@ -252,7 +252,11 @@
+ #ifdef USE_OSS
+ static GList *oss_devices=NULL;
+ 
++#ifdef HAVE_SCANDIR_POSIX
+ int oss_select_dsp_only(const struct dirent *entry){
++#else
++int oss_select_dsp_only(struct dirent *entry){
++#endif
+ 	return (strstr(entry->d_name, "dsp")!=0);
+ }
+ 

Copied: head/audio/terminatorx/files/patch-src_tX_global.c (from r314717, head/audio/terminatorx/files/patch-src::tX_global.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_tX_global.c	Wed Mar 20 08:56:07 2013	(r314718, copy of r314717, head/audio/terminatorx/files/patch-src::tX_global.c)
@@ -0,0 +1,11 @@
+--- src/tX_global.c.orig	Thu Aug 21 06:41:24 2003
++++ src/tX_global.c	Sat Aug 23 04:34:16 2003
+@@ -127,7 +127,7 @@
+ #endif		
+ 	globals.use_stdout_cmdline=0;
+ 	strcpy(globals.current_path, "");
+-	strcpy(globals.lrdf_path, "/usr/share/ladspa/rdf:/usr/local/share/ladspa/rdf");
++	strcpy(globals.lrdf_path, "%%LOCALBASE%%/share/ladspa/rdf");
+ 	globals.fullscreen_enabled=0;
+ 	globals.confirm_events=0;
+ 	globals.compress_set_files=0;

Copied: head/audio/terminatorx/files/patch-src_tX_ladspa.cc (from r314717, head/audio/terminatorx/files/patch-src::tX_ladspa.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_tX_ladspa.cc	Wed Mar 20 08:56:07 2013	(r314718, copy of r314717, head/audio/terminatorx/files/patch-src::tX_ladspa.cc)
@@ -0,0 +1,13 @@
+--- src/tX_ladspa.cc.orig	Tue Aug 19 02:36:40 2003
++++ src/tX_ladspa.cc	Sat Aug 23 04:37:18 2003
+@@ -44,8 +44,8 @@
+ 	ladspa_path_ptr=getenv("LADSPA_PATH");
+ 	
+ 	if (!ladspa_path_ptr)  {
+-		tX_warning("LADSPA_PATH not set. Trying /usr/lib/ladspa:/usr/local/lib/ladspa");
+-		strcpy(ladspa_path, "/usr/lib/ladspa:/usr/local/lib/ladspa");
++		tX_warning("LADSPA_PATH not set. Trying %%LOCALBASE%%/lib/ladspa");
++		strcpy(ladspa_path, "%%LOCALBASE%%/lib/ladspa");
+ 	}
+ 	else strcpy(ladspa_path, ladspa_path_ptr);
+ 	

Copied: head/audio/terminatorx/files/patch-src_tX_mastergui.cc (from r314717, head/audio/terminatorx/files/patch-src__tX_mastergui.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_tX_mastergui.cc	Wed Mar 20 08:56:07 2013	(r314718, copy of r314717, head/audio/terminatorx/files/patch-src__tX_mastergui.cc)
@@ -0,0 +1,20 @@
+--- src/tX_mastergui.cc.orig	2011-01-31 06:01:32.000000000 +0900
++++ src/tX_mastergui.cc	2011-03-24 11:38:00.000000000 +0900
+@@ -273,7 +273,7 @@
+ GtkSignalFunc new_tables() {
+ 	GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
+ 		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+-		"Are you sure you want to loose all turntables and events?");
++		"Are you sure you want to lose all turntables and events?");
+ 	
+ 	int res=gtk_dialog_run(GTK_DIALOG(dialog));
+ 	gtk_widget_destroy(dialog);
+@@ -894,7 +894,7 @@
+ 	if (globals.quit_confirm) {
+ 		GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
+ 		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+-		"Exit terminatorX and loose all unsaved data?");
++		"Exit terminatorX and lose all unsaved data?");
+ 		
+ 		int res=gtk_dialog_run(GTK_DIALOG(dialog));
+ 		gtk_widget_destroy(dialog);

Copied: head/audio/terminatorx/files/patch-src_tX_mouse.cc (from r314717, head/audio/terminatorx/files/patch-src__tX_mouse.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_tX_mouse.cc	Wed Mar 20 08:56:07 2013	(r314718, copy of r314717, head/audio/terminatorx/files/patch-src__tX_mouse.cc)
@@ -0,0 +1,12 @@
+--- src/tX_mouse.cc.orig	2011-01-31 06:01:32.000000000 +0900
++++ src/tX_mouse.cc	2011-04-02 11:56:20.000000000 +0900
+@@ -47,7 +47,8 @@
+ #include "tX_global.h"
+ #include "tX_engine.h"
+ #include "tX_vtt.h"
+-#include <stdlib.h>
++#include <cstdlib>
++#include <cmath>
+ 
+ #define TX_MOUSE_SPEED_NORMAL 0.05
+ #define TX_MOUSE_SPEED_WARP 250000

Copied: head/audio/terminatorx/files/patch-src_tX_mouse.h (from r314717, head/audio/terminatorx/files/patch-src__tX_mouse.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/terminatorx/files/patch-src_tX_mouse.h	Wed Mar 20 08:56:07 2013	(r314718, copy of r314717, head/audio/terminatorx/files/patch-src__tX_mouse.h)
@@ -0,0 +1,11 @@
+--- src/tX_mouse.h.orig	2011-01-31 06:01:32.000000000 +0900
++++ src/tX_mouse.h	2011-03-18 02:55:38.000000000 +0900
+@@ -34,7 +34,7 @@
+ #include <X11/extensions/XInput.h>
+ #include <X11/keysym.h>
+ #include <glib.h>
+-#include <gdk/gdk.h>
++#include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ 
+ /* Use old gdk keys if the new ones are not yet defined */

More information about the svn-ports-all mailing list