- Remove audio/mBox and merge changes in to audio/mbox since

 these ports are duplicate with same maintainer as audio/mBox

7 files changed, 28 insertions, 128 deletions

diff --git a/audio/Makefile b/audio/Makefile
index ad326bc7a224..fffd5e259e88 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -200,7 +200,6 @@
     SUBDIR += liteamp
     SUBDIR += lopster
     SUBDIR += lplayer
-    SUBDIR += mBox
     SUBDIR += mac
     SUBDIR += mad
     SUBDIR += madplay
diff --git a/audio/mBox/Makefile b/audio/mBox/Makefile
deleted file mode 100644
index 96101b83a6c6..000000000000
--- a/audio/mBox/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	mBox
-# Date created:				01 Sep 2004
-# Whom:					Vladimir Osintsev <oc@nm.ru>
-# $FreeBSD$
-
-PORTNAME=	mBox
-PORTVERSION=	0.4.0
-PORTREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	http://www.mbox.wz.cz/src/
-DISTNAME= 	${PORTNAME:L}-${PORTVERSION}
-
-MAINTAINER=	oc@nm.ru
-COMMENT= 	Program intended to help with organizing your music files
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython \
-		${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
-		${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
-		lame:${PORTSDIR}/audio/lame \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		mplayer:${PORTSDIR}/multimedia/mplayer
-LIB_DEPENDS= 	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
-
-USE_X_PREFIX= 	yes
-USE_PYTHON= 	2.2+
-USE_BZIP2=	yes
-PYTHON_SETUP= 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-WRKSRC= 	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD= 	yes
-
-do-install:
-	(cd ${WRKSRC} && ${PYTHON_SETUP} install --prefix=${PREFIX})
-
-.include <bsd.port.mk>
diff --git a/audio/mBox/distinfo b/audio/mBox/distinfo
deleted file mode 100644
index ec77739dacc0..000000000000
--- a/audio/mBox/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mbox-0.4.0.tar.bz2) = 2a60bfcba3da5df944241a42d5f79f3b
-SIZE (mbox-0.4.0.tar.bz2) = 72921
diff --git a/audio/mBox/pkg-descr b/audio/mBox/pkg-descr
deleted file mode 100644
index 7db184df162e..000000000000
--- a/audio/mBox/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Readme for mBox
-mBox is program intended to help you with organizing your music files.
-
-The most important features are:
-- Ability to reencode mp3/ogg/wma to mp3/ogg
-- contains utility 'convertor' which converts whole directories to desired
-  format. Bitrate, etc. is automatically adjusted depending on settings and
-  source audio. See users-guide for further information.
-- supports reading/writing tags in MP3 ID3v1 and ID3v2, Ogg Vorbis
-- supports reading WMA tags
-- supports FreeDB, treates encoded files as if it was CD, so you can simply
-  select your files and - if found in database - write tags to them.  
-- supports auto tagging - reads tag information from filename
-- supports batch tags editing
-- supports batch files renaming (can use tags)
-- supports directory renaming (can use tags)
-
-WWW: http://www.mbox.wz.cz
diff --git a/audio/mBox/pkg-plist b/audio/mBox/pkg-plist
deleted file mode 100644
index 9bc2338b7293..000000000000
--- a/audio/mBox/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-bin/mbox
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/AllTag.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/AllTag.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/ID3.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/ID3.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/ID3V2.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/ID3V2.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/LookUp.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/LookUp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/PlayListGen.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/PlayListGen.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/PyCDDB.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/PyCDDB.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/RenameDirTool.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/RenameDirTool.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/VersionChecker.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/VersionChecker.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/Wizard.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/Wizard.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/batchconvertor.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/batchconvertor.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/convert.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/convert.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/images.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/images.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/mp3.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/mp3.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/oggiface.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/oggiface.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treateall.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treateall.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treatempeg.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treatempeg.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treateogg.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treateogg.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treatewma.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/treatewma.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/version.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/version.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/wma.py
-lib/%%PYTHON_VERSION%%/site-packages/mBoxModules/wma.pyc
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mBoxModules
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index c77cf391cbc2..f844c2d21848 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -1,28 +1,27 @@
-# New ports collection makefile for:	mbox
-# Date created:		2004-11-05
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# New ports collection makefile for:	mBox
+# Date created:				01 Sep 2004
+# Whom:					Vladimir Osintsev <oc@nm.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	mbox
 PORTVERSION=	0.5.2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mbox.wz.cz/src/
 
-MAINTAINER=	ahze@FreeBSD.org
-COMMENT=	WxGTK GUI for audio organizing and converting
+MAINTAINER=	oc@nm.ru
+COMMENT=	Program intended to help with organizing your music files
 
-BUILD_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame
-RUN_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython \
+		${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
+		${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
+		lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		img2png:${PORTSDIR}/x11-toolkits/py-wxPython
+		mplayer:${PORTSDIR}/multimedia/mplayer
+LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 
-USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+USE_BZIP2=	yes
+WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/mbox/pkg-descr b/audio/mbox/pkg-descr
index d969788faa26..7db184df162e 100644
--- a/audio/mbox/pkg-descr
+++ b/audio/mbox/pkg-descr
@@ -1,18 +1,18 @@
-mBox is program intended to help you with organizing your music files. 
+Readme for mBox
+mBox is program intended to help you with organizing your music files.
 
 The most important features are:
+- Ability to reencode mp3/ogg/wma to mp3/ogg
+- contains utility 'convertor' which converts whole directories to desired
+  format. Bitrate, etc. is automatically adjusted depending on settings and
+  source audio. See users-guide for further information.
+- supports reading/writing tags in MP3 ID3v1 and ID3v2, Ogg Vorbis
+- supports reading WMA tags
+- supports FreeDB, treates encoded files as if it was CD, so you can simply
+  select your files and - if found in database - write tags to them.  
+- supports auto tagging - reads tag information from filename
+- supports batch tags editing
+- supports batch files renaming (can use tags)
+- supports directory renaming (can use tags)
 
-- ability to reencode mp3/ogg/wma to mp3/ogg
-- contains utility 'convertor' which converts whole directories to desired 
-  format. Bitrate, etc. is automatically adjusted depending on settings 
-  and source audio.
-- reading/writing tags in MP3 ID3v1 and ID3v2, Ogg Vorbis
-- reading WMA tags
-- FreeDB, treates encoded files as if it was CD, so you can simply
- select your files and - if found in database - write tags to them.
-- auto tagging - reads tag information from filename
-- batch tags editing
-- batch files renaming (can use tags)
-- directory renaming (can use tags)
-
-WWW:	http://www.mbox.wz.cz/
+WWW: http://www.mbox.wz.cz