Date: Fri, 11 Sep 2009 20:20:03 GMT From: Dan Nelson <dnelson@allantgroup.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/138248: audio/sox bump to 14.2.0 Message-ID: <200909112020.n8BKK3De026854@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/138248; it has been noted by GNATS.
From: Dan Nelson <dnelson@allantgroup.com>
To: bug-followup@FreeBSD.ORG
Cc:
Subject: Re: ports/138248: audio/sox bump to 14.2.0
Date: Fri, 11 Sep 2009 14:49:13 -0500
--y0ulUmNC+osPPQO6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Attached is the patch upgrading sox to 14.3.0, tested on 7-STABLE.
--
Dan Nelson
dnelson@allantgroup.com
--y0ulUmNC+osPPQO6
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="sox.diff"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/sox/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile 2 Aug 2009 19:32:25 -0000 1.44
+++ Makefile 9 Sep 2009 17:33:03 -0000
@@ -6,8 +6,7 @@
#
=20
PORTNAME=3D sox
-PORTVERSION=3D 14.2.0
-PORTREVISION=3D 2
+PORTVERSION=3D 14.3.0
CATEGORIES=3D audio
MASTER_SITES=3D SF
=20
@@ -25,6 +24,7 @@
USE_AUTOTOOLS=3D libltdl
USE_GNOME=3D pkgconfig
=20
+# Default LAME to off for packages so we don't end up RESTRICTED
.if defined(PACKAGE_BUILDING)
_LAME=3D off
.else
@@ -37,11 +37,11 @@
FFMPEG "Enable ffmpeg en/decoding" on \
FLAC "Enable flac en/decoding with libflac" on \
GSM "Use libgsm from ports (else use bundled lib)" on \
+ ID3TAG "Enable mp3 tagging with libid3tag" on \
LADSPA "Audio plugin support" off \
LAME "Enable mp3 encoding with LAME" ${_LAME} \
MAD "Enable mp3 decoding with MAD" on \
PNG "Enable PNG spectrogram creation" on \
- SAMPLERATE "Enable libsamplerate" on \
SNDFILE "Enable libsndfile" on \
VORBIS "Enable Ogg Vorbis support" on \
WAVPACK "Enable Wavpack support" off
@@ -52,65 +52,48 @@
LDFLAGS+=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=3D CPPFLAGS=3D"${CPPFLAGS}" LDFLAGS=3D"${LDFLAGS}"
CONFIGURE_ARGS+=3D --with-pkgconfigdir=3D"${PREFIX}/libdata/pkgconfig"
-
-.if !defined(WITH_LAME) && !defined(WITH_MAD)
-PLIST_SUB+=3D PLIST_MP3=3D"@comment "
-.else
-PLIST_SUB+=3D PLIST_MP3=3D""
-.endif
+CONFIGURE_ARGS+=3D --with-distro=3D"${CONFIGURE_TARGET} ${PKGNAME}"
=20
.if defined(WITH_AO)
-CONFIGURE_ARGS+=3D --enable-libao
+CONFIGURE_ARGS+=3D --with-ao
LIB_DEPENDS+=3D ao.3:${PORTSDIR}/audio/libao
-PLIST_SUB+=3D PLIST_AO=3D""
.else
-CONFIGURE_ARGS+=3D --disable-libao
-PLIST_SUB+=3D PLIST_AO=3D"@comment "
+CONFIGURE_ARGS+=3D --without-ao
.endif
=20
.if defined(WITH_AMRNB)
-CONFIGURE_ARGS+=3D --with-amr-nb
+CONFIGURE_ARGS+=3D --with-amrnb
LIB_DEPENDS+=3D amrnb.3:${PORTSDIR}/audio/libamrnb
-PLIST_SUB+=3D PLIST_AMRNB=3D""
.else
-CONFIGURE_ARGS+=3D --without-amr-nb
-PLIST_SUB+=3D PLIST_AMRNB=3D"@comment "
+CONFIGURE_ARGS+=3D --without-amrnb
.endif
=20
.if defined(WITH_AMRWB)
-CONFIGURE_ARGS+=3D --with-amr-wb
+CONFIGURE_ARGS+=3D --with-amrwb
LIB_DEPENDS+=3D amrwb.3:${PORTSDIR}/audio/libamrwb
-PLIST_SUB+=3D PLIST_AMRWB=3D""
.else
-CONFIGURE_ARGS+=3D --without-amr-wb
-PLIST_SUB+=3D PLIST_AMRWB=3D"@comment "
+CONFIGURE_ARGS+=3D --without-amrwb
.endif
=20
.if defined(WITH_FFMPEG)
CONFIGURE_ARGS+=3D --with-ffmpeg
LIB_DEPENDS+=3D avformat:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+=3D PLIST_FFMPEG=3D""
.else
CONFIGURE_ARGS+=3D --without-ffmpeg
-PLIST_SUB+=3D PLIST_FFMPEG=3D"@comment "
.endif
=20
.if defined(WITH_VORBIS)
-CONFIGURE_ARGS+=3D --with-ogg
+CONFIGURE_ARGS+=3D --with-oggvorbis
LIB_DEPENDS+=3D vorbis.4:${PORTSDIR}/audio/libvorbis
-PLIST_SUB+=3D PLIST_VORBIS=3D""
.else
-CONFIGURE_ARGS+=3D --without-ogg
-PLIST_SUB+=3D PLIST_VORBIS=3D"@comment "
+CONFIGURE_ARGS+=3D --without-oggvorbis
.endif
=20
.if defined(WITH_SNDFILE)
CONFIGURE_ARGS+=3D --with-sndfile
LIB_DEPENDS+=3D sndfile.1:${PORTSDIR}/audio/libsndfile
-PLIST_SUB+=3D PLIST_SNDFILE=3D""
.else
CONFIGURE_ARGS+=3D --without-sndfile
-PLIST_SUB+=3D PLIST_SNDFILE=3D"@comment "
.endif
=20
.if defined(WITH_LADSPA)
@@ -131,10 +114,8 @@
.if defined(WITH_FLAC)
CONFIGURE_ARGS+=3D --with-flac
LIB_DEPENDS+=3D FLAC.10:${PORTSDIR}/audio/flac
-PLIST_SUB+=3D PLIST_FLAC=3D""
.else
CONFIGURE_ARGS+=3D --without-flac
-PLIST_SUB+=3D PLIST_FLAC=3D"@comment "
.endif
=20
.if defined(WITH_MAD)
@@ -152,30 +133,27 @@
.endif
=20
.if defined(WITH_GSM)
-CONFIGURE_ARGS+=3D --with-external-gsm
+CONFIGURE_ARGS+=3D --with-gsm
LIB_DEPENDS+=3D gsm.1:${PORTSDIR}/audio/gsm
-PLIST_SUB+=3D PLIST_GSM=3D""
.else
-CONFIGURE_ARGS+=3D --without-external-gsm
-# Above configure flag does not exist, so workaround with the below line
+CONFIGURE_ARGS+=3D --with-gsm
+# We cannot ask for gsm to be enabled without it trying to use external gs=
m,
+# so workaround with the below line
CONFIGURE_ENV+=3D ac_cv_header_gsm_h=3Dno
-PLIST_SUB+=3D PLIST_GSM=3D"@comment "
.endif
=20
-.if defined(WITH_SAMPLERATE)
-CONFIGURE_ARGS+=3D --with-samplerate
-LIB_DEPENDS+=3D samplerate.1:${PORTSDIR}/audio/libsamplerate
+.if defined(WITH_ID3TAG)
+CONFIGURE_ARGS+=3D --with-id3tag
+LIB_DEPENDS+=3D id3-3.8.3:${PORTSDIR}/audio/id3lib
.else
-CONFIGURE_ARGS+=3D --without-samplerate
+CONFIGURE_ARGS+=3D --without-id3tag
.endif
=20
.if defined(WITH_WAVPACK)
CONFIGURE_ARGS+=3D --with-wavpack
LIB_DEPENDS+=3D wavpack.1:${PORTSDIR}/audio/wavpack
-PLIST_SUB+=3D PLIST_WAVPACK=3D""
.else
CONFIGURE_ARGS+=3D --without-wavpack
-PLIST_SUB+=3D PLIST_WAVPACK=3D"@comment "
.endif
=20
# Tell configure that libgsm's headers are in $LOCALDIR/include
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/sox/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo 15 Nov 2008 18:57:46 -0000 1.19
+++ distinfo 28 Aug 2009 16:00:06 -0000
@@ -1,3 +1,3 @@
-MD5 (sox-14.2.0.tar.gz) =3D 7afc0e85d14be014f08e7d3b7ee8c24e
-SHA256 (sox-14.2.0.tar.gz) =3D 8d1b8eb33a72a181369475c9da5fdcbe5f6820e6af3=
d86a0e84f6939e61a9dc1
-SIZE (sox-14.2.0.tar.gz) =3D 964800
+MD5 (sox-14.3.0.tar.gz) =3D 8e3509804e6227273ef84092e1a2fea7
+SHA256 (sox-14.3.0.tar.gz) =3D 9abf411c949366d75c884b368284690b6c8c7d5fb5d=
f0deaf599539b704b2397
+SIZE (sox-14.3.0.tar.gz) =3D 1007679
Index: pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/sox/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- pkg-plist 15 Nov 2008 18:57:46 -0000 1.11
+++ pkg-plist 31 Aug 2009 20:18:47 -0000
@@ -9,191 +9,5 @@
lib/libsox.la
lib/libsox.so
lib/libsox.so.1
-lib/sox/libsox_fmt_aifc.a
-lib/sox/libsox_fmt_aifc.la
-lib/sox/libsox_fmt_aifc.so
-lib/sox/libsox_fmt_aiff.a
-lib/sox/libsox_fmt_aiff.la
-lib/sox/libsox_fmt_aiff.so
-lib/sox/libsox_fmt_al.a
-lib/sox/libsox_fmt_al.la
-lib/sox/libsox_fmt_al.so
-%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.a
-%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.la
-%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.so
-%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.a
-%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.la
-%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.so
-%%PLIST_AO%%lib/sox/libsox_fmt_ao.a
-%%PLIST_AO%%lib/sox/libsox_fmt_ao.la
-%%PLIST_AO%%lib/sox/libsox_fmt_ao.so
-lib/sox/libsox_fmt_au.a
-lib/sox/libsox_fmt_au.la
-lib/sox/libsox_fmt_au.so
-lib/sox/libsox_fmt_avr.a
-lib/sox/libsox_fmt_avr.la
-lib/sox/libsox_fmt_avr.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so
-lib/sox/libsox_fmt_cdr.a
-lib/sox/libsox_fmt_cdr.la
-lib/sox/libsox_fmt_cdr.so
-lib/sox/libsox_fmt_cvsd.a
-lib/sox/libsox_fmt_cvsd.la
-lib/sox/libsox_fmt_cvsd.so
-lib/sox/libsox_fmt_dat.a
-lib/sox/libsox_fmt_dat.la
-lib/sox/libsox_fmt_dat.so
-lib/sox/libsox_fmt_dvms.a
-lib/sox/libsox_fmt_dvms.la
-lib/sox/libsox_fmt_dvms.so
-lib/sox/libsox_fmt_f4.a
-lib/sox/libsox_fmt_f4.la
-lib/sox/libsox_fmt_f4.so
-lib/sox/libsox_fmt_f8.a
-lib/sox/libsox_fmt_f8.la
-lib/sox/libsox_fmt_f8.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so
-%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.a
-%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.la
-%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so
-%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.a
-%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.la
-%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.so
-lib/sox/libsox_fmt_gsm.a
-lib/sox/libsox_fmt_gsm.la
-lib/sox/libsox_fmt_gsm.so
-lib/sox/libsox_fmt_hcom.a
-lib/sox/libsox_fmt_hcom.la
-lib/sox/libsox_fmt_hcom.so
-lib/sox/libsox_fmt_htk.a
-lib/sox/libsox_fmt_htk.la
-lib/sox/libsox_fmt_htk.so
-lib/sox/libsox_fmt_ima.a
-lib/sox/libsox_fmt_ima.la
-lib/sox/libsox_fmt_ima.so
-lib/sox/libsox_fmt_la.a
-lib/sox/libsox_fmt_la.la
-lib/sox/libsox_fmt_la.so
-lib/sox/libsox_fmt_lpc10.a
-lib/sox/libsox_fmt_lpc10.la
-lib/sox/libsox_fmt_lpc10.so
-lib/sox/libsox_fmt_lu.a
-lib/sox/libsox_fmt_lu.la
-lib/sox/libsox_fmt_lu.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so
-lib/sox/libsox_fmt_maud.a
-lib/sox/libsox_fmt_maud.la
-lib/sox/libsox_fmt_maud.so
-%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.a
-%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.la
-%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.so
-lib/sox/libsox_fmt_nul.a
-lib/sox/libsox_fmt_nul.la
-lib/sox/libsox_fmt_nul.so
-lib/sox/libsox_fmt_oss.a
-lib/sox/libsox_fmt_oss.la
-lib/sox/libsox_fmt_oss.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so
-lib/sox/libsox_fmt_prc.a
-lib/sox/libsox_fmt_prc.la
-lib/sox/libsox_fmt_prc.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so
-lib/sox/libsox_fmt_raw.a
-lib/sox/libsox_fmt_raw.la
-lib/sox/libsox_fmt_raw.so
-lib/sox/libsox_fmt_s1.a
-lib/sox/libsox_fmt_s1.la
-lib/sox/libsox_fmt_s1.so
-lib/sox/libsox_fmt_s2.a
-lib/sox/libsox_fmt_s2.la
-lib/sox/libsox_fmt_s2.so
-lib/sox/libsox_fmt_s3.a
-lib/sox/libsox_fmt_s3.la
-lib/sox/libsox_fmt_s3.so
-lib/sox/libsox_fmt_s4.a
-lib/sox/libsox_fmt_s4.la
-lib/sox/libsox_fmt_s4.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so
-lib/sox/libsox_fmt_sf.a
-lib/sox/libsox_fmt_sf.la
-lib/sox/libsox_fmt_sf.so
-lib/sox/libsox_fmt_smp.a
-lib/sox/libsox_fmt_smp.la
-lib/sox/libsox_fmt_smp.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so
-lib/sox/libsox_fmt_sounder.a
-lib/sox/libsox_fmt_sounder.la
-lib/sox/libsox_fmt_sounder.so
-lib/sox/libsox_fmt_soundtool.a
-lib/sox/libsox_fmt_soundtool.la
-lib/sox/libsox_fmt_soundtool.so
-lib/sox/libsox_fmt_sphere.a
-lib/sox/libsox_fmt_sphere.la
-lib/sox/libsox_fmt_sphere.so
-lib/sox/libsox_fmt_svx.a
-lib/sox/libsox_fmt_svx.la
-lib/sox/libsox_fmt_svx.so
-lib/sox/libsox_fmt_txw.a
-lib/sox/libsox_fmt_txw.la
-lib/sox/libsox_fmt_txw.so
-lib/sox/libsox_fmt_u1.a
-lib/sox/libsox_fmt_u1.la
-lib/sox/libsox_fmt_u1.so
-lib/sox/libsox_fmt_u2.a
-lib/sox/libsox_fmt_u2.la
-lib/sox/libsox_fmt_u2.so
-lib/sox/libsox_fmt_u3.a
-lib/sox/libsox_fmt_u3.la
-lib/sox/libsox_fmt_u3.so
-lib/sox/libsox_fmt_u4.a
-lib/sox/libsox_fmt_u4.la
-lib/sox/libsox_fmt_u4.so
-lib/sox/libsox_fmt_ul.a
-lib/sox/libsox_fmt_ul.la
-lib/sox/libsox_fmt_ul.so
-lib/sox/libsox_fmt_voc.a
-lib/sox/libsox_fmt_voc.la
-lib/sox/libsox_fmt_voc.so
-%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.a
-%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.la
-%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.so
-lib/sox/libsox_fmt_vox.a
-lib/sox/libsox_fmt_vox.la
-lib/sox/libsox_fmt_vox.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so
-lib/sox/libsox_fmt_wav.a
-lib/sox/libsox_fmt_wav.la
-lib/sox/libsox_fmt_wav.so
-%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.a
-%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.la
-%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so
-lib/sox/libsox_fmt_wve.a
-lib/sox/libsox_fmt_wve.la
-lib/sox/libsox_fmt_wve.so
-lib/sox/libsox_fmt_xa.a
-lib/sox/libsox_fmt_xa.la
-lib/sox/libsox_fmt_xa.so
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.a
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.la
-%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so
@dirrm lib/sox
libdata/pkgconfig/sox.pc
Index: files/patch-configure
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure 15 Feb 2009 00:08:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig 2009-02-14 19:08:53.000000000 +0100
-+++ configure 2009-02-14 19:09:06.000000000 +0100
-@@ -20805,7 +20805,7 @@
-=20
-=20
-=20
--if test -r /etc/issue; then
-+if false && test -r /etc/issue; then
- { $as_echo "$as_me:$LINENO: checking distro name" >&5
- $as_echo_n "checking distro name... " >&6; }
- DISTRO=3D`sed -e "s/=1B.0-90-9;*mJH//g" < /etc/issue|tr "\n" " " | sed =
-e "s/(\\\\?\\\\\\\\.*//" -e "s/ */ /g" -e "s/^ //" -e "s/ $//"`
Index: files/patch-formats.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: files/patch-formats.c
diff -N files/patch-formats.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-formats.c 11 Sep 2009 19:40:42 -0000
@@ -0,0 +1,16 @@
+Generalize the "rewind on pipes" hack to work with all Torek-based stdio's
+without having to check for each one. Fix will appear in the next release.
+
+http://sourceforge.net/tracker/index.php?func=3Ddetail&aid=3D2847998&group=
_id=3D10706&atid=3D310706
+
+--- src/formats.c 2009-06-14 20:14:53.000000000 -0500
++++ src/formats.c 2009-08-31 13:16:21.440822225 -0500
+@@ -392,7 +392,7 @@
+ * Works by resetting the FILE buffer pointer */
+ static void UNUSED rewind_pipe(FILE * fp)
+ {
+-#if defined _NEWLIB_VERSION || defined __APPLE__
++#if defined _FSTDIO /* Torek stdio (i.e. most BSD-derived libc's) */
+ fp->_p -=3D AUTO_DETECT_SIZE;
+ fp->_r +=3D AUTO_DETECT_SIZE;
+ #elif defined __GLIBC__
--y0ulUmNC+osPPQO6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909112020.n8BKK3De026854>