Fix PLIST (discovered by hubertf's bulk-build).

While at it, make this a distuils package.

2 files changed, 97 insertions, 42 deletions

diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 117e6fc46e4..6a7c536ddfb 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/08 00:33:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/09/16 11:40:26 recht Exp $
 #
 
 DISTNAME=	nicotine-1.0.3
@@ -10,16 +10,12 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://nicotine.thegraveyard.org/
 COMMENT=	Client for soulseek, a peer-to-peer network for music
 
-NO_CONFIGURE=   yes
-NO_BUILD=       yes
 PYTHON_VERSIONS_ACCEPTED=       22pth 23pth
 USE_BUILDLINK2=	yes
+PY_PATCHPLIST=	yes
+PYDISTUTILSPKG=	yes
 
-do-install:
-	cd ${WRKSRC} ; \
-	${PYTHONBIN} setup.py install --prefix=${PREFIX}
-
-.include "../../lang/python22-pth/buildlink2.mk"
+.include "../../lang/python/extension.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../x11/py-gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nicotine/PLIST b/net/nicotine/PLIST
index 3c6aadb05f2..508de54abd8 100644
--- a/net/nicotine/PLIST
+++ b/net/nicotine/PLIST
@@ -1,36 +1,95 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/08 00:33:18 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/16 11:40:26 recht Exp $
 bin/nicotine
 bin/nicotine-import-winconfig
-lib/python2p2/site-packages/pynicotine/__init__.pyc
-lib/python2p2/site-packages/pynicotine/config.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/__init__.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/about.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/browsetreemodels.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/chatrooms.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/checklatest.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/dirchooser.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/downloads.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/frame.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/glade2py.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/gtkexcepthook.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/imagedata.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/nicotine_glade.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/privatechat.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/search.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/settings_glade.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/settingswindow.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/transferlist.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/uploads.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/userbrowse.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/userinfo.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/userlist.pyc
-lib/python2p2/site-packages/pynicotine/gtkgui/utils.pyc
-lib/python2p2/site-packages/pynicotine/mp3.pyc
-lib/python2p2/site-packages/pynicotine/pynicotine.pyc
-lib/python2p2/site-packages/pynicotine/slskmessages.pyc
-lib/python2p2/site-packages/pynicotine/slskproto.pyc
-lib/python2p2/site-packages/pynicotine/transfers.pyc
-lib/python2p2/site-packages/pynicotine/utils.pyc
-@dirrm lib/python2p2/site-packages/pynicotine/gtkgui
-@dirrm lib/python2p2/site-packages/pynicotine
-@dirrm lib/python2p2/site-packages
+${PYSITELIB}/pynicotine/__init__.py
+${PYSITELIB}/pynicotine/__init__.pyc
+${PYSITELIB}/pynicotine/__init__.pyo
+${PYSITELIB}/pynicotine/config.py
+${PYSITELIB}/pynicotine/config.pyc
+${PYSITELIB}/pynicotine/config.pyo
+${PYSITELIB}/pynicotine/gtkgui/__init__.py
+${PYSITELIB}/pynicotine/gtkgui/__init__.pyc
+${PYSITELIB}/pynicotine/gtkgui/__init__.pyo
+${PYSITELIB}/pynicotine/gtkgui/about.py
+${PYSITELIB}/pynicotine/gtkgui/about.pyc
+${PYSITELIB}/pynicotine/gtkgui/about.pyo
+${PYSITELIB}/pynicotine/gtkgui/browsetreemodels.py
+${PYSITELIB}/pynicotine/gtkgui/browsetreemodels.pyc
+${PYSITELIB}/pynicotine/gtkgui/browsetreemodels.pyo
+${PYSITELIB}/pynicotine/gtkgui/chatrooms.py
+${PYSITELIB}/pynicotine/gtkgui/chatrooms.pyc
+${PYSITELIB}/pynicotine/gtkgui/chatrooms.pyo
+${PYSITELIB}/pynicotine/gtkgui/checklatest.py
+${PYSITELIB}/pynicotine/gtkgui/checklatest.pyc
+${PYSITELIB}/pynicotine/gtkgui/checklatest.pyo
+${PYSITELIB}/pynicotine/gtkgui/dirchooser.py
+${PYSITELIB}/pynicotine/gtkgui/dirchooser.pyc
+${PYSITELIB}/pynicotine/gtkgui/dirchooser.pyo
+${PYSITELIB}/pynicotine/gtkgui/downloads.py
+${PYSITELIB}/pynicotine/gtkgui/downloads.pyc
+${PYSITELIB}/pynicotine/gtkgui/downloads.pyo
+${PYSITELIB}/pynicotine/gtkgui/frame.py
+${PYSITELIB}/pynicotine/gtkgui/frame.pyc
+${PYSITELIB}/pynicotine/gtkgui/frame.pyo
+${PYSITELIB}/pynicotine/gtkgui/glade2py.py
+${PYSITELIB}/pynicotine/gtkgui/glade2py.pyc
+${PYSITELIB}/pynicotine/gtkgui/glade2py.pyo
+${PYSITELIB}/pynicotine/gtkgui/gtkexcepthook.py
+${PYSITELIB}/pynicotine/gtkgui/gtkexcepthook.pyc
+${PYSITELIB}/pynicotine/gtkgui/gtkexcepthook.pyo
+${PYSITELIB}/pynicotine/gtkgui/imagedata.py
+${PYSITELIB}/pynicotine/gtkgui/imagedata.pyc
+${PYSITELIB}/pynicotine/gtkgui/imagedata.pyo
+${PYSITELIB}/pynicotine/gtkgui/nicotine_glade.py
+${PYSITELIB}/pynicotine/gtkgui/nicotine_glade.pyc
+${PYSITELIB}/pynicotine/gtkgui/nicotine_glade.pyo
+${PYSITELIB}/pynicotine/gtkgui/privatechat.py
+${PYSITELIB}/pynicotine/gtkgui/privatechat.pyc
+${PYSITELIB}/pynicotine/gtkgui/privatechat.pyo
+${PYSITELIB}/pynicotine/gtkgui/search.py
+${PYSITELIB}/pynicotine/gtkgui/search.pyc
+${PYSITELIB}/pynicotine/gtkgui/search.pyo
+${PYSITELIB}/pynicotine/gtkgui/settings_glade.py
+${PYSITELIB}/pynicotine/gtkgui/settings_glade.pyc
+${PYSITELIB}/pynicotine/gtkgui/settings_glade.pyo
+${PYSITELIB}/pynicotine/gtkgui/settingswindow.py
+${PYSITELIB}/pynicotine/gtkgui/settingswindow.pyc
+${PYSITELIB}/pynicotine/gtkgui/settingswindow.pyo
+${PYSITELIB}/pynicotine/gtkgui/transferlist.py
+${PYSITELIB}/pynicotine/gtkgui/transferlist.pyc
+${PYSITELIB}/pynicotine/gtkgui/transferlist.pyo
+${PYSITELIB}/pynicotine/gtkgui/uploads.py
+${PYSITELIB}/pynicotine/gtkgui/uploads.pyc
+${PYSITELIB}/pynicotine/gtkgui/uploads.pyo
+${PYSITELIB}/pynicotine/gtkgui/userbrowse.py
+${PYSITELIB}/pynicotine/gtkgui/userbrowse.pyc
+${PYSITELIB}/pynicotine/gtkgui/userbrowse.pyo
+${PYSITELIB}/pynicotine/gtkgui/userinfo.py
+${PYSITELIB}/pynicotine/gtkgui/userinfo.pyc
+${PYSITELIB}/pynicotine/gtkgui/userinfo.pyo
+${PYSITELIB}/pynicotine/gtkgui/userlist.py
+${PYSITELIB}/pynicotine/gtkgui/userlist.pyc
+${PYSITELIB}/pynicotine/gtkgui/userlist.pyo
+${PYSITELIB}/pynicotine/gtkgui/utils.py
+${PYSITELIB}/pynicotine/gtkgui/utils.pyc
+${PYSITELIB}/pynicotine/gtkgui/utils.pyo
+${PYSITELIB}/pynicotine/mp3.py
+${PYSITELIB}/pynicotine/mp3.pyc
+${PYSITELIB}/pynicotine/mp3.pyo
+${PYSITELIB}/pynicotine/pynicotine.py
+${PYSITELIB}/pynicotine/pynicotine.pyc
+${PYSITELIB}/pynicotine/pynicotine.pyo
+${PYSITELIB}/pynicotine/slskmessages.py
+${PYSITELIB}/pynicotine/slskmessages.pyc
+${PYSITELIB}/pynicotine/slskmessages.pyo
+${PYSITELIB}/pynicotine/slskproto.py
+${PYSITELIB}/pynicotine/slskproto.pyc
+${PYSITELIB}/pynicotine/slskproto.pyo
+${PYSITELIB}/pynicotine/transfers.py
+${PYSITELIB}/pynicotine/transfers.pyc
+${PYSITELIB}/pynicotine/transfers.pyo
+${PYSITELIB}/pynicotine/utils.py
+${PYSITELIB}/pynicotine/utils.pyc
+${PYSITELIB}/pynicotine/utils.pyo
+@dirrm ${PYSITELIB}/pynicotine/gtkgui
+@dirrm ${PYSITELIB}/pynicotine