4 files changed, 38 insertions, 27 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index f057d2e55acc..a0d0d3ccfff2 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -22,10 +22,14 @@ MAKE_ENV=		VPATH="${PYTHON_WRKSRC}"
 
 INSTALL_TARGET=	altinstall
 
-USES=		readline tar:xz
+USES=		readline tar:xz cpe
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 
+CPE_VENDOR=	python
+CPE_PRODUCT=	${CPE_VENDOR}
+CPE_VERSION=	${PORTVERSION}
+
 PYTHON_VERSION=		python2.7
 PYTHON_NO_DEPENDS=	yes
 
@@ -272,10 +276,9 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if !defined(NOPORTDATA)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | (cd ${STAGEDIR}${DATADIR}; ${TAR} --no-same-owner -xf -))
-.endif
+
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
 		(cd ${STAGEDIR}${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -))
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 6134138a4a23..a798a5ac79a4 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -1,30 +1,34 @@
 # $FreeBSD$
 
-PORTNAME=		python32
-PORTVERSION=		3.2.5
-PORTREVISION=		9
-CATEGORIES=		lang python ipv6
-MASTER_SITES=		PYTHON
+PORTNAME=	python32
+PORTVERSION=	3.2.5
+PORTREVISION=	9
+CATEGORIES=	lang python ipv6
+MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
-DISTNAME=		${PYTHON_DISTNAME}
-DIST_SUBDIR=		python
+DISTNAME=	${PYTHON_DISTNAME}
+DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure # must be relative
-CONFIGURE_ENV=		OPT="" SVNVERSION="echo freebsd"
-MAKE_ENV=		VPATH="${PYTHON_WRKSRC}"
+CONFIGURE_ENV=	OPT="" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 
 INSTALL_TARGET=	altinstall
 
-USES=		readline tar:xz
+USES=		readline tar:xz cpe
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 
+CPE_VENDOR=	python
+CPE_PRODUCT=	${CPE_VENDOR}
+CPE_VERSION=	${PORTVERSION}
+
 PYTHON_VERSION=		python3.2
 PYTHON_NO_DEPENDS=	yes
 
@@ -213,11 +217,9 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if !defined(NOPORTDATA)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
 		(cd ${STAGEDIR}${DATADIR}; ${TAR} -xf -)
-.endif
 
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index ec25d1c866c7..0a132497c2f2 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -21,10 +21,14 @@ MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 
 INSTALL_TARGET=	altinstall
 
-USES=		gmake readline shebangfix tar:xz
+USES=		gmake readline shebangfix tar:xz cpe
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 
+CPE_VENDOR=	python
+CPE_PRODUCT=	${CPE_VENDOR}
+CPE_VERSION=	${PORTVERSION}
+
 PYTHON_VERSION=	python3.3
 PYTHON_NO_DEPENDS=	yes
 
@@ -213,11 +217,9 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if !defined(NOPORTDATA)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
 		(cd ${STAGEDIR}${DATADIR}; ${TAR} -xf -)
-.endif
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE_CMD} TESTOPTS=-j${MAKE_JOBS_NUMBER} test
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index 8c73d5f9fad2..2f4cad8f2d2f 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -1,25 +1,29 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=		python34
-PORTVERSION=		3.4.1
-PORTREVISION=		1
-CATEGORIES=		lang python ipv6
-MASTER_SITES=		PYTHON
+PORTNAME=	python34
+PORTVERSION=	3.4.1
+PORTREVISION=	1
+CATEGORIES=	lang python ipv6
+MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
-DISTNAME=		${PYTHON_DISTNAME}
-DIST_SUBDIR=		python
+DISTNAME=	${PYTHON_DISTNAME}
+DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
-USES=		ncurses pkgconfig readline tar:xz
+USES=		ncurses pkgconfig readline tar:xz cpe
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 
+CPE_VENDOR=	python
+CPE_PRODUCT=	${CPE_VENDOR}
+CPE_VERSION=	${PORTVERSION}
+
 PYTHON_VERSION=		python3.4
 PYTHON_NO_DEPENDS=	yes