7 files changed, 1 insertions, 130 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 77369fc2880c..7bb2d91845b6 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -447,7 +447,6 @@
     SUBDIR += py-ogg
     SUBDIR += py-openal
     SUBDIR += py-sdl_mixer
-    SUBDIR += py-shellac
     SUBDIR += py-taglib
     SUBDIR += py-vorbis
     SUBDIR += py-xmms
@@ -491,6 +490,7 @@
     SUBDIR += sdl_mixer
     SUBDIR += sdl_sound
     SUBDIR += sfront
+    SUBDIR += shellac
     SUBDIR += shntool
     SUBDIR += shorten
     SUBDIR += shout
diff --git a/audio/py-shellac/Makefile b/audio/py-shellac/Makefile
deleted file mode 100644
index dc6fc2d4fa30..000000000000
--- a/audio/py-shellac/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	py-shellac
-# Date created:				04 Apr 2006
-# Whom:					Alexander Botero-Lowry <alex@foxybanana.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	shellac
-PORTVERSION=	20060412
-CATEGORIES=	audio python
-MASTER_SITES=	http://hem.bredband.net/b298027/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	alex@foxybanana.com
-COMMENT=	Shellac is a PyGTK XMMS2 Client
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xmmsclient.so:${PORTSDIR}/audio/py-xmms2
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_GNOME=	pygtk2
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in COPYING README
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/audio/py-shellac/distinfo b/audio/py-shellac/distinfo
deleted file mode 100644
index bb2fd847d459..000000000000
--- a/audio/py-shellac/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (shellac-20060412.tar.gz) = 631fc329f34776a1f7b065b2530af705
-SHA256 (shellac-20060412.tar.gz) = 49cc7eea65f8961161e3dbf445308a7ea11021216e19582828970a08801eb3b3
-SIZE (shellac-20060412.tar.gz) = 49761
diff --git a/audio/py-shellac/files/patch-setup.py b/audio/py-shellac/files/patch-setup.py
deleted file mode 100644
index 8dbe35d1f19f..000000000000
--- a/audio/py-shellac/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py.orig	Tue Apr  4 18:41:33 2006
-+++ setup.py	Tue Apr  4 18:42:07 2006
-@@ -7,10 +7,7 @@
-         author_email = 'bjernstad@gmail.com',
-         url = 'http://hem.bredband.net/b298027/',
-         packages=['Shellac'],
--        data_files = [ ('share/doc/shellac',
--                                    ['COPYING', 'README']),
--
--                       ('share/shellac',
-+        data_files = [ ('share/shellac',  
-                                     ['defaults.conf']),
- 
-                        ('share/shellac/images',
diff --git a/audio/py-shellac/pkg-descr b/audio/py-shellac/pkg-descr
deleted file mode 100644
index 2232411a8315..000000000000
--- a/audio/py-shellac/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Shellac is an XMMS2 client written in Python with Pygtk.
-
-Goals:
-        * Configurable
-        * Easy to use
-        * No excessive eye candy
-
-WWW:	http://hem.bredband.net/b298027/
diff --git a/audio/py-shellac/pkg-plist b/audio/py-shellac/pkg-plist
deleted file mode 100644
index d057e52973fe..000000000000
--- a/audio/py-shellac/pkg-plist
+++ /dev/null
@@ -1,70 +0,0 @@
-bin/shellac.py
-%%PYTHON_SITELIBDIR%%/Shellac/__init__.py
-%%PYTHON_SITELIBDIR%%/Shellac/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/equalizer.py
-%%PYTHON_SITELIBDIR%%/Shellac/equalizer.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/equalizer.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/find.py
-%%PYTHON_SITELIBDIR%%/Shellac/filebrowser.py
-%%PYTHON_SITELIBDIR%%/Shellac/filebrowser.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/filebrowser.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/find.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/find.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/format.py
-%%PYTHON_SITELIBDIR%%/Shellac/format.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/format.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/functions.py
-%%PYTHON_SITELIBDIR%%/Shellac/functions.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/functions.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/guiwidgets.py
-%%PYTHON_SITELIBDIR%%/Shellac/guiwidgets.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/guiwidgets.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/library.py
-%%PYTHON_SITELIBDIR%%/Shellac/library.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/library.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/playlist.py
-%%PYTHON_SITELIBDIR%%/Shellac/playlist.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/playlist.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/playlists.py
-%%PYTHON_SITELIBDIR%%/Shellac/playlists.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/playlists.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/settings.py
-%%PYTHON_SITELIBDIR%%/Shellac/settings.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/settings.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/settingseditor.py
-%%PYTHON_SITELIBDIR%%/Shellac/settingseditor.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/settingseditor.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/song_tree_view.py
-%%PYTHON_SITELIBDIR%%/Shellac/song_tree_view.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/song_tree_view.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/streambrowser.py
-%%PYTHON_SITELIBDIR%%/Shellac/streambrowser.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/streambrowser.pyo
-%%PYTHON_SITELIBDIR%%/Shellac/xmmsglib.py
-%%PYTHON_SITELIBDIR%%/Shellac/xmmsglib.pyc
-%%PYTHON_SITELIBDIR%%/Shellac/xmmsglib.pyo
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%DATADIR%%/defaults.conf
-%%DATADIR%%/glade/connect.glade
-%%DATADIR%%/glade/file_browser.glade
-%%DATADIR%%/glade/find.glade
-%%DATADIR%%/glade/gui.glade
-%%DATADIR%%/glade/library.glade
-%%DATADIR%%/glade/playlist.glade
-%%DATADIR%%/glade/playlists.glade
-%%DATADIR%%/glade/settings.glade
-%%DATADIR%%/glade/streambrowser.glade
-%%DATADIR%%/glade/tag_info.glade
-%%DATADIR%%/images/next.png
-%%DATADIR%%/images/pause.png
-%%DATADIR%%/images/play.png
-%%DATADIR%%/images/prev.png
-%%DATADIR%%/images/repeat.png
-%%DATADIR%%/images/stop.png
-@dirrm %%PYTHON_SITELIBDIR%%/Shellac
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%
diff --git a/audio/shellac/Makefile b/audio/shellac/Makefile
index dc6fc2d4fa30..e550975e14be 100644
--- a/audio/shellac/Makefile
+++ b/audio/shellac/Makefile
@@ -9,8 +9,6 @@ PORTNAME=	shellac
 PORTVERSION=	20060412
 CATEGORIES=	audio python
 MASTER_SITES=	http://hem.bredband.net/b298027/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	alex@foxybanana.com
 COMMENT=	Shellac is a PyGTK XMMS2 Client