Index: head/devel/py-setuptools/pkg-plist
===================================================================
--- head/devel/py-setuptools/pkg-plist	(revision 402979)
+++ head/devel/py-setuptools/pkg-plist	(nonexistent)
@@ -1,3 +0,0 @@
-@unexec if cmp -s %%EASYINSTALL_PTH%% %%EASYINSTALL_PTH%%.dist; then rm -f %%EASYINSTALL_PTH%%; fi
-%%PYTHON_SITELIBDIR%%/easy-install.pth.dist
-@exec if [ ! -f "%%EASYINSTALL_PTH%%" ]; then cp -p %%EASYINSTALL_PTH%%.dist %%EASYINSTALL_PTH%%; fi

Property changes on: head/devel/py-setuptools/pkg-plist
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/py-setuptools/Makefile
===================================================================
--- head/devel/py-setuptools/Makefile	(revision 402979)
+++ head/devel/py-setuptools/Makefile	(revision 402980)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	setuptools
-PORTVERSION=	17.0
+PORTVERSION=	18.7
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python packages installer
 
 LICENSE=	PSFL
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 PYDISTUTILS_SETUP=	${PYSETUP}
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
 MAKE_ENV+=		SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-PLIST_SUB=		EASYINSTALL_PTH=${PYTHON_SITELIBDIR}/easy-install.pth
+
+PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
 SUB_FILES+=	pkg-message
 SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
 .endif
 
 # These create dependency loops in redports/poudriere, because setuptools
 # is currently an explicit BUILD & RUN dependency in Uses/python.mk.
 #TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
 #.if ${PYTHON_REL} < 3300
 #TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 #.endif
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
 
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>
Index: head/devel/py-setuptools/distinfo
===================================================================
--- head/devel/py-setuptools/distinfo	(revision 402979)
+++ head/devel/py-setuptools/distinfo	(revision 402980)
@@ -1,2 +1,2 @@
-SHA256 (python/setuptools-17.0.tar.gz) = 561b33819ef3da2bff89cc8b05fd9b5ea3caeb31ad588b53fdf06f886ac3d200
-SIZE (python/setuptools-17.0.tar.gz) = 629845
+SHA256 (python/setuptools-18.7.tar.gz) = c57c1f5aa3b83e4c5e0ce5b144a7f96eea1dab873f35d5aaa3c2a2d960674353
+SIZE (python/setuptools-18.7.tar.gz) = 628702