3 files changed, 33 insertions, 20 deletions

diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile
index a64b9c7ea1f8..4639db8cda65 100644
--- a/multimedia/cclive/Makefile
+++ b/multimedia/cclive/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cclive
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.4
 CATEGORIES=	multimedia net
 MASTER_SITES=	GOOGLE_CODE
 
@@ -15,16 +15,28 @@ COMMENT=	Lightweight command line video extraction utility
 
 LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
 
-.if !defined(WITHOUT_MAN)
-MAKE_ENV=	WITH_MAN=yes
-MAN1=		cclive.1
-.endif
+OPTIONS=	TITLE 	 "Enable video title parsing (req. Perl)" off \
+		SIGWINCH "Enable SIGWINCH handling; resize progressbar" on
 
-MAKE_ENV+=	V=1
+MAKE_ENV=	V=1
+MAKE_ENV+=	WITH_MAN=yes
+MAN1=		cclive.1
 
 PLIST_FILES=	bin/cclive
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TITLE)
+MAKE_ENV+=	WITH_PERL=yes
+USE_PERL5=	5.8.2+
+RUN_DEPENDS+=	p5-HTML-Parser>=3.59:${PORTSDIR}/www/p5-HTML-Parser
+.endif
+
+.if defined(WITH_SIGWINCH)
+MAKE_ENV+=	WITH_SIGWINCH=yes
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/cclive/distinfo b/multimedia/cclive/distinfo
index 1d91b587e6b7..313390724d68 100644
--- a/multimedia/cclive/distinfo
+++ b/multimedia/cclive/distinfo
@@ -1,3 +1,3 @@
-MD5 (cclive-0.2.3.tar.bz2) = 340a3270080efdac4f6e67d1c1503247
-SHA256 (cclive-0.2.3.tar.bz2) = df3c8517cef5c8d16a4f4f5572ca572b169f5d321c1018692cdabd36737225b6
-SIZE (cclive-0.2.3.tar.bz2) = 37914
+MD5 (cclive-0.2.4.tar.bz2) = 4ff5c3f225a2a926fd621944190f3c2a
+SHA256 (cclive-0.2.4.tar.bz2) = e03331f5ebe0e5e9f098e1d47eb3829a4dbda179267b4ac2cf11bddb1c345cd0
+SIZE (cclive-0.2.4.tar.bz2) = 41099
diff --git a/multimedia/cclive/files/patch-Makefile b/multimedia/cclive/files/patch-Makefile
index 5f25e3a2aec8..e9f44a26cbe7 100644
--- a/multimedia/cclive/files/patch-Makefile
+++ b/multimedia/cclive/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2009-02-15 18:25:44.000000000 +0200
-+++ Makefile	2009-02-15 18:27:39.000000000 +0200
-@@ -1,30 +1,26 @@
+--- Makefile.orig	2009-03-10 01:13:54.000000000 +0200
++++ Makefile	2009-03-10 01:15:18.000000000 +0200
+@@ -1,23 +1,20 @@
  # GNU Makefile for cclive.
  
 -SHELL = /bin/sh
@@ -29,23 +29,24 @@
  UNAME       = uname
  AWK         = awk
  CURL_CONFIG = curl-config
- GENGETOPT   = gengetopt
+@@ -25,10 +22,6 @@
  POD2MAN     = pod2man
+ PERL        = perl
  
 -WITH_MAN        = yes
- WITH_SIGWINCH   = yes
- 
+-WITH_SIGWINCH   = yes
+-WITH_PERL       = no
+-
  ifndef V
-@@ -40,14 +36,12 @@
+ QUIET_CC        = @echo '  ' CC $@;
+ QUIET_LINK      = @echo '  ' LINK $@;
+@@ -42,11 +35,9 @@
  CURL_CFLAGS  := $(shell sh -c "$(CURL_CONFIG) --cflags")
  CURL_LDFLAGS := $(shell sh -c "$(CURL_CONFIG) --libs")
  
 -CFLAGS      = -g -Wall
  ALL_CFLAGS  = -D_GNU_SOURCE -DOSNAME=\"$(OS_NAME)\" -I. $(CFLAGS)
  ALL_CFLAGS += $(CURL_CFLAGS)
- ifeq ($(WITH_SIGWINCH),yes)
- ALL_CFLAGS += -DWITH_SIGWINCH
- endif
  
 -LDFLAGS     =
  ALL_LDFLAGS = $(LDFLAGS)