Bug 186469

Comment 1 Edwin Groothuis 2014-02-05 04:31:55 UTC

Responsible Changed
From-To: freebsd-ports-bugs->swills

swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool)

Comment 2 dfilter service 2014-02-05 15:55:26 UTC

Author: swills
Date: Wed Feb  5 15:55:17 2014
New Revision: 342738
URL: http://svnweb.freebsd.org/changeset/ports/342738
QAT: https://qat.redports.org/buildarchive/r342738/

Log:
  - Patch ext/img_display.py with correct lib path [1]
  - Convert to staging
  
  PR:		ports/186469 [1]
  Submitted by:	Jin-Sih Lin <linpct@gmail.com> (maintainer) [1]

Added:
  head/sysutils/py-ranger/files/
  head/sysutils/py-ranger/files/patch-img_display.py   (contents, props changed)
Modified:
  head/sysutils/py-ranger/Makefile
  head/sysutils/py-ranger/pkg-plist

Modified: head/sysutils/py-ranger/Makefile
==============================================================================
--- head/sysutils/py-ranger/Makefile	Wed Feb  5 15:54:15 2014	(r342737)
+++ head/sysutils/py-ranger/Makefile	Wed Feb  5 15:55:17 2014	(r342738)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ranger
 PORTVERSION=	1.6.1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://ranger.nongnu.org/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,10 +14,8 @@ COMMENT=	Ranger is a file manager with V
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-MAN1=		ranger.1 rifle.1
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|setuptools|distutils.core|; s|share/man/man|man/man|;s|share/doc|doc|' ${WRKSRC}/${PYSETUP}
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/ranger/ext/img_display.py
 
 .include <bsd.port.mk>

Added: head/sysutils/py-ranger/files/patch-img_display.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-ranger/files/patch-img_display.py	Wed Feb  5 15:55:17 2014	(r342738)
@@ -0,0 +1,11 @@
+--- ranger/ext/img_display.py.orig	2014-02-05 11:33:29.000000000 +0800
++++ ranger/ext/img_display.py	2014-02-05 11:34:00.000000000 +0800
+@@ -13,7 +13,7 @@
+ import termios, fcntl, struct, sys, os
+ from subprocess import Popen, PIPE
+ 
+-W3MIMGDISPLAY_PATH = '/usr/lib/w3m/w3mimgdisplay'
++W3MIMGDISPLAY_PATH = '%%LOCALBASE%%/libexec/w3m/w3mimgdisplay'
+ W3MIMGDISPLAY_OPTIONS = []
+ 
+ class ImgDisplayUnsupportedException(Exception):

Modified: head/sysutils/py-ranger/pkg-plist
==============================================================================
--- head/sysutils/py-ranger/pkg-plist	Wed Feb  5 15:54:15 2014	(r342737)
+++ head/sysutils/py-ranger/pkg-plist	Wed Feb  5 15:55:17 2014	(r342738)
@@ -24,6 +24,8 @@ doc/ranger/examples/rifle_sxiv.sh
 doc/ranger/examples/vim_file_chooser.vim
 doc/ranger/tools/print_colors.py
 doc/ranger/tools/print_keys.py
+man/man1/ranger.1.gz
+man/man1/rifle.1.gz
 %%PYTHON_SITELIBDIR%%/ranger/__init__.py
 %%PYTHON_SITELIBDIR%%/ranger/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ranger/__init__.pyo
@@ -263,3 +265,4 @@ doc/ranger/tools/print_keys.py
 @dirrm doc/ranger/config/colorschemes
 @dirrm doc/ranger/config
 @dirrm doc/ranger
+@dirrmtry doc
_______________________________________________
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 Steve Wills 2014-02-05 15:55:32 UTC

State Changed
From-To: open->closed

Committed, with minor changes. Thanks!