On Tue, 6 Mar 2012 18:27:35 +0100, Jan Stary wrote:
> On Mar 06 11:21:07, Brad Smith wrote:
> > On 06/03/12 11:09 AM, Jan Stary wrote:
> > >On Mar 05 17:22:57, Jan Stary wrote:
> > >>On Mar 05 16:46:25, Jan Stary wrote:
> > >>>Attached is a port of audio/sox, bringing it to 14.4.0.
> > >>>Tested on i386 and amd.
> > >>
> > >>Better now, courtesy of port-lib-depends-check.
> > >
> > >Another few polished bits.
> > >
> > >Comments? OK?
> > >
> > > Jan
> >
> > For the most part do not send tarballs for updates.. send the diff,
> > preferably
> > inline.
>
Some comments inline.
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvsync/openbsd/ports/audio/sox/Makefile,v
> retrieving revision 1.49
> diff -u -p -r1.49 Makefile
> --- Makefile 15 Jun 2011 08:29:34 -0000 1.49
> +++ Makefile 6 Mar 2012 17:26:16 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation
>
> -DISTNAME= sox-14.3.2
> +DISTNAME= sox-14.4.0
> SHARED_LIBS += sox 2.0 # .1.0
>
> CATEGORIES= audio
> @@ -15,54 +15,61 @@ PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
>
> -MODULES= converters/libiconv
> -
This is definitely wrong. Keep the libiconv module and delete iconv
from WANTLIB.
> -WANTLIB += c m ogg sndio z
> -WANTLIB += vorbis vorbisenc vorbisfile FLAC magic
> -WANTLIB += mad id3tag mp3lame wavpack png gsm
> +WANTLIB += c m z sndio
> +WANTLIB += vorbis vorbisenc vorbisfile ogg FLAC
> +WANTLIB += mad id3tag mp3lame twolame wavpack gsm
> +WANTLIB += iconv magic png
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/}
>
> -# see CONFIGURE_ARGS below
> -LIB_DEPENDS= audio/libvorbis \
> - audio/flac \
> - devel/libmagic \
> - audio/libmad \
> - audio/libid3tag \
> - audio/lame \
> - audio/wavpack \
> - graphics/png \
> - audio/gsm
> +LIB_DEPENDS= audio/libvorbis \
> + audio/libogg \
> + audio/libmad \
> + audio/libid3tag \
> + audio/lame \
> + audio/flac \
> + audio/wavpack \
> + audio/gsm \
> + audio/twolame \
> + converters/libiconv \
> + devel/libmagic \
> + graphics/png
You probably shouldn't do spurious whitespace changes here, it makes the
diff hard to read. Also, delete libiconv here (see above). You should
also keep the order so we can see exactly which dependencies you're
adding/removing.
> USE_GROFF= Yes
> USE_LIBTOOL= Yes
> CONFIGURE_STYLE=gnu
> -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
> - --disable-silent-libtool
> -
> -# Don't use modules
> -CONFIGURE_ARGS+=--without-libltdl
> +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
> + --datarootdir=${LOCALBASE} \
> + --disable-silent-libtool \
> + --without-libltdl
>
> # Sound drivers
> -CONFIGURE_ARGS+=--without-ao \
> - --without-oss \
> - --with-sndio \
> - --without-sunaudio
> +CONFIGURE_ARGS+=--without-ao \
> + --without-oss \
> + --without-alsa \
> + --without-coreaudio \
> + --without-pulseaudio \
> + --without-waveaudio \
> + --without-sunaudio \
> + --with-sndio
>
> # Additional file formats
> -CONFIGURE_ARGS+=--without-sndfile \
> - --with-oggvorbis \
> - --with-flac \
> - --without-ffmpeg \
> - --with-magic \
> - --with-mad \
> - --with-id3tag \
> - --with-lame \
> - --without-amrwb \
> - --without-amrnb \
> - --with-wavpack \
> - --with-png \
> - --without-ladspa
> +CONFIGURE_ARGS+= \
> + --without-ffmpeg \
> + --without-ladspa \
> + --with-oggvorbis \
> + --with-flac \
> + --with-magic \
> + --with-mad \
> + --with-id3tag \
> + --with-lame \
> + --with-sndfile \
> + --with-twolame \
> + --without-amrwb \
> + --without-amrnb \
> + --with-wavpack \
> + --with-gsm \
> + --with-png
Likewise here. Also, you're adding --with-sndfile, but I see neither
LIB_DEPENDS nor WANTLIB for libsndfile.
>
> CONFIGURE_ENV= \
> CPPFLAGS="-I${LOCALBASE}/include" \
> Index: distinfo
> ===================================================================
> RCS file: /home/cvsync/openbsd/ports/audio/sox/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 15 Jun 2011 08:29:34 -0000 1.11
> +++ distinfo 5 Mar 2012 11:39:34 -0000
> @@ -1,5 +1,5 @@
> -MD5 (sox-14.3.2.tar.gz) = 6dNc87D4h4WW4LfEn56DAg==
> -RMD160 (sox-14.3.2.tar.gz) = W46GvWSt4tlTSZMxdHTDO0EJAYM=
> -SHA1 (sox-14.3.2.tar.gz) = rUYhFP9HsJQHjxgUi8ninjG0K5I=
> -SHA256 (sox-14.3.2.tar.gz) = BmjMCHw0b3xAhK4pTGdqEd3vtGKXS8P2e+MNeJyFDo8=
> -SIZE (sox-14.3.2.tar.gz) = 1110175
> +MD5 (sox-14.4.0.tar.gz) = sMFc/3pLoOwX/cdOah+c8Q==
> +RMD160 (sox-14.4.0.tar.gz) = rxtsAtKcmI+bDf7Jyp67MJSbBmM=
> +SHA1 (sox-14.4.0.tar.gz) = 2AnKs4LHqdAVSRxpBRqdHBoaRPE=
> +SHA256 (sox-14.4.0.tar.gz) = PuNLFN0mfeN46KEXqugexMrjMHcjQualW79lIKCoiqM=
> +SIZE (sox-14.4.0.tar.gz) = 1105756
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/cvsync/openbsd/ports/audio/sox/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST
> --- pkg/PLIST 8 Jan 2009 19:48:21 -0000 1.6
> +++ pkg/PLIST 5 Mar 2012 15:32:18 -0000
> @@ -8,7 +8,6 @@ bin/rec
> @bin bin/sox
> bin/soxi
> include/sox.h
> -include/soxstdint.h
> lib/libsox.a
> lib/libsox.la
> lib/pkgconfig/
>
>
