8 files changed, 70 insertions, 96 deletions

diff --git a/security/cracklib/Makefile b/security/cracklib/Makefile
index 0e4f9dcbe812..1defd4cf7821 100644
--- a/security/cracklib/Makefile
+++ b/security/cracklib/Makefile
@@ -2,39 +2,76 @@
 # $FreeBSD$
 
 PORTNAME=	cracklib
-PORTVERSION=	2.8.22
+PORTVERSION=	2.9.0
 CATEGORIES=	security
+.if defined(PYTHON_SLAVEPORT)
+CATEGORIES+=	python
+.endif
 MASTER_SITES=	SF \
 		LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
 
 MAINTAINER=	sbz@FreeBSD.org
-COMMENT=	Password-checking library
+COMMENT?=	Password-checking library
 
 LICENSE=	LGPL21
 
-MAN3=		${PORTNAME}.3
-MLINKS=		${PORTNAME}.3 FascistCheck.3
-
+DICTPATH=	${PREFIX}/libdata/${PORTNAME}
+DICTFILE=	${DICTPATH}/pw_dict
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=--with-default-dict=${DICTPATH}
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-default-dict=${PREFIX}/libdata/${PORTNAME}
 
-OPTIONS_DEFINE=	PYTHON
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYTHON}
+.if defined(PYTHON_SLAVEPORT)
 USE_PYTHON=	yes
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=	PYTHON=""
+CONFIGURE_ARGS+=--with-python
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_cracklib.a \
+		%%PYTHON_SITELIBDIR%%/_cracklib.la \
+		%%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_SUB+=	PYTHON="@comment "
+CONFIGURE_ARGS+=--without-python
+PLIST_DIRS=	libdata/cracklib \
+		share/cracklib
+
+PLIST_FILES=	include/crack.h \
+		include/packer.h \
+		lib/libcrack.a \
+		lib/libcrack.la \
+		lib/libcrack.so \
+		lib/libcrack.so.11 \
+		libdata/cracklib/pw_dict.hwm \
+		libdata/cracklib/pw_dict.pwd \
+		libdata/cracklib/pw_dict.pwi \
+		sbin/cracklib-check \
+		sbin/cracklib-format \
+		sbin/cracklib-packer \
+		sbin/cracklib-unpacker \
+		sbin/create-cracklib-dict \
+		%%DATADIR%%/cracklib-small \
+		%%DATADIR%%/cracklib.magic
 .endif
 
+.if defined(PYTHON_SLAVEPORT)
+pre-build:
+	cd ${WRKSRC}/lib && ${MAKE} libcrack.la
+
+regression-test: extract
+	@(cd ${BUILD_WKRSRC}; \
+	${PYTHON_CMD} -c \
+	"from test_${PORTNAME} import run; run(use_dictpath=\"${DICTFILE}\")")
+.else
+MAN3=		${PORTNAME}.3
+MLINKS=		${PORTNAME}.3 FascistCheck.3
+
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/${MAN3} ${MAN3PREFIX}/man/man3/
-	@${MKDIR} ${PREFIX}/libdata/${PORTNAME}
-	${INSTALL_DATA} ${FILESDIR}/pw_dict* ${PREFIX}/libdata/${PORTNAME}/
+	@${MKDIR} ${DICTPATH}
+	${INSTALL_DATA} ${FILESDIR}/pw_dict* ${DICTPATH}/
+.endif
 
 .include <bsd.port.mk>
diff --git a/security/cracklib/distinfo b/security/cracklib/distinfo
index 62a8dd846056..383ab15530e0 100644
--- a/security/cracklib/distinfo
+++ b/security/cracklib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cracklib-2.8.22.tar.gz) = feaff49bfb513ec10b2618c00d2f7f60776ba93fcc5fa22dd3479dd9cad9f770
-SIZE (cracklib-2.8.22.tar.gz) = 631796
+SHA256 (cracklib-2.9.0.tar.gz) = 17fecdfa78c0b9b47afa1533ea99b5351c3cef770bbd9c8c34391827efecbdc0
+SIZE (cracklib-2.9.0.tar.gz) = 626322
diff --git a/security/cracklib/pkg-descr b/security/cracklib/pkg-descr
index 0f4eaed20b3b..bca64d7a6e33 100644
--- a/security/cracklib/pkg-descr
+++ b/security/cracklib/pkg-descr
@@ -2,19 +2,4 @@ CrackLib is a library containing a C function (well, lots of functions
 really, but you only need to use one of them) which may be used in a
 "passwd"-like program.
 
-The idea is simple: try to prevent users from choosing passwords that
-could be guessed by "Crack" by filtering them out, at source.
-
-CrackLib is an offshoot of the version 5 "Crack" software, and
-contains a considerable number of ideas nicked from the new software.
-
-
-NOTE THIS WELL: CrackLib is NOT a replacement "passwd" program.
-CrackLib is a LIBRARY.  CrackLib is what trendy marketdroid types would
-probably call an "enabler".
-
-The idea is that you wire it into your _own_ "passwd" program (if you
-have source); alternatively, you wire it into something like "shadow"
-from off of the net.  You can use it in other things, too.
-
-WWW: http://www.crypticide.com/users/alecm/
+WWW: http://sourceforge.net/projects/cracklib/
diff --git a/security/cracklib/pkg-plist b/security/cracklib/pkg-plist
deleted file mode 100644
index 72779c91aa49..000000000000
--- a/security/cracklib/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-include/crack.h
-include/packer.h
-lib/libcrack.a
-lib/libcrack.la
-lib/libcrack.so
-lib/libcrack.so.10
-libdata/cracklib/pw_dict.hwm
-libdata/cracklib/pw_dict.pwd
-libdata/cracklib/pw_dict.pwi
-sbin/cracklib-check
-sbin/cracklib-format
-sbin/cracklib-packer
-sbin/cracklib-unpacker
-sbin/create-cracklib-dict
-%%DATADIR%%/cracklib-small
-%%DATADIR%%/cracklib.magic
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_cracklib.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_cracklib.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_cracklib.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/cracklib.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/cracklib.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/cracklib.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/test_cracklib.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/test_cracklib.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/test_cracklib.pyo
-@dirrm libdata/cracklib
-@dirrm share/cracklib
diff --git a/security/py-cracklib/Makefile b/security/py-cracklib/Makefile
index fc9447137aef..32bb8dab1dd3 100644
--- a/security/py-cracklib/Makefile
+++ b/security/py-cracklib/Makefile
@@ -1,21 +1,22 @@
 # $FreeBSD$
 
-PORTNAME=	cracklib
-PORTVERSION=	2.8.19
-CATEGORIES=	security python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	crees@FreeBSD.org
-COMMENT=	CPython extension module wrapping the libcrack library
+COMMENT=	Python bindings for cracklib
+
+LICENSE=	LGPL21
 
 LIB_DEPENDS=	crack:${PORTSDIR}/security/cracklib
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYEASYINSTALL_ARCHDEP=	yes
+MASTERDIR=	${.CURDIR}/../cracklib
+BUILD_WRKSRC=	${WRKSRC}/python
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+PYTHON_SLAVEPORT=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+post-patch:
+	@${REINPLACE_CMD} -e \
+	"{s#__version__ = '[^']*'#__version__ = '${PORTVERSION}'#;}" \
+	${BUILD_WRKSRC}/*.py
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/security/py-cracklib/distinfo b/security/py-cracklib/distinfo
deleted file mode 100644
index 7da7dadc56f5..000000000000
--- a/security/py-cracklib/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cracklib-2.8.19.tar.gz) = 82ab941c259c26190930b21f8abb1945aea89f8876d84f21dd116a72596a2ff6
-SIZE (cracklib-2.8.19.tar.gz) = 4906
diff --git a/security/py-cracklib/pkg-descr b/security/py-cracklib/pkg-descr
deleted file mode 100644
index 09c23f2a4a59..000000000000
--- a/security/py-cracklib/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This CPython extension provides Python bindings for cracklib.
-It contains a pythonic interface to cracklib's functions and
-some Python convenience functions.
-
-WWW: https://pypi.python.org/pypi/cracklib
diff --git a/security/py-cracklib/pkg-plist b/security/py-cracklib/pkg-plist
deleted file mode 100644
index c957af6b557d..000000000000
--- a/security/py-cracklib/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cracklib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cracklib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/cracklib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_cracklibmodule.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_cracklib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_cracklib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_cracklib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%