Index: Makefile
===================================================================
--- Makefile	(wersja 390642)
+++ Makefile	(kopia robocza)
@@ -12,8 +12,8 @@
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen
 
 USE_PYTHON=	distutils autoplist
 USE_GNOME=	pygtk2
@@ -24,69 +24,36 @@
 
 USE_GSTREAMER=	gconf good python
 
-OPTIONS_DEFINE=	FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE EXTENSIONS
+OPTIONS_DEFINE=		FLAC MP3 AAC MUSEPACK OGG SPEEX VORBIS WAVPACK DBUS REMOTE
+OPTIONS_DEFINE_i386=	SPC
+OPTIONS_DEFAULT=	FLAC MP3 AAC MUSEPACK OGG SPEEX VORBIS WAVPACK DBUS REMOTE
+OPTIONS_DEFAULT_i386=	SPC
 
-OPTIONS_DEFAULT=	FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE
-
 SPC_DESC=	SPC (SNES ROM audio) support on i386
 SPEEX_DESC=	OGG/Speex audio support
 REMOTE_DESC=	Enable remote playback
-EXTENSIONS_DESC=	Enable extensions
 
-.include <bsd.port.options.mk>
+OGG_USE=	GSTREAMER=ogg
+VORBIS_USE=	GSTREAMER=vorbis
+SPC_USE=	GSTREAMER=spc
+SPEEX_USE=	GSTREAMER=speex
+MP3_USE=	GSTREAMER=mp3
+FLAC_USE=	GSTREAMER=flac
 
-.if ${PORT_OPTIONS:MOGG}
-USE_GSTREAMER+=	ogg
-.endif
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_USE=		GSTREAMER=musepack
 
-.if ${PORT_OPTIONS:MVORBIS}
-USE_GSTREAMER+=	vorbis
-.endif
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_USE=		GSTREAMER=wavpack
 
-.if ${PORT_OPTIONS:MSPC} && ${ARCH} == i386
-USE_GSTREAMER+=	spc
-.endif
+AAC_LIB_DEPENDS=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+AAC_USE=		GSTREAMER=faad
 
-.if ${PORT_OPTIONS:MSPEEX}
-USE_GSTREAMER+=	speex
-.endif
+DBUS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
 
-.if ${PORT_OPTIONS:MMP3}
-USE_GSTREAMER+=	mp3
-.endif
+REMOTE_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser
+REMOTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser
+REMOTE_USE=		GSTREAMER=gnomevfs
 
-.if ${PORT_OPTIONS:MFLAC}
-USE_GSTREAMER+=	flac
-.endif
-
-.if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
-USE_GSTREAMER+=	musepack
-.endif
-
-.if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
-USE_GSTREAMER+=	wavpack
-.endif
-
-.if ${PORT_OPTIONS:MAAC}
-LIB_DEPENDS+=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
-USE_GSTREAMER+=	faad
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
-.endif
-
-.if ${PORT_OPTIONS:MREMOTE}
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser
-USE_GSTREAMER+=	gnomevfs
-.endif
-
-.if ${PORT_OPTIONS:MEXTENSIONS}
-USE_GNOME+=	pygnomeextras
-.endif
-
 .include <bsd.port.mk>