Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Jun 2013 02:56:27 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/179594: security/revelation: Add RUN_DEPENDS for security/py-cracklib
Message-ID:  <20130616025627.bceea06bb1dfae6481d6da4d@yahoo.com>
Resent-Message-ID: <201306151810.r5FIA7C3033988@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179594
>Category:       ports
>Synopsis:       security/revelation: Add RUN_DEPENDS for security/py-cracklib
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 15 18:10:07 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Add RUN_DEPENDS for security/py-cracklib
- Support desktop-file-utils/shebangfix/shared-mime-info

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/security/revelation/Makefile security/revelation/Makefile
--- /usr/ports/security/revelation/Makefile	2013-04-26 19:57:11.000000000 +0900
+++ security/revelation/Makefile	2013-06-11 16:02:40.000000000 +0900
@@ -3,6 +3,7 @@
 
 PORTNAME=	revelation
 PORTVERSION=	0.4.14
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	http://cdn.bitbucket.org/erikg/revelation/downloads/
 
@@ -11,18 +12,20 @@
 
 LICENSE=	GPLv2
 
-FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/security/cracklib:patch
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
 LIB_DEPENDS=	crack:${PORTSDIR}/security/cracklib
-RUN_DEPENDS:=	${BULID_DEPENDS}
+RUN_DEPENDS:=	${BULID_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}cracklib>0:${PORTSDIR}/security/py-cracklib
 
 OPTIONS_DEFINE=	APPLET
 APPLET_DESC=	Build with applet
 
 USE_BZIP2=	yes
-USES=		pathfix pkgconfig gettext
-USE_GNOME=	desktopfileutils gnomeprefix pygnome2
+USES=		desktop-file-utils gettext pathfix pkgconfig \
+		shared-mime-info shebangfix
+SHEBANG_FILES= src/revelation.py
+USE_GNOME=	gnomeprefix pygnome2
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -47,27 +50,9 @@
 PLIST_SUB+=	APPLET="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-CRACK_WRKSRC=	$$(cd ${PORTSDIR}/security/cracklib && ${MAKE} -V WRKSRC)	
-
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|^#!.*|#!${SETENV} python|' ${WRKSRC}/src/revelation.py
-	@${REINPLACE_CMD} -e \
 		'/FascistCheck/s|(password)|(password, "${DICTPATH}")|' \
 		${WRKSRC}/src/lib/util.py
 
-post-build:
-	@(cd ${CRACK_WRKSRC}/python && ${CC} -shared -fPIC \
-		-I${PYTHON_INCLUDEDIR} -I${LOCALBASE}/include ${CFLAGS} \
-		-o _cracklib.so _cracklib.c -L${LOCALBASE}/lib -lcrack -lz)
-	@${PYTHON_CMD} -m compileall ${CRACK_WRKSRC}/python
-	@${PYTHON_CMD} -O -m compileall ${CRACK_WRKSRC}/python
-
-post-install:
-	(cd ${CRACK_WRKSRC}/python && ${INSTALL_DATA} \
-		_cracklib.so cracklib.py* \
-		${PYTHONPREFIX_SITELIBDIR}/revelation)
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/security/revelation/pkg-plist security/revelation/pkg-plist
--- /usr/ports/security/revelation/pkg-plist	2013-02-10 22:27:34.000000000 +0900
+++ security/revelation/pkg-plist	2013-06-11 15:57:54.000000000 +0900
@@ -1,5 +1,4 @@
 bin/revelation
-%%PYTHON_SITELIBDIR%%/revelation/_cracklib.so
 %%PYTHON_SITELIBDIR%%/revelation/PBKDF2.py
 %%PYTHON_SITELIBDIR%%/revelation/PBKDF2.pyc
 %%PYTHON_SITELIBDIR%%/revelation/PBKDF2.pyo
@@ -21,9 +20,6 @@
 %%PYTHON_SITELIBDIR%%/revelation/config.py
 %%PYTHON_SITELIBDIR%%/revelation/config.pyc
 %%PYTHON_SITELIBDIR%%/revelation/config.pyo
-%%PYTHON_SITELIBDIR%%/revelation/cracklib.py
-%%PYTHON_SITELIBDIR%%/revelation/cracklib.pyc
-%%PYTHON_SITELIBDIR%%/revelation/cracklib.pyo
 %%PYTHON_SITELIBDIR%%/revelation/data.py
 %%PYTHON_SITELIBDIR%%/revelation/data.pyc
 %%PYTHON_SITELIBDIR%%/revelation/data.pyo
@@ -112,7 +108,3 @@
 @dirrm %%PYTHON_SITELIBDIR%%/revelation/datahandler
 @dirrm %%PYTHON_SITELIBDIR%%/revelation/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/revelation
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130616025627.bceea06bb1dfae6481d6da4d>