Attachment 254857 Details for Bug 277754 – examples of why IMPLIES is not good

[patch] examples of why IMPLIES is not good

patch_1.diff (text/plain), 5.82 KB, created by Tatsuki Makino on 2024-11-01 21:42:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2024-11-01 21:42:25 UTC

Size: 5.82 KB

patch

obsolete

>diff --git audio/sox/Makefile audio/sox/Makefile
>index bb3ad65a515..303090a0929 100644
>--- audio/sox/Makefile
>+++ audio/sox/Makefile
>@@ -15,88 +15,94 @@ LICENSE_COMB=	dual
> BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
> LIB_DEPENDS=	libltdl.so:devel/libltdl
> 
>-CONFLICTS=	play
>-
> USES=		autoreconf cpe libtool localbase:ldflags pkgconfig zip
>+USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
>-USE_LDCONFIG=	yes
>-
>+CONFIGURE_ARGS=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
>+		--with-distro="${CONFIGURE_TARGET} ${PKGNAME}" \
>+		--disable-static --without-vo-amrwbenc
>+INSTALL_TARGET=		install-strip
>+CONFLICTS=	play
> WRKSRC=		${WRKDIR}/${DISTNAME}
> 
>-OPTIONS_DEFINE=	AMRNB AMRWB FLAC GSM ID3TAG LADSPA LAME MAD OPUS PNG \
>-		SNDFILE TWOLAME VORBIS WAVPACK
>-OPTIONS_DEFAULT=	AO FLAC GSM ID3TAG LAME MAD OPUS OSS PNG SNDFILE VORBIS
>-OPTIONS_GROUP=	SOUND
>+OPTIONS_DEFINE=	AMR FLAC GSM ID3TAG LADSPA MP3 OPUS PNG \
>+		SNDFILE SYMLINK VORBIS WAVPACK
>+OPTIONS_DEFAULT=	AO FLAC GSM ID3TAG MP3 OPUS OSS PNG \
>+			SNDFILE SYMLINK VORBIS
>+OPTIONS_GROUP=	_MP3 SOUND
> OPTIONS_GROUP_SOUND=	ALSA AO OSS PULSEAUDIO SNDIO
>+OPTIONS_GROUP__MP3=	LAME MAD TWOLAME
>+OPTIONS_SUB=	yes
> 
>-AMRNB_DESC=	AMR Speech Codec (Narrowband)
>-AMRWB_DESC=	AMR Speech Codec (Wideband)
> PNG_DESC=	PNG spectrogram creation
>+SYMLINK_DESC=	Create soxi/play/rec links
>+_MP3_DESC=	${MP3_DESC}
> 
>-CONFIGURE_ARGS=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
>-		--with-distro="${CONFIGURE_TARGET} ${PKGNAME}" \
>-		--disable-stack-protector --disable-static
>-
>-ALSA_CONFIGURE_WITH=	alsa
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
>+ALSA_CONFIGURE_ENABLE=	alsa
> 
>-AO_CONFIGURE_WITH=	ao
>-AO_LIB_DEPENDS=		libao.so:audio/libao
>+AMR_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
>+AMR_CONFIGURE_ENABLE=	amrnb amrwb
>+AMR_CONFIGURE_WITH=	opencore-amrnb opencore-amrwb
> 
>-AMRNB_CONFIGURE_WITH=	amrnb
>-AMRNB_LIB_DEPENDS=	libamrnb.so:audio/libamrnb
>+AO_LIB_DEPENDS=		libao.so:audio/libao
>+AO_CONFIGURE_ENABLE=	ao
> 
>-AMRWB_CONFIGURE_WITH=	amrwb
>-AMRWB_LIB_DEPENDS=	libamrwb.so:audio/libamrwb
>+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
>+FLAC_CONFIGURE_ENABLE=	flac
> 
>-VORBIS_CONFIGURE_WITH=	oggvorbis
>-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
>+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
>+GSM_CONFIGURE_ENABLE=	gsm
>+GSM_CONFIGURE_WITH=	libgsm
> 
>-SNDFILE_CONFIGURE_WITH=	sndfile
>-SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
>+ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
>+ID3TAG_CONFIGURE_WITH=	id3tag
> 
>-LADSPA_CONFIGURE_WITH=	ladspa
>-LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/filter.so:audio/ladspa
> LADSPA_BUILD_DEPENDS=	${LOCALBASE}/lib/ladspa/filter.so:audio/ladspa
>+LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/filter.so:audio/ladspa
>+LADSPA_CONFIGURE_WITH=	ladspa
> 
>-LAME_CONFIGURE_WITH=	lame
>+LAME_IMPLIES=		MP3
> LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
>+LAME_CONFIGURE_WITH=	lame
> 
>-FLAC_CONFIGURE_WITH=	flac
>-FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
>-
>-MAD_CONFIGURE_WITH=	mad
>+MAD_IMPLIES=		MP3
> MAD_LIB_DEPENDS=	libmad.so:audio/libmad
>+MAD_CONFIGURE_WITH=	mad
> 
>-OSS_CONFIGURE_WITH=	oss
>+MP3_CONFIGURE_ENABLE=	mp3
>+
>+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
>+OPUS_CONFIGURE_ENABLE=	opus
>+
>+OSS_CONFIGURE_ENABLE=	oss
> 
>-PNG_CONFIGURE_WITH=	png
> PNG_LIB_DEPENDS=	libpng.so:graphics/png
>+PNG_CONFIGURE_WITH=	png
> 
>-PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
>+PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
> 
>-SNDIO_CONFIGURE_WITH=	sndio
>-SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
>-
>-GSM_CONFIGURE_WITH=	gsm libgsm
>-GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
>+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
>+SNDFILE_CONFIGURE_ENABLE=	sndfile
>+SNDFILE_CONFIGURE_WITH=	libsndfile
> 
>-ID3TAG_CONFIGURE_WITH=	id3tag
>-ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
>+SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
>+SNDIO_CONFIGURE_ENABLE=	sndio
> 
>-WAVPACK_CONFIGURE_WITH=	wavpack
>-WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
>+SYMLINK_CONFIGURE_ENABLE=	symlinks
> 
>-TWOLAME_CONFIGURE_WITH=	twolame
>+TWOLAME_IMPLIES=	MP3
> TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
>+TWOLAME_CONFIGURE_WITH=	twolame
> 
>-OPUS_CONFIGURE_WITH=	opus
>-OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
>+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
>+VORBIS_CONFIGURE_ENABLE=	oggvorbis
> 
>-INSTALL_TARGET=		install-strip
>+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
>+WAVPACK_CONFIGURE_ENABLE=	wavpack
> 
> post-patch:
> 	# rename sox's custom EX/EE macros so they don't get overridden by
>diff --git audio/sox/files/patch-m4_sox.m4 audio/sox/files/patch-m4_sox.m4
>new file mode 100644
>index 00000000000..179d89cba5f
>--- /dev/null
>+++ audio/sox/files/patch-m4_sox.m4
>@@ -0,0 +1,11 @@
>+--- m4/sox.m4.orig	2021-05-09 20:19:07 UTC
>++++ m4/sox.m4
>+@@ -109,7 +109,7 @@ AC_DEFUN([SOX_ARG], [SOX_NAME_TAG([$2], [
>+     m4_pushdef([opts_help], m4_bpatsubst(m4_apply([m4_join], [[/], opts]),
>+         \<optdef\>, m4_toupper(optdef)))
>+     m4_pushdef([opts_sh], m4_apply([m4_join], [[|], opts]))
>+-    m4_indir(AC_ARG_[]ATU, [N], AS_HELP_STRING([--ATL-N], [$3 (opts_help)]))
>++    m4_indir(AC_ARG_[]ATU, N, AS_HELP_STRING([--ATL-N], [$3 (opts_help)]))
>+     HAVE_[]T=${ATL[]_[]L:-optdef}
>+     AS_CASE([$HAVE_[]T],
>+         [no],       [],
>diff --git audio/sox/pkg-plist audio/sox/pkg-plist
>index 0279c1ac5c8..a252c683016 100644
>--- audio/sox/pkg-plist
>+++ audio/sox/pkg-plist
>@@ -1,11 +1,12 @@
>-bin/play
>-bin/rec
>+%%SYMLINK%%bin/play
>+%%SYMLINK%%bin/rec
> bin/sox
>-bin/soxi
>+%%SYMLINK%%bin/soxi
> include/sox.h
> lib/libsox.so
> lib/libsox.so.3
> lib/libsox.so.3.0.0
>+libdata/pkgconfig/sox.pc
> share/man/man1/play.1.gz
> share/man/man1/rec.1.gz
> share/man/man1/sox.1.gz
>@@ -13,4 +14,3 @@ share/man/man1/soxi.1.gz
> share/man/man3/libsox.3.gz
> share/man/man7/soxeffect.7.gz
> share/man/man7/soxformat.7.gz
>-libdata/pkgconfig/sox.pc

Flags:

tatsuki_makino: maintainer-approval-

Actions: View | Diff

Attachments on bug 277754: 249236 | 254857