12 files changed, 23 insertions, 59 deletions

diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index 5c85ff9f6647..5af0dfb65992 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -15,15 +15,13 @@ COMMENT=	Python wrapper for audio device abstraction library (libao)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 
-USE_PYTHON=		yes
-NO_STAGE=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyao
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/aomodule.so
-
 do-configure:
 	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} config_unix.py \
 		--prefix "${LOCALBASE}"
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index 171d7ca2e40c..c87fff536d90 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	CDDB-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module to fetch information on audio CDs from CDDB
 
-USE_PYTHON=	yes
-NO_STAGE=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	CDDB
 
 .include <bsd.port.mk>
diff --git a/audio/py-cddb/pkg-plist b/audio/py-cddb/pkg-plist
deleted file mode 100644
index 3cb6aa0a0301..000000000000
--- a/audio/py-cddb/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PYTHON_SITELIBDIR%%/CDDB.py
-%%PYTHON_SITELIBDIR%%/CDDB.pyc
-%%PYTHON_SITELIBDIR%%/CDDB.pyo
-%%PYTHON_SITELIBDIR%%/DiscID.py
-%%PYTHON_SITELIBDIR%%/DiscID.pyc
-%%PYTHON_SITELIBDIR%%/DiscID.pyo
-%%PYTHON_SITELIBDIR%%/cdrom.so
diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile
index 91b7205abb3e..3cdbf2dda7a3 100644
--- a/audio/py-id3/Makefile
+++ b/audio/py-id3/Makefile
@@ -12,10 +12,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module for retrieving and setting ID3 tags on MP3 files
 
 WRKSRC=		${WRKDIR}/id3-py-${PORTVERSION}
-USE_PYTHON=	yes
-NO_STAGE=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	ID3
 
 .include <bsd.port.mk>
diff --git a/audio/py-id3/pkg-plist b/audio/py-id3/pkg-plist
deleted file mode 100644
index 06e2f4cf6610..000000000000
--- a/audio/py-id3/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/ID3.py
-%%PYTHON_SITELIBDIR%%/ID3.pyc
-%%PYTHON_SITELIBDIR%%/ID3.pyo
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index 35dc3dbb4110..96cb00fc95e2 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -14,16 +14,14 @@ COMMENT=	Python module that provides the MPEG Audio Decoder interface
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	mad:${PORTSDIR}/audio/mad
+LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/mad
 
-USE_PYTHON=	yes
-NO_STAGE=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pymad
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/madmodule.so
-
 do-configure:
 	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} config_unix.py \
 		--prefix ${LOCALBASE}
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index 31e9b5f576f5..c4c36b42aaac 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -12,10 +12,11 @@ DISTNAME=	pyogg-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-oriented Python bindings for the ogg library
 
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
 
-USE_PYTHON=		yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyogg
 
 do-configure:
diff --git a/audio/py-ogg/pkg-plist b/audio/py-ogg/pkg-plist
deleted file mode 100644
index e15ffc22d1ad..000000000000
--- a/audio/py-ogg/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PYTHON_INCLUDEDIR%%/pyogg/pyogg.h
-%%PYTHON_SITELIBDIR%%/ogg/__init__.py
-%%PYTHON_SITELIBDIR%%/ogg/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ogg/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ogg/_ogg.so
-@dirrm %%PYTHON_SITELIBDIR%%/ogg
-@dirrm %%PYTHON_INCLUDEDIR%%/pyogg
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 4df43bd16cc2..95297621e2ec 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -14,12 +14,11 @@ COMMENT=	Object-oriented Python bindings for the vorbis library
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/ogg/vorbis.so
-USE_PYTHON=		yes
-NO_STAGE=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyvorbis
 
 post-patch:
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index 5779128c8e87..f69a049ef772 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -13,11 +13,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS Remote Control Library for Python
 
 BUILD_DEPENDS=	${XMMS_CONFIG}:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
-USE_PYTHON=	yes
-NO_STAGE=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pyxmms
 USE_BZIP2=	yes
 USE_GNOME=	glib12
diff --git a/audio/py-xmms/pkg-plist b/audio/py-xmms/pkg-plist
deleted file mode 100644
index cabcd3049282..000000000000
--- a/audio/py-xmms/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-%%PYTHON_SITELIBDIR%%/xmms/__init__.py
-%%PYTHON_SITELIBDIR%%/xmms/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xmms/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xmms/_xmmsconfig.so
-%%PYTHON_SITELIBDIR%%/xmms/_xmmscontrol.so
-%%PYTHON_SITELIBDIR%%/xmms/common.py
-%%PYTHON_SITELIBDIR%%/xmms/common.pyc
-%%PYTHON_SITELIBDIR%%/xmms/common.pyo
-%%PYTHON_SITELIBDIR%%/xmms/config.py
-%%PYTHON_SITELIBDIR%%/xmms/config.pyc
-%%PYTHON_SITELIBDIR%%/xmms/config.pyo
-%%PYTHON_SITELIBDIR%%/xmms/control.py
-%%PYTHON_SITELIBDIR%%/xmms/control.pyc
-%%PYTHON_SITELIBDIR%%/xmms/control.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/xmms
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index 54a9b52224aa..2aa38baaf9ee 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -11,16 +11,16 @@ MASTER_SITES=	http://www.pysol.org/download/pysol/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python extension module to play sounds and background music
 
-LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/pysolsoundserver.so
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_SDL=	mixer sdl
-NO_STAGE=	yes
 USE_BZIP2=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 HAS_CONFIGURE=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 INSTALLS_EGGINFO=	yes
 PYDISTUTILS_PKGNAME=	pysolsoundserver