Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -8127,3 +8127,4 @@
 java/wildfly80||2016-02-01|Has expired: Fully EOL when version 8.2 was released
 java/wildfly81||2016-02-01|Has expired: Fully EOL when version 9.0 was released
 mail/phpmailer2|mail/phpmailer|2016-02-01|Has expired: Obsolete, use mail/phpmailer instead
+cad/pycam|cad/py-pycam|2016-02-03|Add py- prefix to directory name
Index: head/cad/Makefile
===================================================================
--- head/cad/Makefile
+++ head/cad/Makefile
@@ -62,7 +62,7 @@
     SUBDIR += p5-Verilog-Perl
     SUBDIR += pcb
     SUBDIR += pdnmesh
-    SUBDIR += pycam
+    SUBDIR += py-pycam
     SUBDIR += pythoncad
     SUBDIR += qcad
     SUBDIR += qcad-partslib
Index: head/cad/py-pycam/Makefile
===================================================================
--- head/cad/py-pycam/Makefile
+++ head/cad/py-pycam/Makefile
@@ -0,0 +1,22 @@
+# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	pycam
+PORTVERSION=	0.5.1
+CATEGORIES=	cad python
+MASTER_SITES=	SOURCEFORGE/pycam/${PORTNAME}/${PORTVERSION}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	trasz@FreeBSD.org
+COMMENT=	Toolpath generator for 3-axis CNC machining
+
+LICENSE=	GPLv3
+
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
+		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
+
+USES=		python:-2.7
+USE_PYTHON=	distutils autoplist
+
+.include <bsd.port.mk>
Index: head/cad/py-pycam/distinfo
===================================================================
--- head/cad/py-pycam/distinfo
+++ head/cad/py-pycam/distinfo
@@ -0,0 +1,2 @@
+SHA256 (pycam-0.5.1.tar.gz) = e26a6db82efa4761a1db6b81de3165898430d5c14d09614b67321105d67e264c
+SIZE (pycam-0.5.1.tar.gz) = 1680577
Index: head/cad/py-pycam/files/patch-setup.cfg
===================================================================
--- head/cad/py-pycam/files/patch-setup.cfg
+++ head/cad/py-pycam/files/patch-setup.cfg
@@ -0,0 +1,10 @@
+--- setup.cfg.orig	2016-01-28 13:08:25.505821000 +0100
++++ setup.cfg	2016-01-28 13:08:29.908308000 +0100
+@@ -1,7 +1,3 @@
+-[bdist_wininst]
+-install_script = pycam_win32_postinstall.py
+-bitmap = share/ui/logo_gui_vertical.bmp
+-
+ [bdist_msi]
+ install_script = pycam_win32_postinstall.py
+ 
Index: head/cad/py-pycam/pkg-descr
===================================================================
--- head/cad/py-pycam/pkg-descr
+++ head/cad/py-pycam/pkg-descr
@@ -0,0 +1,9 @@
+PyCAM is a toolpath generator for 3-axis CNC machining. It loads
+3D models in STL format or 2D contour models from DXF or SVG files.
+The resulting GCode can be used with EMC2 or any other machine
+controller.
+
+PyCAM supports a wide range of toolpath strategies for 3D models
+and 2D contour models.
+
+WWW: http://pycam.sourceforge.net/
Index: head/cad/py-pycam/pkg-plist
===================================================================
--- head/cad/py-pycam/pkg-plist
+++ head/cad/py-pycam/pkg-plist
@@ -0,0 +1 @@
+@comment $FreeBSD$
Index: head/cad/pycam/Makefile
===================================================================
--- head/cad/pycam/Makefile
+++ head/cad/pycam/Makefile
@@ -1,21 +0,0 @@
-# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	pycam
-PORTVERSION=	0.5.1
-CATEGORIES=	cad python
-MASTER_SITES=	SOURCEFORGE/pycam/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	trasz@FreeBSD.org
-COMMENT=	Toolpath generator for 3-axis CNC machining
-
-LICENSE=	GPLv3
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
-
-USES=		python
-USE_PYTHON=	distutils autoplist
-
-.include <bsd.port.mk>
Index: head/cad/pycam/distinfo
===================================================================
--- head/cad/pycam/distinfo
+++ head/cad/pycam/distinfo
@@ -1,2 +0,0 @@
-SHA256 (pycam-0.5.1.tar.gz) = e26a6db82efa4761a1db6b81de3165898430d5c14d09614b67321105d67e264c
-SIZE (pycam-0.5.1.tar.gz) = 1680577
Index: head/cad/pycam/files/patch-setup.cfg
===================================================================
--- head/cad/pycam/files/patch-setup.cfg
+++ head/cad/pycam/files/patch-setup.cfg
@@ -1,10 +0,0 @@
---- setup.cfg.orig	2016-01-28 13:08:25.505821000 +0100
-+++ setup.cfg	2016-01-28 13:08:29.908308000 +0100
-@@ -1,7 +1,3 @@
--[bdist_wininst]
--install_script = pycam_win32_postinstall.py
--bitmap = share/ui/logo_gui_vertical.bmp
--
- [bdist_msi]
- install_script = pycam_win32_postinstall.py
- 
Index: head/cad/pycam/pkg-descr
===================================================================
--- head/cad/pycam/pkg-descr
+++ head/cad/pycam/pkg-descr
@@ -1,9 +0,0 @@
-PyCAM is a toolpath generator for 3-axis CNC machining. It loads
-3D models in STL format or 2D contour models from DXF or SVG files.
-The resulting GCode can be used with EMC2 or any other machine
-controller.
-
-PyCAM supports a wide range of toolpath strategies for 3D models
-and 2D contour models.
-
-WWW: http://pycam.sourceforge.net/
Index: head/cad/pycam/pkg-plist
===================================================================
--- head/cad/pycam/pkg-plist
+++ head/cad/pycam/pkg-plist
@@ -1 +0,0 @@
-@comment $FreeBSD$