diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile index e9f6a6c22a2e..8e48955d6be6 100644 --- a/audio/terminatorx/Makefile +++ b/audio/terminatorx/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= terminatorx -PORTVERSION= 3.81 -PORTREVISION= 6 +PORTVERSION= 3.82 CATEGORIES= audio MASTER_SITES= http://www.terminatorx.cx/dist/ DISTNAME= terminatorX-${PORTVERSION} @@ -21,19 +20,19 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ jack.0:${PORTSDIR}/audio/jack USE_BZIP2= yes -USE_REINPLACE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomehier gnometarget gtk20 libxml2 +USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2 +USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --disable-alsa \ - --with-docdir="${PREFIX}/share/gnome" + --disable-alsamidi MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" -MAN1= terminatorX.1 +MAN1= terminatorX.1 .if !defined(WITHOUT_MPG123) BUILD_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123 @@ -96,9 +95,17 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \ ${PREFIX}/share/gnome/mime-info .endfor -.for file in terminatorX.desktop - ${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \ + ${INSTALL_DATA} ${WRKSRC}/gnome-support/terminatorX.desktop \ ${PREFIX}/share/gnome/apps/Multimedia -.endfor + @${MKDIR} ${PREFIX}/share/gnome/help/terminatorX/C + ${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/terminatorX-manual.xml \ + ${PREFIX}/share/gnome/help/terminatorX/C/terminatorX.xml + @${MKDIR} ${PREFIX}/share/gnome/help/terminatorX/C/figures + ${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/figures/signalflow.png \ + ${PREFIX}/share/gnome/help/terminatorX/C/figures + @${MKDIR} ${PREFIX}/share/gnome/omf/terminatorX + ${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/terminatorX-manual-C.omf \ + ${PREFIX}/share/gnome/omf/terminatorX/terminatorX-C.omf + @scrollkeeper-install -q ${PREFIX}/share/gnome/omf/terminatorX/terminatorX-C.omf 2>/dev/null || ${TRUE} .include diff --git a/audio/terminatorx/distinfo b/audio/terminatorx/distinfo index 5b4b82b14b2e..fddf28b24452 100644 --- a/audio/terminatorx/distinfo +++ b/audio/terminatorx/distinfo @@ -1,2 +1,2 @@ -MD5 (terminatorX-3.81.tar.bz2) = ff5c61718b9047b1931178736844c0f9 -SIZE (terminatorX-3.81.tar.bz2) = 425688 +MD5 (terminatorX-3.82.tar.bz2) = 72f17e3e34581e8090f4f53c1328f641 +SIZE (terminatorX-3.82.tar.bz2) = 395755 diff --git a/audio/terminatorx/files/patch-configure b/audio/terminatorx/files/patch-configure index 49f6f8747390..67c50cb4ee23 100644 --- a/audio/terminatorx/files/patch-configure +++ b/audio/terminatorx/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun May 18 13:52:38 2003 -+++ configure Sun May 18 13:53:02 2003 -@@ -7319,6 +7319,8 @@ +--- configure.orig Wed Nov 3 23:41:09 2004 ++++ configure Thu Nov 4 13:35:03 2004 +@@ -8456,6 +8456,8 @@ echo "${ECHO_T}Found GNOME - installing terminatorX.desktop." >&6 OPTION_GNOME="yes" else @@ -9,3 +9,12 @@ echo "$as_me:$LINENO: result: GNOME not found." >&5 echo "${ECHO_T}GNOME not found." >&6 fi +@@ -8594,7 +8596,7 @@ + + + if test "$prefix" != "NONE"; then +- xml_man="\\\"$datadir/terminatorX/doc/terminatorX-manual/C/terminatorX-manual.xml\\\"" ++ xml_man="\\\"$datadir/help/terminatorX/C/terminatorX.xml\\\"" + else + xml_man="\\\"/usr/local/share/terminatorX/doc/terminatorX-manual/C/terminatorX-manual.xml\\\"" + fi diff --git a/audio/terminatorx/files/patch-src-tX_seqpar.h b/audio/terminatorx/files/patch-src-tX_seqpar.h deleted file mode 100644 index fda81d100c67..000000000000 --- a/audio/terminatorx/files/patch-src-tX_seqpar.h +++ /dev/null @@ -1,15 +0,0 @@ ---- src/tX_seqpar.h.orig Fri Aug 27 13:16:57 2004 -+++ src/tX_seqpar.h Fri Aug 27 13:18:07 2004 -@@ -94,9 +94,9 @@ - static tX_seqpar *get_sp_by_persistence_id(unsigned int pid); - - void record_value (const float value); -- virtual void do_exec(const float value)=NULL; -- virtual void exec_value(const float value)=NULL; -- virtual void do_update_graphics()=NULL; -+ virtual void do_exec(const float value)=0; -+ virtual void exec_value(const float value)=0; -+ virtual void do_update_graphics()=0; - void update_graphics(); - static void update_all_graphics(); - static void init_all_graphics(); diff --git a/audio/terminatorx/files/patch-src-tX_vttfx.h b/audio/terminatorx/files/patch-src-tX_vttfx.h deleted file mode 100644 index e53af686dec6..000000000000 --- a/audio/terminatorx/files/patch-src-tX_vttfx.h +++ /dev/null @@ -1,23 +0,0 @@ ---- src/tX_vttfx.h.orig Fri Aug 27 13:14:20 2004 -+++ src/tX_vttfx.h Fri Aug 27 13:20:34 2004 -@@ -56,15 +56,15 @@ - void set_vtt(void *v) { vtt=v;} - void *get_vtt() { return vtt; } - -- virtual void activate()=NULL; -- virtual void deactivate()=NULL; -- virtual void run()=NULL; -- virtual int isEnabled()=NULL; -+ virtual void activate()=0; -+ virtual void deactivate()=0; -+ virtual void run()=0; -+ virtual int isEnabled()=0; - virtual void reconnect_buffer(); - - virtual const char *get_info_string()=NULL; - -- virtual void save(FILE *rc, gzFile rz, char *indent)=NULL; -+ virtual void save(FILE *rc, gzFile rz, char *indent)=0; - - GtkWidget* get_panel_widget() { return panel_widget; } - void set_panel_widget(GtkWidget *widget) { panel_widget=widget; } diff --git a/audio/terminatorx/pkg-plist b/audio/terminatorx/pkg-plist index 9c562c666746..5f97c7d11e3f 100644 --- a/audio/terminatorx/pkg-plist +++ b/audio/terminatorx/pkg-plist @@ -1,6 +1,15 @@ bin/terminatorX -share/gnome/pixmaps/terminatorX-mime.png -share/gnome/pixmaps/terminatorX-app.png -share/gnome/mime-info/terminatorX.mime -share/gnome/mime-info/terminatorX.keys share/gnome/apps/Multimedia/terminatorX.desktop +share/gnome/help/terminatorX/C/terminatorX.xml +share/gnome/help/terminatorX/C/figures/signalflow.png +share/gnome/mime-info/terminatorX.keys +share/gnome/mime-info/terminatorX.mime +share/gnome/omf/terminatorX/terminatorX-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/terminatorX/terminatorX-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/terminatorX-app.png +share/gnome/pixmaps/terminatorX-mime.png +@dirrm share/gnome/omf/terminatorX +@dirrm share/gnome/help/terminatorX/C/figures +@dirrm share/gnome/help/terminatorX/C +@dirrm share/gnome/help/terminatorX +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/terminatorX/terminatorX-C.omf 2>/dev/null || /usr/bin/true