- Update to 0.4.4

- Add NO_INSTALL_MANPAGES knob
- Add LastFm site to pkg-descr

10 files changed, 54 insertions, 12 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 68df6a4ce848..acd1bd4b66a0 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.4
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -25,8 +25,12 @@ CONFLICTS=	clive-[0-9]*
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+.if !defined(NO_INSTALL_MANPAGES)
 MAN1=	${PORTNAME}.1
 MANCOMPRESSED=	yes
+.else
+MAKE_ENV=	NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES}
+.endif
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
diff --git a/multimedia/clive/distinfo b/multimedia/clive/distinfo
index aecdbd3fdf8a..661b83f98f17 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.4.3.tar.gz) = c5167e755d648dbf33c11bd6a4bf6f75
-SHA256 (clive/clive-0.4.3.tar.gz) = 68c0b75e15fd31dbcb6aa186cf8666f05ad690c684805df6da1877bd7cd1be77
-SIZE (clive/clive-0.4.3.tar.gz) = 62160
+MD5 (clive/clive-0.4.4.tar.gz) = daaf5b58b8c11686fa5366408bd6032c
+SHA256 (clive/clive-0.4.4.tar.gz) = 93add7d78774af768e5b7519c82cdb03b4e078d06a0e22733c532485dfc992ce
+SIZE (clive/clive-0.4.4.tar.gz) = 62062
diff --git a/multimedia/clive/files/patch-setup.py b/multimedia/clive/files/patch-setup.py
new file mode 100644
index 000000000000..2ef7786c977d
--- /dev/null
+++ b/multimedia/clive/files/patch-setup.py
@@ -0,0 +1,14 @@
+--- setup.py	2008-01-25 04:37:50.000000000 +0100
++++ setup.py.port	2008-02-03 11:40:03.000000000 +0100
+@@ -59,7 +59,10 @@
+ 
+ manpage = 'man/clive.1'
+ manpage_gz = manpage + '.gz'
+-data_files = [ ('man/man1', [manpage_gz]) ]
++if not os.environ.has_key('NO_INSTALL_MANPAGES'):
++	data_files = [ ('man/man1', [manpage_gz]) ]
++else:
++	data_files = []
+ 
+ setup_args = dict(
+ 	name = 'clive',
diff --git a/multimedia/clive/pkg-descr b/multimedia/clive/pkg-descr
index ba31f9919076..edc3b69577c3 100644
--- a/multimedia/clive/pkg-descr
+++ b/multimedia/clive/pkg-descr
@@ -1,6 +1,6 @@
 clive is a command line tool for extracting videos from Youtube,
-Google Video, Dailymotion, Guba (free), Stage6, and Metacafe websites.
-clive is written in Python and is cross-platform.
+Google Video, Dailymotion, Guba (free), Stage6, Metacafe, LastFm
+websites. clive is written in Python and is cross-platform.
 
 Main features:
 
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
index 4bbd1ac04956..f5575bd6b0a6 100644
--- a/multimedia/clive/pkg-plist
+++ b/multimedia/clive/pkg-plist
@@ -15,6 +15,9 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/history.py
 %%PYTHON_SITELIBDIR%%/clive/history.pyc
 %%PYTHON_SITELIBDIR%%/clive/history.pyo
+%%PYTHON_SITELIBDIR%%/clive/main.py
+%%PYTHON_SITELIBDIR%%/clive/main.pyc
+%%PYTHON_SITELIBDIR%%/clive/main.pyo
 %%PYTHON_SITELIBDIR%%/clive/nomad.py
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyc
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyo
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index 68df6a4ce848..acd1bd4b66a0 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.4
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -25,8 +25,12 @@ CONFLICTS=	clive-[0-9]*
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+.if !defined(NO_INSTALL_MANPAGES)
 MAN1=	${PORTNAME}.1
 MANCOMPRESSED=	yes
+.else
+MAKE_ENV=	NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES}
+.endif
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
diff --git a/multimedia/clive1/distinfo b/multimedia/clive1/distinfo
index aecdbd3fdf8a..661b83f98f17 100644
--- a/multimedia/clive1/distinfo
+++ b/multimedia/clive1/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.4.3.tar.gz) = c5167e755d648dbf33c11bd6a4bf6f75
-SHA256 (clive/clive-0.4.3.tar.gz) = 68c0b75e15fd31dbcb6aa186cf8666f05ad690c684805df6da1877bd7cd1be77
-SIZE (clive/clive-0.4.3.tar.gz) = 62160
+MD5 (clive/clive-0.4.4.tar.gz) = daaf5b58b8c11686fa5366408bd6032c
+SHA256 (clive/clive-0.4.4.tar.gz) = 93add7d78774af768e5b7519c82cdb03b4e078d06a0e22733c532485dfc992ce
+SIZE (clive/clive-0.4.4.tar.gz) = 62062
diff --git a/multimedia/clive1/files/patch-setup.py b/multimedia/clive1/files/patch-setup.py
new file mode 100644
index 000000000000..2ef7786c977d
--- /dev/null
+++ b/multimedia/clive1/files/patch-setup.py
@@ -0,0 +1,14 @@
+--- setup.py	2008-01-25 04:37:50.000000000 +0100
++++ setup.py.port	2008-02-03 11:40:03.000000000 +0100
+@@ -59,7 +59,10 @@
+ 
+ manpage = 'man/clive.1'
+ manpage_gz = manpage + '.gz'
+-data_files = [ ('man/man1', [manpage_gz]) ]
++if not os.environ.has_key('NO_INSTALL_MANPAGES'):
++	data_files = [ ('man/man1', [manpage_gz]) ]
++else:
++	data_files = []
+ 
+ setup_args = dict(
+ 	name = 'clive',
diff --git a/multimedia/clive1/pkg-descr b/multimedia/clive1/pkg-descr
index ba31f9919076..edc3b69577c3 100644
--- a/multimedia/clive1/pkg-descr
+++ b/multimedia/clive1/pkg-descr
@@ -1,6 +1,6 @@
 clive is a command line tool for extracting videos from Youtube,
-Google Video, Dailymotion, Guba (free), Stage6, and Metacafe websites.
-clive is written in Python and is cross-platform.
+Google Video, Dailymotion, Guba (free), Stage6, Metacafe, LastFm
+websites. clive is written in Python and is cross-platform.
 
 Main features:
 
diff --git a/multimedia/clive1/pkg-plist b/multimedia/clive1/pkg-plist
index 4bbd1ac04956..f5575bd6b0a6 100644
--- a/multimedia/clive1/pkg-plist
+++ b/multimedia/clive1/pkg-plist
@@ -15,6 +15,9 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/history.py
 %%PYTHON_SITELIBDIR%%/clive/history.pyc
 %%PYTHON_SITELIBDIR%%/clive/history.pyo
+%%PYTHON_SITELIBDIR%%/clive/main.py
+%%PYTHON_SITELIBDIR%%/clive/main.pyc
+%%PYTHON_SITELIBDIR%%/clive/main.pyo
 %%PYTHON_SITELIBDIR%%/clive/nomad.py
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyc
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyo