From 77ca6d59fbc2861212a2ac170f5b83ed5a472f34 Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 25 Jan 2020 18:16:18 +0000
Subject: [PATCH] Move audio/py-mpd2 to audio/py-python-mpd2

- Remove no-op DOCSDIR and EXAMPLESDIR: they are overwritten by USE_PYTHON=concurrent
- Take maintainership
---
 audio/Makefile                             |  2 +-
 audio/py-mpd2/pkg-descr                    |  4 ---
 audio/{py-mpd2 => py-python-mpd2}/Makefile | 30 +++++++++-------------
 audio/{py-mpd2 => py-python-mpd2}/distinfo |  0
 audio/py-python-mpd2/pkg-descr             |  4 +++
 audio/py-python-mpd2/pkg-plist             | 21 +++++++++++++++
 6 files changed, 38 insertions(+), 23 deletions(-)
 delete mode 100644 audio/py-mpd2/pkg-descr
 rename audio/{py-mpd2 => py-python-mpd2}/Makefile (51%)
 rename audio/{py-mpd2 => py-python-mpd2}/distinfo (100%)
 create mode 100644 audio/py-python-mpd2/pkg-descr
 create mode 100644 audio/py-python-mpd2/pkg-plist

diff --git a/audio/Makefile b/audio/Makefile
index ea1e958c51ad..2f689f419911 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -659,7 +659,6 @@
     SUBDIR += py-id3
     SUBDIR += py-karaoke
     SUBDIR += py-mpd
-    SUBDIR += py-mpd2
     SUBDIR += py-music21
     SUBDIR += py-musicbrainzngs
     SUBDIR += py-mutagen
@@ -673,6 +672,7 @@
     SUBDIR += py-pyliblo
     SUBDIR += py-pymad
     SUBDIR += py-pysndfile
+    SUBDIR += py-python-mpd2
     SUBDIR += py-shout
     SUBDIR += py-soundcloud
     SUBDIR += py-sounddevice
diff --git a/audio/py-mpd2/pkg-descr b/audio/py-mpd2/pkg-descr
deleted file mode 100644
index 7d771e79628a..000000000000
--- a/audio/py-mpd2/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A fork of the original MPD (Music Player Daemon) client library written
-in pure Python.
-
-WWW: https://github.com/Mic92/python-mpd2
diff --git a/audio/py-mpd2/Makefile b/audio/py-python-mpd2/Makefile
similarity index 51%
rename from audio/py-mpd2/Makefile
rename to audio/py-python-mpd2/Makefile
index fb1319ae4f25..48dfa8c376a6 100644
--- a/audio/py-mpd2/Makefile
+++ b/audio/py-python-mpd2/Makefile
@@ -1,44 +1,38 @@
 # Created by: rene@FreeBSD.org (repocopied from audio/py-mpd)
 # $FreeBSD$
 
-PORTNAME=	mpd2
+PORTNAME=	python-mpd2
+PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.0
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Fork of the Python MPD client library
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Python MPD client library
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Mic92
-GH_PROJECT=	python-${PORTNAME}
-
-USES=		shebangfix python
-SHEBANG_FILES=	examples/*.py doc/*.py
+USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
+
 NO_ARCH=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-PORTDOCS=	*
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
-PORTEXAMPLES=	*
+USE_GITHUB=	yes
+GH_ACCOUNT=	Mic92
+
+SHEBANG_FILES=	doc/*.py examples/*.py
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/topics
-	${INSTALL_DATA} ${WRKSRC}/doc/commands_header.txt ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/*.rst ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/commands_header.txt ${WRKSRC}/doc/*.rst ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/topics/*.rst ${STAGEDIR}${DOCSDIR}/topics/
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/generate_command_reference.py ${STAGEDIR}${DOCSDIR}/
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/examples/summary.txt ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.py ${WRKSRC}/examples/summary.txt ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/audio/py-mpd2/distinfo b/audio/py-python-mpd2/distinfo
similarity index 100%
rename from audio/py-mpd2/distinfo
rename to audio/py-python-mpd2/distinfo
diff --git a/audio/py-python-mpd2/pkg-descr b/audio/py-python-mpd2/pkg-descr
new file mode 100644
index 000000000000..57a44a296c27
--- /dev/null
+++ b/audio/py-python-mpd2/pkg-descr
@@ -0,0 +1,4 @@
+python-mpd2 is a Python library which provides a client interface for the Music
+Player Daemon.
+
+WWW: https://github.com/Mic92/python-mpd2
diff --git a/audio/py-python-mpd2/pkg-plist b/audio/py-python-mpd2/pkg-plist
new file mode 100644
index 000000000000..7b33905d89e6
--- /dev/null
+++ b/audio/py-python-mpd2/pkg-plist
@@ -0,0 +1,21 @@
+%%PORTDOCS%%%%DOCSDIR%%/changes.rst
+%%PORTDOCS%%%%DOCSDIR%%/commands_header.txt
+%%PORTDOCS%%%%DOCSDIR%%/generate_command_reference.py
+%%PORTDOCS%%%%DOCSDIR%%/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/topics/advanced.rst
+%%PORTDOCS%%%%DOCSDIR%%/topics/commands.rst
+%%PORTDOCS%%%%DOCSDIR%%/topics/getting-started.rst
+%%PORTDOCS%%%%DOCSDIR%%/topics/logging.rst
+%%PORTDOCS%%%%DOCSDIR%%/topics/porting.rst
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio_example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorhandling.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idle.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locking.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logger.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multitags.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/randomqueue.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stickers.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/summary.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/twisted_example.py