From owner-svn-ports-head@FreeBSD.ORG Mon Jun 17 15:32:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C9A8079F; Mon, 17 Jun 2013 15:32:05 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 924311E18; Mon, 17 Jun 2013 15:32:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HFW5wS035643; Mon, 17 Jun 2013 15:32:05 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HFW5tf035641; Mon, 17 Jun 2013 15:32:05 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201306171532.r5HFW5tf035641@svn.freebsd.org> From: Martin Wilke Date: Mon, 17 Jun 2013 15:32:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321136 - head/security/revelation X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 15:32:07 -0000 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 - -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 +.include 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