- convert to using PYTHON_SITELIBDIR

- break the line on 80-char border in pkg-descr
- do not try to remove directories, that we don't created

All of them are non-functional changes

7 files changed, 61 insertions, 62 deletions

diff --git a/net/forg/pkg-plist b/net/forg/pkg-plist
index edf8422b78d5..bbe02e19afe6 100644
--- a/net/forg/pkg-plist
+++ b/net/forg/pkg-plist
@@ -1,33 +1,33 @@
 bin/forg
-lib/%%PYTHON_VERSION%%/site-packages/AskForm.py
-lib/%%PYTHON_VERSION%%/site-packages/Associations.py
-lib/%%PYTHON_VERSION%%/site-packages/AssociationsEditor.py
-lib/%%PYTHON_VERSION%%/site-packages/Bookmark.py
-lib/%%PYTHON_VERSION%%/site-packages/BookmarkEditor.py
-lib/%%PYTHON_VERSION%%/site-packages/Cache.py
-lib/%%PYTHON_VERSION%%/site-packages/Connection.py
-lib/%%PYTHON_VERSION%%/site-packages/ContentFrame.py
-lib/%%PYTHON_VERSION%%/site-packages/Dialogs.py
-lib/%%PYTHON_VERSION%%/site-packages/GUIAskForm.py
-lib/%%PYTHON_VERSION%%/site-packages/GUIDirectory.py
-lib/%%PYTHON_VERSION%%/site-packages/GUIError.py
-lib/%%PYTHON_VERSION%%/site-packages/GUIFile.py
-lib/%%PYTHON_VERSION%%/site-packages/GUIQuestion.py
-lib/%%PYTHON_VERSION%%/site-packages/GUISaveFile.py
-lib/%%PYTHON_VERSION%%/site-packages/GUISearch.py
-lib/%%PYTHON_VERSION%%/site-packages/GopherConnection.py
-lib/%%PYTHON_VERSION%%/site-packages/GopherObject.py
-lib/%%PYTHON_VERSION%%/site-packages/GopherResource.py
-lib/%%PYTHON_VERSION%%/site-packages/GopherResponse.py
-lib/%%PYTHON_VERSION%%/site-packages/List.py
-lib/%%PYTHON_VERSION%%/site-packages/ListNode.py
-lib/%%PYTHON_VERSION%%/site-packages/Options.py
-lib/%%PYTHON_VERSION%%/site-packages/Question.py
-lib/%%PYTHON_VERSION%%/site-packages/ResourceInformation.py
-lib/%%PYTHON_VERSION%%/site-packages/State.py
-lib/%%PYTHON_VERSION%%/site-packages/TkGui.py
-lib/%%PYTHON_VERSION%%/site-packages/Tree.py
-lib/%%PYTHON_VERSION%%/site-packages/forg.py
-lib/%%PYTHON_VERSION%%/site-packages/gopher.py
-lib/%%PYTHON_VERSION%%/site-packages/mini-forg.py
-lib/%%PYTHON_VERSION%%/site-packages/utils.py
+%%PYTHON_SITELIBDIR%%/AskForm.py
+%%PYTHON_SITELIBDIR%%/Associations.py
+%%PYTHON_SITELIBDIR%%/AssociationsEditor.py
+%%PYTHON_SITELIBDIR%%/Bookmark.py
+%%PYTHON_SITELIBDIR%%/BookmarkEditor.py
+%%PYTHON_SITELIBDIR%%/Cache.py
+%%PYTHON_SITELIBDIR%%/Connection.py
+%%PYTHON_SITELIBDIR%%/ContentFrame.py
+%%PYTHON_SITELIBDIR%%/Dialogs.py
+%%PYTHON_SITELIBDIR%%/GUIAskForm.py
+%%PYTHON_SITELIBDIR%%/GUIDirectory.py
+%%PYTHON_SITELIBDIR%%/GUIError.py
+%%PYTHON_SITELIBDIR%%/GUIFile.py
+%%PYTHON_SITELIBDIR%%/GUIQuestion.py
+%%PYTHON_SITELIBDIR%%/GUISaveFile.py
+%%PYTHON_SITELIBDIR%%/GUISearch.py
+%%PYTHON_SITELIBDIR%%/GopherConnection.py
+%%PYTHON_SITELIBDIR%%/GopherObject.py
+%%PYTHON_SITELIBDIR%%/GopherResource.py
+%%PYTHON_SITELIBDIR%%/GopherResponse.py
+%%PYTHON_SITELIBDIR%%/List.py
+%%PYTHON_SITELIBDIR%%/ListNode.py
+%%PYTHON_SITELIBDIR%%/Options.py
+%%PYTHON_SITELIBDIR%%/Question.py
+%%PYTHON_SITELIBDIR%%/ResourceInformation.py
+%%PYTHON_SITELIBDIR%%/State.py
+%%PYTHON_SITELIBDIR%%/TkGui.py
+%%PYTHON_SITELIBDIR%%/Tree.py
+%%PYTHON_SITELIBDIR%%/forg.py
+%%PYTHON_SITELIBDIR%%/gopher.py
+%%PYTHON_SITELIBDIR%%/mini-forg.py
+%%PYTHON_SITELIBDIR%%/utils.py
diff --git a/net/googolplex/Makefile b/net/googolplex/Makefile
index 06b0a4d26457..acbe98f93928 100644
--- a/net/googolplex/Makefile
+++ b/net/googolplex/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://googolplex.sourceforge.net/source/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Query Google, parse it and returns the result as a list
 
-PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/googolplex.py
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/googolplex.py
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/net/googolplex/pkg-descr b/net/googolplex/pkg-descr
index c57b13ac7e82..6df6e7ae55be 100644
--- a/net/googolplex/pkg-descr
+++ b/net/googolplex/pkg-descr
@@ -1,3 +1,4 @@
-Googolplex is just a Python class to do a query on http://www.google.com, parse it and returns the result as a list.
+Googolplex is just a Python class to do a query on http://www.google.com, parse
+it and returns the result as a list.
 
 WWW: http://googolplex.sourceforge.net/
diff --git a/net/py-soapy/pkg-plist b/net/py-soapy/pkg-plist
index 15aa57b1a479..fe4a44dedbfd 100644
--- a/net/py-soapy/pkg-plist
+++ b/net/py-soapy/pkg-plist
@@ -3,12 +3,12 @@
 %%PORTDOCS%%share/examples/soapy/get_temperature.py
 %%PORTDOCS%%share/examples/soapy/terraserver_image.py
 %%PORTDOCS%%share/examples/soapy/test/testsoap.py
-lib/%%PYTHON_VERSION%%/site-packages/schema.py
-lib/%%PYTHON_VERSION%%/site-packages/schema.pyc
-lib/%%PYTHON_VERSION%%/site-packages/schema.pyo
-lib/%%PYTHON_VERSION%%/site-packages/soap.py
-lib/%%PYTHON_VERSION%%/site-packages/soap.pyc
-lib/%%PYTHON_VERSION%%/site-packages/soap.pyo
+%%PYTHON_SITELIBDIR%%/schema.py
+%%PYTHON_SITELIBDIR%%/schema.pyc
+%%PYTHON_SITELIBDIR%%/schema.pyo
+%%PYTHON_SITELIBDIR%%/soap.py
+%%PYTHON_SITELIBDIR%%/soap.pyc
+%%PYTHON_SITELIBDIR%%/soap.pyo
 %%PORTDOCS%%@dirrm share/examples/soapy/test
 %%PORTDOCS%%@dirrm share/examples/soapy
 %%PORTDOCS%%@dirrm share/doc/soapy
diff --git a/net/py-xmlrpc/pkg-plist b/net/py-xmlrpc/pkg-plist
index 585a9bd0c473..dfa388c91b36 100644
--- a/net/py-xmlrpc/pkg-plist
+++ b/net/py-xmlrpc/pkg-plist
@@ -1,10 +1,10 @@
-lib/%%PYTHON_VERSION%%/site-packages/_xmlrpc.so
-lib/%%PYTHON_VERSION%%/site-packages/pyxmlrpclib.py
-lib/%%PYTHON_VERSION%%/site-packages/pyxmlrpclib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pyxmlrpclib.pyo
-lib/%%PYTHON_VERSION%%/site-packages/xmlrpc.py
-lib/%%PYTHON_VERSION%%/site-packages/xmlrpc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xmlrpc.pyo
+%%PYTHON_SITELIBDIR%%/_xmlrpc.so
+%%PYTHON_SITELIBDIR%%/pyxmlrpclib.py
+%%PYTHON_SITELIBDIR%%/pyxmlrpclib.pyc
+%%PYTHON_SITELIBDIR%%/pyxmlrpclib.pyo
+%%PYTHON_SITELIBDIR%%/xmlrpc.py
+%%PYTHON_SITELIBDIR%%/xmlrpc.pyc
+%%PYTHON_SITELIBDIR%%/xmlrpc.pyo
 %%PORTDOCS%%share/examples/py-xmlrpc/crj/baseClient.py
 %%PORTDOCS%%share/examples/py-xmlrpc/crj/baseControl.py
 %%PORTDOCS%%share/examples/py-xmlrpc/crj/baseServer.py
diff --git a/net/py-xmlrpclib/pkg-plist b/net/py-xmlrpclib/pkg-plist
index 5e519172aced..da0e344ae0d0 100644
--- a/net/py-xmlrpclib/pkg-plist
+++ b/net/py-xmlrpclib/pkg-plist
@@ -1,7 +1,7 @@
 %%PORTDOCS%%share/doc/py-xmlrpclib/README
-lib/%%PYTHON_VERSION%%/site-packages/xmlrpclib.py
-lib/%%PYTHON_VERSION%%/site-packages/xmlrpclib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xmlrpclib.pyo
+%%PYTHON_SITELIBDIR%%/xmlrpclib.py
+%%PYTHON_SITELIBDIR%%/xmlrpclib.pyc
+%%PYTHON_SITELIBDIR%%/xmlrpclib.pyo
 share/examples/py-xmlrpclib/xmlrpc_handler.py
 share/examples/py-xmlrpclib/xmlrpcserver.py
 @dirrm share/examples/py-xmlrpclib
diff --git a/net/service-discovery-applet/pkg-plist b/net/service-discovery-applet/pkg-plist
index ba152e1a99ae..c8f196d56751 100644
--- a/net/service-discovery-applet/pkg-plist
+++ b/net/service-discovery-applet/pkg-plist
@@ -1,14 +1,14 @@
 bin/service-discovery-applet
 bin/service-discovery-config
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginloader.py
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginloader.pyc
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginloader.pyo
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.py
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.pyo
+%%PYTHON_SITELIBDIR%%/sdapplet/__init__.py
+%%PYTHON_SITELIBDIR%%/sdapplet/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sdapplet/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sdapplet/pluginloader.py
+%%PYTHON_SITELIBDIR%%/sdapplet/pluginloader.pyc
+%%PYTHON_SITELIBDIR%%/sdapplet/pluginloader.pyo
+%%PYTHON_SITELIBDIR%%/sdapplet/pluginutils.py
+%%PYTHON_SITELIBDIR%%/sdapplet/pluginutils.pyc
+%%PYTHON_SITELIBDIR%%/sdapplet/pluginutils.pyo
 libdata/bonobo/servers/GNOME_ServiceDiscoveryApplet.server
 share/service-discovery-applet/icons/24x24/_ftp._tcp.png
 share/service-discovery-applet/icons/24x24/_http._tcp.png
@@ -42,6 +42,4 @@ share/locale/fr/LC_MESSAGES/service-discovery-applet.mo
 @dirrm share/service-discovery-applet/icons/24x24
 @dirrm share/service-discovery-applet/icons
 @dirrm share/service-discovery-applet
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/sdapplet
-@dirrmtry lib/%%PYTHON_VERSION%%/site-packages
-@dirrmtry lib/%%PYTHON_VERSION%%
+@dirrm %%PYTHON_SITELIBDIR%%/sdapplet