Bug 179594 - security/revelation: Add RUN_DEPENDS for security/py-cracklib
Summary: security/revelation: Add RUN_DEPENDS for security/py-cracklib
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-15 19:10 UTC by tkato432
Modified: 2013-07-18 08:37 UTC (History)
0 users

See Also:


Attachments
file.diff (3.31 KB, patch)
2013-06-15 19:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-06-15 19:10:07 UTC
- Add RUN_DEPENDS for security/py-cracklib
- Support desktop-file-utils/shebangfix/shared-mime-info
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-15 19:11:36 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-06-17 16:32:21 UTC
Author: miwi
Date: Mon Jun 17 15:32:04 2013
New Revision: 321136
URL: http://svnweb.freebsd.org/changeset/ports/321136

Log:
  - Add RUN_DEPENDS for security/py-cracklib
  - Support desktop-file-utils/shebangfix/shared-mime-info
  
  PR:		179594
  Submitted by:	Ports Fury

Modified:
  head/security/revelation/Makefile
  head/security/revelation/pkg-plist

Modified: head/security/revelation/Makefile
==============================================================================
--- head/security/revelation/Makefile	Mon Jun 17 15:31:58 2013	(r321135)
+++ head/security/revelation/Makefile	Mon Jun 17 15:32:04 2013	(r321136)
@@ -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 @@ COMMENT=	Password manager for the GNOME 
 
 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=""
 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>

Modified: head/security/revelation/pkg-plist
==============================================================================
--- head/security/revelation/pkg-plist	Mon Jun 17 15:31:58 2013	(r321135)
+++ head/security/revelation/pkg-plist	Mon Jun 17 15:32:04 2013	(r321136)
@@ -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 @@ bin/revelation
 %%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 @@ share/mime/packages/revelation.xml
 @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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2013-07-18 08:37:37 UTC
State Changed
From-To: open->closed

Committed. Thanks!