5 files changed, 9 insertions, 118 deletions

diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 155846f52124..abe61343b95c 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -13,28 +13,20 @@ COMMENT=	Anarchic control version system without unnecessary re-merges
 
 LICENSE=	BSD3CLAUSE
 
-USES=		tar:xz
-USE_PYTHON=	yes
-
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	Codeville
+USES=		python tar:xz
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	LICENSE.txt
-EXAMPLE_FILES=	cdvserver.conf.sample
-
-OPTIONS_DEFINE=	DOCS
+PORTEXAMPLES=	cdvserver.conf.sample
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 # examples
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${EXAMPLE_FILES} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 # documentation
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/codeville/pkg-plist b/devel/codeville/pkg-plist
deleted file mode 100644
index a1adc7627cc0..000000000000
--- a/devel/codeville/pkg-plist
+++ /dev/null
@@ -1,98 +0,0 @@
-bin/cdv
-bin/cdv-agent
-bin/cdvpasswd
-bin/cdvserver
-bin/cdvupgrade
-%%PYTHON_SITELIBDIR%%/Codeville/DFS.py
-%%PYTHON_SITELIBDIR%%/Codeville/DFS.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/DFS.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/RawServer.py
-%%PYTHON_SITELIBDIR%%/Codeville/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/RawServer.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/SRP.py
-%%PYTHON_SITELIBDIR%%/Codeville/SRP.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/SRP.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/__init__.py
-%%PYTHON_SITELIBDIR%%/Codeville/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/agent.py
-%%PYTHON_SITELIBDIR%%/Codeville/agent.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/agent.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/auth.py
-%%PYTHON_SITELIBDIR%%/Codeville/auth.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/auth.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/bencode.py
-%%PYTHON_SITELIBDIR%%/Codeville/bencode.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/bencode.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/cdv_glob.py
-%%PYTHON_SITELIBDIR%%/Codeville/cdv_glob.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/cdv_glob.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/client.py
-%%PYTHON_SITELIBDIR%%/Codeville/client.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/client.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/client_helpers.py
-%%PYTHON_SITELIBDIR%%/Codeville/client_helpers.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/client_helpers.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/client_net.py
-%%PYTHON_SITELIBDIR%%/Codeville/client_net.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/client_net.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/crypt.py
-%%PYTHON_SITELIBDIR%%/Codeville/crypt.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/crypt.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/db.py
-%%PYTHON_SITELIBDIR%%/Codeville/db.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/db.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/diff.py
-%%PYTHON_SITELIBDIR%%/Codeville/diff.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/diff.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/entropy.py
-%%PYTHON_SITELIBDIR%%/Codeville/entropy.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/entropy.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/history.py
-%%PYTHON_SITELIBDIR%%/Codeville/history.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/history.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/lcsmatch.py
-%%PYTHON_SITELIBDIR%%/Codeville/lcsmatch.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/lcsmatch.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/merge.py
-%%PYTHON_SITELIBDIR%%/Codeville/merge.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/merge.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/mergelcs.py
-%%PYTHON_SITELIBDIR%%/Codeville/mergelcs.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/mergelcs.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/network.py
-%%PYTHON_SITELIBDIR%%/Codeville/network.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/network.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/old/__init__.py
-%%PYTHON_SITELIBDIR%%/Codeville/old/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/old/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/old/history.py
-%%PYTHON_SITELIBDIR%%/Codeville/old/history.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/old/history.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/old/merge.py
-%%PYTHON_SITELIBDIR%%/Codeville/old/merge.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/old/merge.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/passwd.py
-%%PYTHON_SITELIBDIR%%/Codeville/passwd.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/passwd.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/path.py
-%%PYTHON_SITELIBDIR%%/Codeville/path.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/path.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/selectpoll.py
-%%PYTHON_SITELIBDIR%%/Codeville/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/server.py
-%%PYTHON_SITELIBDIR%%/Codeville/server.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/server.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/testtest.py
-%%PYTHON_SITELIBDIR%%/Codeville/testtest.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/testtest.pyo
-%%PYTHON_SITELIBDIR%%/Codeville/upgrade.py
-%%PYTHON_SITELIBDIR%%/Codeville/upgrade.pyc
-%%PYTHON_SITELIBDIR%%/Codeville/upgrade.pyo
-%%EXAMPLESDIR%%/cdvserver.conf.sample
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/Codeville/old
-@dirrm %%PYTHON_SITELIBDIR%%/Codeville
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/devel/p5-Bundle-Perl6/pkg-plist b/devel/p5-Bundle-Perl6/pkg-plist
index 4faabceacba7..0e57ec2358ec 100644
--- a/devel/p5-Bundle-Perl6/pkg-plist
+++ b/devel/p5-Bundle-Perl6/pkg-plist
@@ -2,6 +2,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Perl6/.packlist
 %%PERL5_MAN3%%/Bundle::Perl6.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Perl6
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
-@dirrmtry %%SITE_PERL%%/Bundle
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/devel/p5-File-FcntlLock/pkg-plist b/devel/p5-File-FcntlLock/pkg-plist
index 43c25e20f953..55c20244360a 100644
--- a/devel/p5-File-FcntlLock/pkg-plist
+++ b/devel/p5-File-FcntlLock/pkg-plist
@@ -14,8 +14,7 @@
 %%PERL5_MAN3%%/File::FcntlLock::Inline.3.gz
 %%PERL5_MAN3%%/File::FcntlLock::Pure.3.gz
 %%PERL5_MAN3%%/File::FcntlLock::XS.3.gz
-@dirrm %%SITE_PERL%%/mach/File/FcntlLock
-@dirrmtry %%SITE_PERL%%/mach/File
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FcntlLock
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FcntlLock
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-Shape/pkg-plist b/devel/p5-Shape/pkg-plist
index a7ece07e02c6..18402a3c9089 100644
--- a/devel/p5-Shape/pkg-plist
+++ b/devel/p5-Shape/pkg-plist
@@ -3,5 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/.packlist
 %%PERL5_MAN3%%/Shape.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape