- Update to version 0.7

- Make PREFIX-compliant
- Added a PKGREQ script to check for Python version >= 2.0

6 files changed, 47 insertions, 8 deletions

diff --git a/sysutils/lfm/Makefile b/sysutils/lfm/Makefile
index 6b8a50e78dc7..7ed9edd22f4f 100644
--- a/sysutils/lfm/Makefile
+++ b/sysutils/lfm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	lfm
-PORTVERSION=	0.4
+PORTVERSION=	0.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.terra.es/personal7/inigoserna/lfm/
 
@@ -19,7 +19,10 @@ SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 do-build:
 	@${SETUP_CMD} build
 
+pre-install:
+	@${SH} ${PKGREQ} INSTALL
+
 do-install:
-	@${SETUP_CMD} install
+	@${SETUP_CMD} install -c -O1 --prefix=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/sysutils/lfm/distinfo b/sysutils/lfm/distinfo
index 852a168e34b7..acf8557ff1ef 100644
--- a/sysutils/lfm/distinfo
+++ b/sysutils/lfm/distinfo
@@ -1 +1 @@
-MD5 (lfm-0.4.tar.gz) = 2afd6f1c276b1d36c62780d15aafc8e9
+MD5 (lfm-0.7.tar.gz) = e2d3cdcfbfdaa64f8039c643faffb48e
diff --git a/sysutils/lfm/pkg-comment b/sysutils/lfm/pkg-comment
index 23afde53e9bd..e40800caa80a 100644
--- a/sysutils/lfm/pkg-comment
+++ b/sysutils/lfm/pkg-comment
@@ -1 +1 @@
-Last File Manager
+Last File Manager, a simple 'commander'-type file manager
diff --git a/sysutils/lfm/pkg-descr b/sysutils/lfm/pkg-descr
index 5f9a7d8e29f4..17ef69789829 100644
--- a/sysutils/lfm/pkg-descr
+++ b/sysutils/lfm/pkg-descr
@@ -1,5 +1,6 @@
-Last File Manager is (tries to be) a simple 'midnight commander'-type
-application for UNIX console. 
-It is written in python and uses curses module. 
+Last File Manager - lfm - is a simple 'midnight commander'-type file manager.
+It includes a simple file viewer, pyview.  Lfm is a curses-based application
+for the UNIX console. 
 
-WWW: http://www.terra.es/personal7/inigoserna/lfm/
+Author: Iņigo Serna <inigoserna@terra.es>
+WWW:    http://www.terra.es/personal7/inigoserna/lfm/
diff --git a/sysutils/lfm/pkg-plist b/sysutils/lfm/pkg-plist
index 6acd756e2de1..88ed95849504 100644
--- a/sysutils/lfm/pkg-plist
+++ b/sysutils/lfm/pkg-plist
@@ -1,10 +1,28 @@
 bin/lfm
+bin/pyview
 lib/%%PYTHON_VERSION%%/site-packages/lfm/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/lfm/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/lfm/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/lfm/files.py
 lib/%%PYTHON_VERSION%%/site-packages/lfm/files.pyc
+lib/%%PYTHON_VERSION%%/site-packages/lfm/files.pyo
 lib/%%PYTHON_VERSION%%/site-packages/lfm/lfm.py
 lib/%%PYTHON_VERSION%%/site-packages/lfm/lfm.pyc
+lib/%%PYTHON_VERSION%%/site-packages/lfm/lfm.pyo
 lib/%%PYTHON_VERSION%%/site-packages/lfm/messages.py
 lib/%%PYTHON_VERSION%%/site-packages/lfm/messages.pyc
+lib/%%PYTHON_VERSION%%/site-packages/lfm/messages.pyo
+lib/%%PYTHON_VERSION%%/site-packages/lfm/preferences.py
+lib/%%PYTHON_VERSION%%/site-packages/lfm/preferences.pyc
+lib/%%PYTHON_VERSION%%/site-packages/lfm/preferences.pyo
+lib/%%PYTHON_VERSION%%/site-packages/lfm/pyview.py
+lib/%%PYTHON_VERSION%%/site-packages/lfm/pyview.pyc
+lib/%%PYTHON_VERSION%%/site-packages/lfm/pyview.pyo
+share/doc/lfm/COPYING
+share/doc/lfm/ChangeLog
+share/doc/lfm/NEWS
+share/doc/lfm/README
+share/doc/lfm/README.pyview
+share/doc/lfm/TODO
+@dirrm share/doc/lfm
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/lfm
diff --git a/sysutils/lfm/pkg-req b/sysutils/lfm/pkg-req
new file mode 100644
index 000000000000..58b7b29e380c
--- /dev/null
+++ b/sysutils/lfm/pkg-req
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PATH=$PATH:/usr/local/bin
+
+if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
+  PYTHON_GT=`python -c 'import string, sys; \
+                        print string.split(sys.version)[0] >= "2.0"'`
+  if [ "x${PYTHON_GT}" = "x1" ]; then
+    exit 0
+  else
+    echo "-----------------------------------------------------------"
+    echo "lfm requires Python version 2.0 or greater -"
+    echo "  please update your Python installation before proceeding."
+    echo "-----------------------------------------------------------"
+    exit 1
+  fi
+fi