ports/55897: Update port: audio/terminatorx to 3.81
KATO Tsuguru
tkato at prontomail.com
Sat Aug 23 18:40:16 UTC 2003
>Number: 55897
>Category: ports
>Synopsis: Update port: audio/terminatorx to 3.81
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 23 11:40:09 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 3.81
New file:
files/patch-src::main.cc
files/patch-src::tX_ladspa.cc
Remove file:
files/patch-tX_widget.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/terminatorx/Makefile audio/terminatorx/Makefile
--- /usr/ports/audio/terminatorx/Makefile Sat May 10 13:19:46 2003
+++ audio/terminatorx/Makefile Sat Aug 23 04:53:31 2003
@@ -5,8 +5,7 @@
# $FreeBSD: ports/audio/terminatorx/Makefile,v 1.10 2003/05/09 23:37:39 arved Exp $
PORTNAME= terminatorx
-PORTVERSION= 3.80
-PORTREVISION= 1
+PORTVERSION= 3.81
CATEGORIES= audio
MASTER_SITES= http://www.terminatorx.cx/dist/
DISTNAME= terminatorX-${PORTVERSION}
@@ -21,14 +20,13 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomehier libxml2 gtk20
-USE_REINPLACE= yes
+USE_GNOME= gnomehack gnomehier gnometarget gtk20 libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-docdir="${PREFIX}/share/gnome"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --disable-alsa --disable-jack \
+ --with-docdir="${PREFIX}/share/gnome"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
@@ -77,10 +75,12 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e \
- 's|function option_info|option_info|g' ${WRKSRC}/configure
@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|g'
+ @${GREP} -lR "%%LOCALBASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|%%LOCALBASE%%|${LOCALBASE}|g'
+ @${GREP} -lR "%%X11BASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|%%X11BASE%%|${LOCALBASE}|g'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/terminatorX ${PREFIX}/bin
diff -urN /usr/ports/audio/terminatorx/distinfo audio/terminatorx/distinfo
--- /usr/ports/audio/terminatorx/distinfo Sun Apr 27 11:33:35 2003
+++ audio/terminatorx/distinfo Sat Aug 23 04:05:08 2003
@@ -1 +1 @@
-MD5 (terminatorX-3.80.tar.bz2) = 542dfbcec3504ff61aa59dda924f1f24
+MD5 (terminatorX-3.81.tar.bz2) = ff5c61718b9047b1931178736844c0f9
diff -urN /usr/ports/audio/terminatorx/files/patch-src::main.cc audio/terminatorx/files/patch-src::main.cc
--- /usr/ports/audio/terminatorx/files/patch-src::main.cc Thu Jan 1 09:00:00 1970
+++ audio/terminatorx/files/patch-src::main.cc Sat Aug 23 04:52:21 2003
@@ -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 "%%X11BASE%%/share/themes/terminatorX/gtk/gtkrc"
+
+ #define BENCH_CYCLES 100000
+
diff -urN /usr/ports/audio/terminatorx/files/patch-src::tX_global.c audio/terminatorx/files/patch-src::tX_global.c
--- /usr/ports/audio/terminatorx/files/patch-src::tX_global.c Sun Apr 27 07:30:59 2003
+++ audio/terminatorx/files/patch-src::tX_global.c Sat Aug 23 04:55:01 2003
@@ -1,34 +1,11 @@
---- src/tX_global.c.orig Thu Apr 17 04:45:56 2003
-+++ src/tX_global.c Thu Apr 24 21:21:59 2003
-@@ -230,7 +230,7 @@
- char indent[]="\t";
- FILE *rc=NULL;
- gzFile rz=NULL;
-- _store_compress_xml=0;
-+ int _store_compress_xml=0;
- char tmp_xml_buffer[4096];
-
- get_rc_name(rc_name);
-@@ -314,7 +314,7 @@
- }
-
- char *encode_xml(char *dest, const char *src) {
-- int i, t, max;
-+ int i, t, max, inlen, outlen, res;
- char tmp[4096];
-
- tmp[0]=0;
-@@ -333,10 +333,10 @@
- }
- tmp[t]=0;
-
-- int outlen=4096;
-- int inlen=t;
-+ outlen=4096;
-+ inlen=t;
-
-- int res=isolat1ToUTF8((unsigned char *) dest, &outlen, (unsigned char *) tmp, &inlen);
-+ res=isolat1ToUTF8((unsigned char *) dest, &outlen, (unsigned char *) tmp, &inlen);
- dest[outlen]=0;
- if (res<0) {
- tX_error("failed to encode string (%s) to UTF-8.", src);
+--- 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;
diff -urN /usr/ports/audio/terminatorx/files/patch-src::tX_ladspa.cc audio/terminatorx/files/patch-src::tX_ladspa.cc
--- /usr/ports/audio/terminatorx/files/patch-src::tX_ladspa.cc Thu Jan 1 09:00:00 1970
+++ audio/terminatorx/files/patch-src::tX_ladspa.cc Sat Aug 23 04:55:23 2003
@@ -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);
+
diff -urN /usr/ports/audio/terminatorx/files/patch-src::tX_widget.c audio/terminatorx/files/patch-src::tX_widget.c
--- /usr/ports/audio/terminatorx/files/patch-src::tX_widget.c Sun Apr 27 07:30:59 2003
+++ audio/terminatorx/files/patch-src::tX_widget.c Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- src/tX_widget.c.orig Sat Apr 19 13:56:36 2003
-+++ src/tX_widget.c Sat Apr 19 14:13:50 2003
-@@ -154,10 +154,10 @@
- }
-
- static void gtk_tx_destroy(GtkObject * object) {
-+ GtkTx *tx=GTK_TX(object);
-+
- g_return_if_fail(object != NULL);
- g_return_if_fail(GTK_IS_TX(object));
--
-- GtkTx *tx=GTK_TX(object);
-
- if (tx->disp_data) { free(tx->disp_data); tx->disp_data=NULL; }
-
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list