Index: head/security/cracklib/Makefile
===================================================================
--- head/security/cracklib/Makefile	(revision 472044)
+++ head/security/cracklib/Makefile	(revision 472045)
@@ -1,116 +1,116 @@
 # Created by: ajk@iu.edu
 # $FreeBSD$
 
 PORTNAME=	cracklib
 PORTVERSION=	2.9.6
 CATEGORIES=	security
 .if defined(PYTHON_SLAVEPORT)
 CATEGORIES+=	python
 .endif
 MASTER_SITES=	https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/ \
 		LOCAL/cy
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-words-${PORTVERSION}.gz
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 WORDS_DISTFILE=	${PORTNAME}-words-${PORTVERSION}.gz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT?=	Password-checking library
 
 LICENSE=	LGPL21
 
 DICTPATH=	${PREFIX}/libdata/${PORTNAME}
 DICTFILE=	${DICTPATH}/cracklib-words
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-default-dict=${DICTFILE}
 INSTALL_TARGET=	install-strip
 USES=		gettext libtool
 USE_LDCONFIG=	yes
 
 .if defined(PYTHON_SLAVEPORT)
-USES+=		python:2.7
+USES+=		python:2.7 #localbase
 USE_PYTHON=	flavors
 CONFIGURE_ARGS+=--with-python
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_cracklib.a \
 		%%PYTHON_SITELIBDIR%%/_cracklib.so \
 		%%PYTHON_SITELIBDIR%%/cracklib.py \
 		%%PYTHON_SITELIBDIR%%/cracklib.pyc \
 		%%PYTHON_SITELIBDIR%%/cracklib.pyo \
 		%%PYTHON_SITELIBDIR%%/test_cracklib.py \
 		%%PYTHON_SITELIBDIR%%/test_cracklib.pyc \
 		%%PYTHON_SITELIBDIR%%/test_cracklib.pyo
 .else
 CONFIGURE_ARGS+=--without-python
 
 PLIST_FILES=	include/crack.h \
 		include/packer.h \
 		lib/libcrack.a \
 		lib/libcrack.so \
 		lib/libcrack.so.2 \
 		lib/libcrack.so.2.9.0 \
 		libdata/cracklib/cracklib-words.hwm \
 		libdata/cracklib/cracklib-words.pwd \
 		libdata/cracklib/cracklib-words.pwi \
 		man/man3/FascistCheck.3.gz \
 		man/man3/cracklib.3.gz \
 		sbin/cracklib-check \
 		sbin/cracklib-format \
 		sbin/cracklib-packer \
 		sbin/cracklib-unpacker \
 		sbin/create-cracklib-dict \
 		%%DATADIR%%/cracklib-small \
 		%%DATADIR%%/cracklib.magic \
 		share/locale/as/LC_MESSAGES/cracklib.mo \
 		share/locale/bn_IN/LC_MESSAGES/cracklib.mo \
 		share/locale/cs/LC_MESSAGES/cracklib.mo \
 		share/locale/da/LC_MESSAGES/cracklib.mo \
 		share/locale/de/LC_MESSAGES/cracklib.mo \
 		share/locale/el/LC_MESSAGES/cracklib.mo \
 		share/locale/es/LC_MESSAGES/cracklib.mo \
 		share/locale/fi/LC_MESSAGES/cracklib.mo \
 		share/locale/fr/LC_MESSAGES/cracklib.mo \
 		share/locale/gu/LC_MESSAGES/cracklib.mo \
 		share/locale/hi/LC_MESSAGES/cracklib.mo \
 		share/locale/hu/LC_MESSAGES/cracklib.mo \
 		share/locale/it/LC_MESSAGES/cracklib.mo \
 		share/locale/ja/LC_MESSAGES/cracklib.mo \
 		share/locale/kn/LC_MESSAGES/cracklib.mo \
 		share/locale/ko/LC_MESSAGES/cracklib.mo \
 		share/locale/lt/LC_MESSAGES/cracklib.mo \
 		share/locale/ml/LC_MESSAGES/cracklib.mo \
 		share/locale/mr/LC_MESSAGES/cracklib.mo \
 		share/locale/nb/LC_MESSAGES/cracklib.mo \
 		share/locale/nl/LC_MESSAGES/cracklib.mo \
 		share/locale/or/LC_MESSAGES/cracklib.mo \
 		share/locale/pa/LC_MESSAGES/cracklib.mo \
 		share/locale/pl/LC_MESSAGES/cracklib.mo \
 		share/locale/pt/LC_MESSAGES/cracklib.mo \
 		share/locale/pt_BR/LC_MESSAGES/cracklib.mo \
 		share/locale/ru/LC_MESSAGES/cracklib.mo \
 		share/locale/sk/LC_MESSAGES/cracklib.mo \
 		share/locale/sl_SI/LC_MESSAGES/cracklib.mo \
 		share/locale/ta/LC_MESSAGES/cracklib.mo \
 		share/locale/te/LC_MESSAGES/cracklib.mo \
 		share/locale/tr/LC_MESSAGES/cracklib.mo \
 		share/locale/uk/LC_MESSAGES/cracklib.mo \
 		share/locale/zh_CN/LC_MESSAGES/cracklib.mo \
 		share/locale/zh_TW/LC_MESSAGES/cracklib.mo
 .endif
 
 .if defined(PYTHON_SLAVEPORT)
 pre-build:
 	cd ${WRKSRC}/lib && ${MAKE_CMD} libcrack.la
 
-regression-test: extract
-	@(cd ${BUILD_WKRSRC}; \
-	${PYTHON_CMD} -c \
-	"from test_${PORTNAME} import run; run(use_dictpath=\"${DICTFILE}\")")
+do-test:
+	@(cd ${BUILD_WKRSRC} && ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
+		${PYTHON_CMD} -c \
+		"from test_${PORTNAME} import run; run(use_dictpath=\"${DICTFILE:S|^${PREFIX}/|${LOCALBASE}/|}\")")
 .else
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
 	${LN} -s ${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/FascistCheck.3
 	@${MKDIR} ${STAGEDIR}${DICTPATH}
 	@PATH=$${PATH}:${STAGEDIR}${PREFIX}/sbin LD_LIBRARY_PATH=/lib:/usr/lib:${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/sbin/create-cracklib-dict -o ${STAGEDIR}${DICTPATH}/cracklib-words ${_DISTDIR}/${WORDS_DISTFILE}
 .endif
 
 .include <bsd.port.mk>