From tkato432@yahoo.com  Sat Jun 15 18:02:07 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id C08318F9
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Jun 2013 18:02:00 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C3D011F9
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Jun 2013 18:02:00 +0000 (UTC)
Received: from localhost.localdomain (ZT030083.ppp.dion.ne.jp [59.128.30.83])
	by msa103lp.auone-net.jp (au one net msa) with ESMTP id F032447C036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 16 Jun 2013 03:01:57 +0900 (JST)
Message-Id: <20130616025627.bceea06bb1dfae6481d6da4d@yahoo.com>
Date: Sun, 16 Jun 2013 02:56:27 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: security/revelation: Add RUN_DEPENDS for security/py-cracklib

>Number:         179594
>Category:       ports
>Synopsis:       security/revelation: Add RUN_DEPENDS for security/py-cracklib
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 15 18:10:07 UTC 2013
>Closed-Date:    Thu Jul 18 07:37:38 UTC 2013
>Last-Modified:  Thu Jul 18 07:37:38 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 15 18:11:36 UTC 2013 
Responsible-Changed-Why:  
miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179594 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179594: commit references a PR
Date: Mon, 17 Jun 2013 15:32:21 +0000 (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"
 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Jul 18 07:37:37 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179594 
>Unformatted:
