Date: Sat, 27 Apr 2002 23:57:33 +0200 From: Tilman Linneweh <tilman@huckfinn.arved.de> To: sobomax@freebsd.org Cc: gnome@freebsd.org Subject: Updated port audio/glame to 0.6.2 Message-ID: <20020427235733.A26560@huckfinn.arved.de>
next in thread | raw e-mail | index | archive | help
--uZ3hkaAS1mZxFaxD
Content-Type: multipart/mixed; boundary="45Z9DzgjV8m4Oswq"
Content-Disposition: inline
--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi sobomax,
This diff updates audio/glame to 0.6.2
It contains USE_AUTOMAKE and USE_LIBTOOL,
so patch-ltmain.sh is removed
It also contains a knob for building without GNOME.
Please review && commit.
thanks && regards
arved
--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="glame-update.diff"
Content-Transfer-Encoding: quoted-printable
diff -ruN /usr/ports/audio/glame/Makefile glame/Makefile
--- /usr/ports/audio/glame/Makefile Fri Dec 21 08:10:13 2001
+++ glame/Makefile Sat Apr 27 22:57:50 2002
@@ -5,34 +5,48 @@
# $FreeBSD: ports/audio/glame/Makefile,v 1.5 2001/12/21 07:10:13 sobomax E=
xp $
#
=20
-PORTNAME=3D glame
-PORTVERSION=3D 0.5.4
-CATEGORIES=3D audio gnome
-MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
+PORTNAME=3D glame
+PORTVERSION=3D 0.6.2
+CATEGORIES=3D audio gnome
+MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3D ${PORTNAME}
=20
-MAINTAINER=3D sobomax@FreeBSD.org
+MAINTAINER=3D sobomax@FreeBSD.org
=20
-USE_GNOME=3D yes
-USE_X_PREFIX=3D yes
-USE_GMAKE=3D yes
-GNU_CONFIGURE=3D yes
-INSTALLS_SHLIB=3D yes
-CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" \
- LDFLAGS=3D"-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+WANT_GNOME=3D yes
+USE_X_PREFIX=3D yes
+USE_GMAKE=3D yes
+USE_AUTOMAKE=3D yes
+USE_AUTOMAKE_VER=3D 14
+USE_LIBTOOL=3D yes
+INSTALLS_SHLIB=3D yes
+CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" \
+ LDFLAGS=3D"-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
=20
-pre-patch:
+.include <bsd.port.pre.mk>
+
+.if !defined(HAVE_GNOME)
+CONFIGURE_ARGS+=3D --disable-gui --with-gnome=3Dno
+.else
+USE_GNOME=3D yes
+.endif
+
+pre-everything::
+.if !defined(HAVE_GNOME)
+ @${ECHO_MSG} "=3D=3D=3D> Define WITH_GNOME to enable GNOME sup=
port"
+.endif
+
+post-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=3Dlib|DATADIRNAME=3Dshare|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
s|-lpthread|${PTHREAD_LIBS}|g'
+ @${PERL} -pi -e 's|\#include\<values.h\>||g' ${WRKSRC}/src/gui/util/glame=
_gui_utils.c
+ @${PERL} -pi -e 's|\#include\<values.h\>||g' ${WRKSRC}/src/gui/util/glame=
_param.c
=20
post-install:
- @install-info ${PREFIX}/info/glame.info \
- --section=3D"Audio Processing" \
- --entry=3D"* glame: (glame). audio processing tool for GNOME" \
- ${PREFIX}/info/dir
+ -${RM} ${PREFIX}/lib/glame/debug.la ${PREFIX}/lib/glame/tutorial.la ${PRE=
FIX}/lib/glame/normalize.la ${PREFIX}/lib/glame/audio_io_oss.la ${PREFIX}/l=
ib/glame/audio_io_esd.la
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/audio/glame/distinfo glame/distinfo
--- /usr/ports/audio/glame/distinfo Fri Dec 21 08:10:13 2001
+++ glame/distinfo Sat Apr 27 19:24:26 2002
@@ -1 +1 @@
-MD5 (glame-0.5.4.tar.gz) =3D 7c7a05c6d2d342218beee0a9c2d2640e
+MD5 (glame-0.6.2.tar.gz) =3D 92e2376c34716cf0ed5aaf17266dbd2c
diff -ruN /usr/ports/audio/glame/files/patch-ltmain.sh glame/files/patch-lt=
main.sh
--- /usr/ports/audio/glame/files/patch-ltmain.sh Fri Dec 21 08:10:13 2001
+++ glame/files/patch-ltmain.sh Thu Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
-
-$FreeBSD: ports/audio/glame/files/patch-ltmain.sh,v 1.1 2001/12/21 07:10:1=
3 sobomax Exp $
-
---- ltmain.sh.orig Mon Dec 10 12:53:39 2001
-+++ ltmain.sh Thu Dec 20 17:29:14 2001
-@@ -1052,7 +1052,7 @@
- esac
- elif test "X$arg" =3D "X-lc_r"; then
- case $host in
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd[234]*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -2359,6 +2359,9 @@
- # problems, so we reset it completely
- verstring=3D""
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- verstring=3D"0.0"
- ;;
-@@ -4247,10 +4250,12 @@
- fi
-=20
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=3D`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname=3D"$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-=20
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs=3D"$staticlibs $dir/$old_library"
diff -ruN /usr/ports/audio/glame/pkg-plist glame/pkg-plist
--- /usr/ports/audio/glame/pkg-plist Fri Dec 21 08:10:13 2001
+++ glame/pkg-plist Sat Apr 27 23:11:00 2002
@@ -1,96 +1,133 @@
-bin/cglame
-bin/glame
bin/glame-convert.sh
+%%GNOME:%%bin/glame
+bin/cglame
+@unexec install-info --delete %D/info/glame.info %D/info/dir
+@unexec install-info --delete %D/info/glame-dev.info %D/info/dir
+info/glame.info
+info/glame.info-1
+info/glame.info-2
+info/glame.info-3
info/glame-dev.info
info/glame-dev.info-1
info/glame-dev.info-2
info/glame-dev.info-3
-info/glame.info
-info/glame.info-1
-info/glame.info-2
-lib/glame/arithmetic.a
-lib/glame/arithmetic.so
-lib/glame/audio_io_esd.a
-lib/glame/audio_io_esd.so
-lib/glame/audio_io_oss.a
-lib/glame/audio_io_oss.so
-lib/glame/debug.a
+@exec install-info %D/info/glame.info %D/info/dir
+@exec install-info %D/info/glame-dev.info %D/info/dir
lib/glame/debug.so
-lib/glame/distortion.a
-lib/glame/distortion.so
-lib/glame/echo.a
-lib/glame/echo.so
-lib/glame/fader.a
-lib/glame/fader.so
-lib/glame/flanger.a
-lib/glame/flanger.so
-lib/glame/iir.a
-lib/glame/iir.so
-lib/glame/noisegate.a
-lib/glame/noisegate.so
-lib/glame/normalize.a
-lib/glame/normalize.so
-lib/glame/pan.a
-lib/glame/pan.so
-lib/glame/pipe.a
-lib/glame/pipe.so
-lib/glame/ssp.a
-lib/glame/ssp.so
-lib/glame/tutorial.a
+lib/glame/debug.a
lib/glame/tutorial.so
-lib/glame/waveform.a
-lib/glame/waveform.so
-share/gnome/apps/Multimedia/glame.desktop
-share/gnome/glame/default-accels
-share/gnome/glame/pixmaps/bandpass.png
-share/gnome/glame/pixmaps/const.png
-share/gnome/glame/pixmaps/default.png
-share/gnome/glame/pixmaps/delay.png
-share/gnome/glame/pixmaps/distortion.png
-share/gnome/glame/pixmaps/dots.png
-share/gnome/glame/pixmaps/drop.png
-share/gnome/glame/pixmaps/dup.png
-share/gnome/glame/pixmaps/echo.png
-share/gnome/glame/pixmaps/equalizer.png
-share/gnome/glame/pixmaps/extend.png
-share/gnome/glame/pixmaps/fade.png
-share/gnome/glame/pixmaps/fft.png
-share/gnome/glame/pixmaps/flanger.png
-share/gnome/glame/pixmaps/glame-logo.jpg
-share/gnome/glame/pixmaps/iir.png
-share/gnome/glame/pixmaps/input.png
-share/gnome/glame/pixmaps/invert.png
-share/gnome/glame/pixmaps/mix1.png
-share/gnome/glame/pixmaps/noisegate.png
-share/gnome/glame/pixmaps/null.png
-share/gnome/glame/pixmaps/one2n.png
-share/gnome/glame/pixmaps/output.png
-share/gnome/glame/pixmaps/pan.png
-share/gnome/glame/pixmaps/ping.png
-share/gnome/glame/pixmaps/pipe.png
-share/gnome/glame/pixmaps/play.png
-share/gnome/glame/pixmaps/prod.png
-share/gnome/glame/pixmaps/pulse.png
-share/gnome/glame/pixmaps/rect.png
-share/gnome/glame/pixmaps/repeat.png
-share/gnome/glame/pixmaps/resample.png
-share/gnome/glame/pixmaps/save.png
-share/gnome/glame/pixmaps/select_all.png
-share/gnome/glame/pixmaps/select_none.png
-share/gnome/glame/pixmaps/sine.png
-share/gnome/glame/pixmaps/statistics.png
-share/gnome/glame/pixmaps/sum.png
-share/gnome/glame/pixmaps/volume_adjust.png
-share/gnome/glame/pixmaps/zoom_in.png
-share/gnome/glame/pixmaps/zoom_out.png
-share/gnome/glame/scripts/bassboost.scm
-share/gnome/glame/scripts/echo2.scm
-share/gnome/glame/scripts/glame.scm
-share/gnome/glame/scripts/read_mp3.scm
-share/gnome/glame/scripts/resample.scm
+lib/glame/tutorial.a
+%%GNOME:%%lib/glame/normalize.so
+%%GNOME:%%lib/glame/normalize.a
+lib/glame/audio_io_oss.so
+lib/glame/audio_io_oss.a
+lib/glame/audio_io_esd.so
+lib/glame/audio_io_esd.a
+%%GNOME:%%share/gnome/glame/scripts/echo2.scm
+%%GNOME:%%share/gnome/glame/scripts/resample.scm
+%%GNOME:%%share/gnome/glame/scripts/bassboost.scm
+%%GNOME:%%share/gnome/glame/scripts/read_mp3.scm
+%%GNOME:%%share/gnome/glame/scripts/glame.scm
+%%GNOME:%%share/gnome/glame/default-accels
+%%GNOME:%%share/gnome/glame/pixmaps/glame-logo.jpg
+%%GNOME:%%share/gnome/glame/pixmaps/default.png
+%%GNOME:%%share/gnome/glame/pixmaps/mix1.png
+%%GNOME:%%share/gnome/glame/pixmaps/drop.png
+%%GNOME:%%share/gnome/glame/pixmaps/dup.png
+%%GNOME:%%share/gnome/glame/pixmaps/null.png
+%%GNOME:%%share/gnome/glame/pixmaps/one2n.png
+%%GNOME:%%share/gnome/glame/pixmaps/input.png
+%%GNOME:%%share/gnome/glame/pixmaps/output.png
+%%GNOME:%%share/gnome/glame/pixmaps/prod.png
+%%GNOME:%%share/gnome/glame/pixmaps/sum.png
+%%GNOME:%%share/gnome/glame/pixmaps/invert.png
+%%GNOME:%%share/gnome/glame/pixmaps/fft.png
+%%GNOME:%%share/gnome/glame/pixmaps/const.png
+%%GNOME:%%share/gnome/glame/pixmaps/rect.png
+%%GNOME:%%share/gnome/glame/pixmaps/sine.png
+%%GNOME:%%share/gnome/glame/pixmaps/delay.png
+%%GNOME:%%share/gnome/glame/pixmaps/extend.png
+%%GNOME:%%share/gnome/glame/pixmaps/repeat.png
+%%GNOME:%%share/gnome/glame/pixmaps/volume_adjust.png
+%%GNOME:%%share/gnome/glame/pixmaps/equalizer.png
+%%GNOME:%%share/gnome/glame/pixmaps/ping.png
+%%GNOME:%%share/gnome/glame/pixmaps/pipe.png
+%%GNOME:%%share/gnome/glame/pixmaps/fade.png
+%%GNOME:%%share/gnome/glame/pixmaps/pulse.png
+%%GNOME:%%share/gnome/glame/pixmaps/statistics.png
+%%GNOME:%%share/gnome/glame/pixmaps/zoom_in.png
+%%GNOME:%%share/gnome/glame/pixmaps/zoom_out.png
+%%GNOME:%%share/gnome/glame/pixmaps/play.png
+%%GNOME:%%share/gnome/glame/pixmaps/save.png
+%%GNOME:%%share/gnome/glame/pixmaps/pan.png
+%%GNOME:%%share/gnome/glame/pixmaps/bandpass.png
+%%GNOME:%%share/gnome/glame/pixmaps/echo.png
+%%GNOME:%%share/gnome/glame/pixmaps/iir.png
+%%GNOME:%%share/gnome/glame/pixmaps/noisegate.png
+%%GNOME:%%share/gnome/glame/pixmaps/resample.png
+%%GNOME:%%share/gnome/glame/pixmaps/flanger.png
+%%GNOME:%%share/gnome/glame/pixmaps/distortion.png
+%%GNOME:%%share/gnome/glame/pixmaps/select_all.png
+%%GNOME:%%share/gnome/glame/pixmaps/select_none.png
+%%GNOME:%%share/gnome/glame/pixmaps/dots.png
+%%GNOME:%%share/gnome/gnome/apps/Multimedia/glame.desktop
+%%NOGNOME:%%share/glame/scripts/echo2.scm
+%%NOGNOME:%%share/glame/scripts/resample.scm
+%%NOGNOME:%%share/glame/scripts/bassboost.scm
+%%NOGNOME:%%share/glame/scripts/read_mp3.scm
+%%NOGNOME:%%share/glame/scripts/glame.scm
+%%NOGNOME:%%share/glame/default-accels
+%%NOGNOME:%%share/glame/pixmaps/glame-logo.jpg
+%%NOGNOME:%%share/glame/pixmaps/default.png
+%%NOGNOME:%%share/glame/pixmaps/mix1.png
+%%NOGNOME:%%share/glame/pixmaps/drop.png
+%%NOGNOME:%%share/glame/pixmaps/dup.png
+%%NOGNOME:%%share/glame/pixmaps/null.png
+%%NOGNOME:%%share/glame/pixmaps/one2n.png
+%%NOGNOME:%%share/glame/pixmaps/input.png
+%%NOGNOME:%%share/glame/pixmaps/output.png
+%%NOGNOME:%%share/glame/pixmaps/prod.png
+%%NOGNOME:%%share/glame/pixmaps/sum.png
+%%NOGNOME:%%share/glame/pixmaps/invert.png
+%%NOGNOME:%%share/glame/pixmaps/fft.png
+%%NOGNOME:%%share/glame/pixmaps/const.png
+%%NOGNOME:%%share/glame/pixmaps/rect.png
+%%NOGNOME:%%share/glame/pixmaps/sine.png
+%%NOGNOME:%%share/glame/pixmaps/delay.png
+%%NOGNOME:%%share/glame/pixmaps/extend.png
+%%NOGNOME:%%share/glame/pixmaps/repeat.png
+%%NOGNOME:%%share/glame/pixmaps/volume_adjust.png
+%%NOGNOME:%%share/glame/pixmaps/equalizer.png
+%%NOGNOME:%%share/glame/pixmaps/ping.png
+%%NOGNOME:%%share/glame/pixmaps/pipe.png
+%%NOGNOME:%%share/glame/pixmaps/fade.png
+%%NOGNOME:%%share/glame/pixmaps/pulse.png
+%%NOGNOME:%%share/glame/pixmaps/statistics.png
+%%NOGNOME:%%share/glame/pixmaps/zoom_in.png
+%%NOGNOME:%%share/glame/pixmaps/zoom_out.png
+%%NOGNOME:%%share/glame/pixmaps/play.png
+%%NOGNOME:%%share/glame/pixmaps/save.png
+%%NOGNOME:%%share/glame/pixmaps/pan.png
+%%NOGNOME:%%share/glame/pixmaps/bandpass.png
+%%NOGNOME:%%share/glame/pixmaps/echo.png
+%%NOGNOME:%%share/glame/pixmaps/iir.png
+%%NOGNOME:%%share/glame/pixmaps/noisegate.png
+%%NOGNOME:%%share/glame/pixmaps/resample.png
+%%NOGNOME:%%share/glame/pixmaps/flanger.png
+%%NOGNOME:%%share/glame/pixmaps/distortion.png
+%%NOGNOME:%%share/glame/pixmaps/select_all.png
+%%NOGNOME:%%share/glame/pixmaps/select_none.png
+%%NOGNOME:%%share/glame/pixmaps/dots.png
share/locale/de/LC_MESSAGES/glame.mo
share/locale/fr/LC_MESSAGES/glame.mo
-@dirrm share/gnome/glame/scripts
-@dirrm share/gnome/glame/pixmaps
-@dirrm share/gnome/glame
+%%NOGNOME:%%@dirrm share/glame/pixmaps
+%%NOGNOME:%%@dirrm share/glame/scripts
+%%NOGNOME:%%@dirrm share/glame
+%%GNOME:%%@dirrm share/gnome/glame/pixmaps
+%%GNOME:%%@dirrm share/gnome/glame/scripts
+%%GNOME:%%@dirrm share/gnome/glame
+%%GNOME:%%@dirrm share/gnome/gnome/apps/Multimedia
+%%GNOME:%%@dirrm share/gnome/gnome/apps
+%%GNOME:%%@dirrm share/gnome/gnome
+%%GNOME:%%@dirrm share/gnome
@dirrm lib/glame
--45Z9DzgjV8m4Oswq--
--uZ3hkaAS1mZxFaxD
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: Weitere Infos: siehe http://www.gnupg.org
iD8DBQE8yx7MEH3do0kMxDoRAsM4AJ4qvayWs0UtGCqTYg/B1IMu+66MKACeIfJE
bFtVkfIYySOV1cjemX2WAU4=
=7RY2
-----END PGP SIGNATURE-----
--uZ3hkaAS1mZxFaxD--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020427235733.A26560>