From 088d4ffa63f118e9587780b82d2cd2fa9e944882 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 19 Nov 2019 21:20:50 +0000 Subject: [PATCH] oops, splitting off a separate py3-only subpackage with mutagen's cli tools didn't go so well, merge them back into the python module package for py3. --- audio/py-mutagen/Makefile | 25 +++++++--------------- audio/py-mutagen/pkg/{DESCR-main => DESCR} | 3 ++- audio/py-mutagen/pkg/DESCR-tools | 10 --------- audio/py-mutagen/pkg/{PLIST-main => PLIST} | 15 +++++++++++-- audio/py-mutagen/pkg/PLIST-tools | 14 ------------ 5 files changed, 23 insertions(+), 44 deletions(-) rename audio/py-mutagen/pkg/{DESCR-main => DESCR} (86%) delete mode 100644 audio/py-mutagen/pkg/DESCR-tools rename audio/py-mutagen/pkg/{PLIST-main => PLIST} (96%) delete mode 100644 audio/py-mutagen/pkg/PLIST-tools diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile index d887e2ef253..c2dcf662a71 100644 --- a/audio/py-mutagen/Makefile +++ b/audio/py-mutagen/Makefile @@ -1,15 +1,11 @@ -# $OpenBSD: Makefile,v 1.28 2019/11/19 12:12:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.29 2019/11/19 21:20:50 sthen Exp $ -COMMENT-main = Python module to handle audio metadata -COMMENT-tools = command-line tools to handle audio metadata +COMMENT = Python module to handle audio metadata MODPY_EGG_VERSION = 1.43.0 +REVISION = 0 DISTNAME = mutagen-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -FULLPKGNAME-main = ${MODPY_PY_PREFIX}${DISTNAME} -FULLPKGPATH-main = audio/py-mutagen,-main${MODPY_FLAVOR} -FULLPKGNAME-tools = ${DISTNAME} -FULLPKGPATH-tools = audio/py-mutagen,-tools PORTROACH = skipv:release-${MODPY_EGG_VERSION} CATEGORIES = audio @@ -25,18 +21,12 @@ PERMIT_PACKAGE = Yes FLAVOR ?= FLAVORS = python3 -MULTI_PACKAGES = -main -.if ${FLAVOR:Mpython3} -MULTI_PACKAGES += -tools -.endif MODULES = lang/python MODPY_SETUPTOOLS = Yes MODPY_ADJ_FILES = docs/id3_frames_gen.py MODPY_PYTEST = Yes -SUBST_VARS = MODPY_FLAVOR - -RUN_DEPENDS-tools = ${FULLPKGPATH-main} +SUBST_VARS = MODPY_FLAVOR MODPY_3ONLY TEST_DEPENDS = audio/faad \ audio/flac \ @@ -44,7 +34,10 @@ TEST_DEPENDS = audio/faad \ devel/py-hypothesis${MODPY_FLAVOR} \ multimedia/oggz -.if ${FLAVOR} != python3 +.if ${FLAVOR:Mpython3} +MODPY_3ONLY = +.else +MODPY_3ONLY = "@comment " TEST_DEPENDS += audio/py-eyed3 \ audio/py-vorbis @@ -52,6 +45,4 @@ post-install: rm ${PREFIX}/bin/* ${PREFIX}/man/man1/* .endif -#MAKE_ENV = LC_CTYPE="en_US.UTF-8" - .include diff --git a/audio/py-mutagen/pkg/DESCR-main b/audio/py-mutagen/pkg/DESCR similarity index 86% rename from audio/py-mutagen/pkg/DESCR-main rename to audio/py-mutagen/pkg/DESCR index 830fa93589a..cbc754c1a29 100644 --- a/audio/py-mutagen/pkg/DESCR-main +++ b/audio/py-mutagen/pkg/DESCR @@ -7,4 +7,5 @@ calculate the bitrate and length of MP3s. ID3 and APEv2 tags can be edited regardless of audio format. It can also manipulate Ogg streams on an individual packet/page level. -This package provides the Mutagen module itself. +The command-line tools are only provided in the Python 3 version +(py3-mutagen). diff --git a/audio/py-mutagen/pkg/DESCR-tools b/audio/py-mutagen/pkg/DESCR-tools deleted file mode 100644 index 45539ba9771..00000000000 --- a/audio/py-mutagen/pkg/DESCR-tools +++ /dev/null @@ -1,10 +0,0 @@ -Mutagen is a Python module to handle audio metadata. -It supports ASF, FLAC, M4A, Monkey's Audio, MP3, Musepack, Ogg FLAC, -Ogg Speex, Ogg Theora, Ogg Vorbis, True Audio, WavPack and OptimFROG -audio files. All versions of ID3v2 are supported, and all standard -ID3v2.4 frames are parsed. It can read Xing headers to accurately -calculate the bitrate and length of MP3s. ID3 and APEv2 tags can be -edited regardless of audio format. It can also manipulate Ogg streams -on an individual packet/page level. - -This package provides command-line tools using the Mutagen module. diff --git a/audio/py-mutagen/pkg/PLIST-main b/audio/py-mutagen/pkg/PLIST similarity index 96% rename from audio/py-mutagen/pkg/PLIST-main rename to audio/py-mutagen/pkg/PLIST index 325cdd02fc7..b3755fd0a9c 100644 --- a/audio/py-mutagen/pkg/PLIST-main +++ b/audio/py-mutagen/pkg/PLIST @@ -1,5 +1,10 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2019/11/19 12:12:00 sthen Exp $ -@pkgpath audio/py-mutagen${MODPY_FLAVOR} +@comment $OpenBSD: PLIST,v 1.11 2019/11/19 21:20:50 sthen Exp $ +${MODPY_3ONLY}bin/mid3cp +${MODPY_3ONLY}bin/mid3iconv +${MODPY_3ONLY}bin/mid3v2 +${MODPY_3ONLY}bin/moggsplit +${MODPY_3ONLY}bin/mutagen-inspect +${MODPY_3ONLY}bin/mutagen-pony lib/python${MODPY_VERSION}/site-packages/mutagen/ lib/python${MODPY_VERSION}/site-packages/mutagen-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/mutagen-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -148,3 +153,9 @@ lib/python${MODPY_VERSION}/site-packages/mutagen/smf.py lib/python${MODPY_VERSION}/site-packages/mutagen/tak.py lib/python${MODPY_VERSION}/site-packages/mutagen/trueaudio.py lib/python${MODPY_VERSION}/site-packages/mutagen/wavpack.py +${MODPY_3ONLY}@man man/man1/mid3cp.1 +${MODPY_3ONLY}@man man/man1/mid3iconv.1 +${MODPY_3ONLY}@man man/man1/mid3v2.1 +${MODPY_3ONLY}@man man/man1/moggsplit.1 +${MODPY_3ONLY}@man man/man1/mutagen-inspect.1 +${MODPY_3ONLY}@man man/man1/mutagen-pony.1 diff --git a/audio/py-mutagen/pkg/PLIST-tools b/audio/py-mutagen/pkg/PLIST-tools deleted file mode 100644 index 8b6957371fd..00000000000 --- a/audio/py-mutagen/pkg/PLIST-tools +++ /dev/null @@ -1,14 +0,0 @@ -@comment $OpenBSD: PLIST-tools,v 1.1 2019/11/19 12:12:00 sthen Exp $ -@conflict py-mutagen-<1.43.0 -bin/mid3cp -bin/mid3iconv -bin/mid3v2 -bin/moggsplit -bin/mutagen-inspect -bin/mutagen-pony -@man man/man1/mid3cp.1 -@man man/man1/mid3iconv.1 -@man man/man1/mid3v2.1 -@man man/man1/moggsplit.1 -@man man/man1/mutagen-inspect.1 -@man man/man1/mutagen-pony.1