From 76df383f34b6c09e53c27bac7c62a256373e35e9 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Mon, 10 Jul 2006 21:07:51 +0000 Subject: [PATCH] - Update to version 0.30.3 PR: ports/100027 Submitted by: KATO Tsuguru --- audio/aube/Makefile | 18 ++++-- audio/aube/distinfo | 6 +- audio/aube/files/patch-configure | 62 +++---------------- audio/aube/files/patch-src::Makefile.in | 11 ---- audio/aube/files/patch-src__modules__delay.c | 9 +++ .../files/patch-src__modules__filter_reslp.c | 8 +++ .../files/patch-src__modules__general_mixer.c | 8 +++ .../aube/files/patch-src__modules__klavier.c | 8 +++ .../files/patch-src__modules__minimaube.c | 8 +++ audio/aube/files/patch-src__modules__panner.c | 8 +++ .../aube/files/patch-src__modules__panner4.c | 8 +++ .../patch-src__modules__sample_recorder.c | 8 +++ audio/aube/files/patch-src__modules__xfader.c | 8 +++ audio/aube/pkg-plist | 5 -- 14 files changed, 99 insertions(+), 76 deletions(-) delete mode 100644 audio/aube/files/patch-src::Makefile.in create mode 100644 audio/aube/files/patch-src__modules__delay.c create mode 100644 audio/aube/files/patch-src__modules__filter_reslp.c create mode 100644 audio/aube/files/patch-src__modules__general_mixer.c create mode 100644 audio/aube/files/patch-src__modules__klavier.c create mode 100644 audio/aube/files/patch-src__modules__minimaube.c create mode 100644 audio/aube/files/patch-src__modules__panner.c create mode 100644 audio/aube/files/patch-src__modules__panner4.c create mode 100644 audio/aube/files/patch-src__modules__sample_recorder.c create mode 100644 audio/aube/files/patch-src__modules__xfader.c delete mode 100644 audio/aube/pkg-plist diff --git a/audio/aube/Makefile b/audio/aube/Makefile index 661b69c2b103..d50ad395902c 100644 --- a/audio/aube/Makefile +++ b/audio/aube/Makefile @@ -6,8 +6,7 @@ # PORTNAME= aube -PORTVERSION= 0.30.2 -PORTREVISION= 2 +PORTVERSION= 0.30.3 CATEGORIES= audio gnome MASTER_SITES= http://www.metadecks.org/software/aube/download/ @@ -17,12 +16,23 @@ COMMENT= System for sound generation and processing LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile USE_X_PREFIX= yes +USE_GNOME= imlib USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehier gnomehack gtk12 imlib +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= aube.1 +PLIST_FILES= bin/aube \ + %%DATADIR%%/aube_logo.ppm \ + %%DATADIR%%/aube_mini.png \ + %%DATADIR%%/gtkrc +PLIST_DIRS= %%DATADIR%% + +post-patch: + @${REINPLACE_CMD} -e \ + 's|-lgdk_imlib|@GDK_IMLIB_LIBS@|g' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e \ + 's|-g -O2 -Wall|@CFLAGS@|g' ${WRKSRC}/src/modules/Makefile.in .include diff --git a/audio/aube/distinfo b/audio/aube/distinfo index 2ccb516cedb6..810c3afd33c5 100644 --- a/audio/aube/distinfo +++ b/audio/aube/distinfo @@ -1,3 +1,3 @@ -MD5 (aube-0.30.2.tar.gz) = dffa22ed759d05d2b110f03d09906ccf -SHA256 (aube-0.30.2.tar.gz) = 2436f981e325d71baed86cd3b5e57b961f13d6e732ec0a7e6d585a0741fd14d7 -SIZE (aube-0.30.2.tar.gz) = 206407 +MD5 (aube-0.30.3.tar.gz) = f3244a658f2ffd3bcc4f1f5778b58f3d +SHA256 (aube-0.30.3.tar.gz) = b8d8406b5bdba701aa0f0ece65ceae0f2681251127c258b1775ee11ee4d24b4e +SIZE (aube-0.30.3.tar.gz) = 206516 diff --git a/audio/aube/files/patch-configure b/audio/aube/files/patch-configure index c5be735cf12e..a3896bf5c882 100644 --- a/audio/aube/files/patch-configure +++ b/audio/aube/files/patch-configure @@ -1,68 +1,24 @@ ---- configure.orig Tue Jun 10 00:01:58 2003 -+++ configure Tue Jun 10 00:04:25 2003 -@@ -2250,27 +2250,29 @@ - - #AM_PATH_GENERIC(xml, 0.99.0) - --echo $ac_n "checking for in -l""... $ac_c" 1>&6 --echo "configure:2255: checking for in -l" >&5 --ac_lib_var=`echo '_' | sed 'y%./+-%__p_%'` -+LIBS="" -+echo $ac_n "checking for gdk_imlib_render in -lgdk_imlib""... $ac_c" 1>&6 -+echo "configure:6942: checking for gdk_imlib_render in -lgdk_imlib" >&5 -+ac_lib_var=`echo gdk_imlib'_'gdk_imlib_render | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +--- configure.orig Wed Oct 16 20:42:09 2002 ++++ configure Mon Jun 19 18:54:58 2006 +@@ -2257,7 +2257,8 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" --LIBS="-l $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2285,18 +2287,19 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ ac_tr_lib=HAVE_LIB`echo gdk_imlib | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 +echo "Imlib not found!"; exit 0 fi -- (gdk_imlib, gdk_imlib_init) -+ - echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 - echo "configure:2303: checking for XpmReadFileToXpmImage in -lXpm" >&5 -@@ -2743,6 +2746,7 @@ + +@@ -2743,6 +2745,7 @@ s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g diff --git a/audio/aube/files/patch-src::Makefile.in b/audio/aube/files/patch-src::Makefile.in deleted file mode 100644 index 0957eb40be39..000000000000 --- a/audio/aube/files/patch-src::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Tue Jun 10 00:01:16 2003 -+++ src/Makefile.in Tue Jun 10 00:01:40 2003 -@@ -88,7 +88,7 @@ - INCLUDES = -DDATADIR=\"$(pkgdatadir)\" @GTK_CFLAGS@ @AUDIOFILE_CFLAGS@ - - --aube_LDADD = modules/libmodules.a @AUDIOFILE_LIBS@ @GTK_LIBS@ -lgdk_imlib -+aube_LDADD = modules/libmodules.a @AUDIOFILE_LIBS@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/audio/aube/files/patch-src__modules__delay.c b/audio/aube/files/patch-src__modules__delay.c new file mode 100644 index 000000000000..bd2d99699b88 --- /dev/null +++ b/audio/aube/files/patch-src__modules__delay.c @@ -0,0 +1,9 @@ +--- src/modules/delay.c.orig Thu Mar 25 06:57:44 1999 ++++ src/modules/delay.c Tue Jun 20 02:25:53 2006 +@@ -1,5 +1,6 @@ + + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__filter_reslp.c b/audio/aube/files/patch-src__modules__filter_reslp.c new file mode 100644 index 000000000000..2e2d5168a238 --- /dev/null +++ b/audio/aube/files/patch-src__modules__filter_reslp.c @@ -0,0 +1,8 @@ +--- src/modules/filter_reslp.c.orig Thu Mar 25 06:58:00 1999 ++++ src/modules/filter_reslp.c Tue Jun 20 02:26:52 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__general_mixer.c b/audio/aube/files/patch-src__modules__general_mixer.c new file mode 100644 index 000000000000..7d493cb93ce9 --- /dev/null +++ b/audio/aube/files/patch-src__modules__general_mixer.c @@ -0,0 +1,8 @@ +--- src/modules/general_mixer.c.orig Thu Mar 25 06:58:07 1999 ++++ src/modules/general_mixer.c Tue Jun 20 02:27:38 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__klavier.c b/audio/aube/files/patch-src__modules__klavier.c new file mode 100644 index 000000000000..841b83155ef9 --- /dev/null +++ b/audio/aube/files/patch-src__modules__klavier.c @@ -0,0 +1,8 @@ +--- src/modules/klavier.c.orig Thu Mar 25 06:58:16 1999 ++++ src/modules/klavier.c Tue Jun 20 02:28:26 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__minimaube.c b/audio/aube/files/patch-src__modules__minimaube.c new file mode 100644 index 000000000000..2ae479a5aab3 --- /dev/null +++ b/audio/aube/files/patch-src__modules__minimaube.c @@ -0,0 +1,8 @@ +--- src/modules/minimaube.c.orig Fri Mar 15 21:52:37 2002 ++++ src/modules/minimaube.c Tue Jun 20 02:29:29 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__panner.c b/audio/aube/files/patch-src__modules__panner.c new file mode 100644 index 000000000000..7c9b5357d1cb --- /dev/null +++ b/audio/aube/files/patch-src__modules__panner.c @@ -0,0 +1,8 @@ +--- src/modules/panner.c.orig Thu Mar 25 06:59:53 1999 ++++ src/modules/panner.c Tue Jun 20 02:30:13 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__panner4.c b/audio/aube/files/patch-src__modules__panner4.c new file mode 100644 index 000000000000..3c9ab676609a --- /dev/null +++ b/audio/aube/files/patch-src__modules__panner4.c @@ -0,0 +1,8 @@ +--- src/modules/panner4.c.orig Thu Mar 25 07:00:00 1999 ++++ src/modules/panner4.c Tue Jun 20 02:30:52 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__sample_recorder.c b/audio/aube/files/patch-src__modules__sample_recorder.c new file mode 100644 index 000000000000..3975a7464ed0 --- /dev/null +++ b/audio/aube/files/patch-src__modules__sample_recorder.c @@ -0,0 +1,8 @@ +--- src/modules/sample_recorder.c.orig Fri Mar 15 21:53:23 2002 ++++ src/modules/sample_recorder.c Tue Jun 20 02:31:34 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/files/patch-src__modules__xfader.c b/audio/aube/files/patch-src__modules__xfader.c new file mode 100644 index 000000000000..5be24913a7dd --- /dev/null +++ b/audio/aube/files/patch-src__modules__xfader.c @@ -0,0 +1,8 @@ +--- src/modules/xfader.c.orig Thu Mar 25 07:00:35 1999 ++++ src/modules/xfader.c Tue Jun 20 02:32:30 2006 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include diff --git a/audio/aube/pkg-plist b/audio/aube/pkg-plist deleted file mode 100644 index 637607d14d35..000000000000 --- a/audio/aube/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/aube -share/gnome/aube/aube_logo.ppm -share/gnome/aube/aube_mini.png -share/gnome/aube/gtkrc -@dirrm share/gnome/aube