ports/89300: [MAINTAINER] multimedia/bsdav: remove BROKEN

[Ion-Mihai IOnut Tetcu]

>Number:         89300
>Category:       ports
>Synopsis:       [MAINTAINER] multimedia/bsdav: remove BROKEN
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 19 23:50:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Ion-Mihai "IOnut" Tetcu
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Tecnik'93 
>Environment:


System: FreeBSD 6.0-STABLE #4: Wed Nov 16 15:38:12 EET 2005


>Description:


Remove BROKEN by:
- add OPTIONS for X11 support
- USE_XLIB= yes, build/install/pkg-plist depending on WITH_X11 state

IGNORE= We need to import bktv patch from OpenBsd to make it work

Bump PORTREVISION


>How-To-Repeat:





>Fix:


--- bsdav-1.3_to_1.3_1.diff begins here ---
diff -urN bsdav.cvs/Makefile bsdav/Makefile
--- bsdav.cvs/Makefile	Sat Nov 19 23:49:09 2005
+++ bsdav/Makefile	Sun Nov 20 01:31:41 2005
@@ -3,10 +3,12 @@
 # Whom:                Ion-Mihai "IOnut" Tetcu <itetcu at people.tecnik93.com>
 #
 # $FreeBSD: ports/multimedia/bsdav/Makefile,v 1.2 2005/11/14 01:53:12 kris Exp $
+# $Id: Makefile,v 1.8 2005/11/19 23:21:24 itetcu Rel $
 #
 
 PORTNAME=	bsdav
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.jakemsr.com/bsdav/ \
 	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
@@ -14,14 +16,27 @@
 MAINTAINER=	itetcu at people.tecnik93.com
 COMMENT=	BSD native set of programs for audio and video reading and writing
 
-BROKEN=		Does not compile
+#BROKEN=		Does not compile
+IGNORE=		We need to import bktv patches from OpenBSD to make it work
 
 INSTALLS_SHLIB=	yes
 
-MAN1=	audiorec.1 bktrrec.1 bsdavdemux.1 bsdavrec.1 btv.1 tunerctl.1 avplay.1 \
-	bktrplay.1 bsdavplay.1
+MAN1=	audiorec.1 bktrrec.1 bsdavdemux.1 bsdavrec.1 btv.1 tunerctl.1
 MAN5=	bsdav.5
 
+OPTIONS=	X11 "Build and install player progs (brings X libs)" on
+
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_X11)
+USE_XLIB=	yes
+MAN1+=	avplay.1 bktrplay.1 bsdavplay.1
+PLIST_SUB+=	X11=""
+.else
+MAKE_ENV+=	NO_X11=true
+PLIST_SUB+=	X11="@comment "
+.endif
+
 .if !( defined(NO_PORTDOCS) || defined(NOPORTDOCS) )
 PORTDOCS=	README
 post-install:
@@ -29,4 +44,4 @@
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN bsdav.cvs/files/patch-btv bsdav/files/patch-btv
--- bsdav.cvs/files/patch-btv	Thu Jan  1 02:00:00 1970
+++ bsdav/files/patch-btv	Sun Nov 20 01:16:34 2005
@@ -0,0 +1,26 @@
+--- btv.dist	Thu Aug 11 08:37:38 2005
++++ btv	Sat Nov  5 22:44:15 2005
+@@ -20,7 +20,7 @@
+ : ${CHANSET=nabcst}
+ 
+ 
+-function usage
++usage()
+ {
+ 	echo "Usage: tv [-vm] [-c channel] [-d directory] [-n norm]"
+ 	echo "          [-r command]"
+@@ -34,8 +34,13 @@
+ V=""
+ RET=0
+ 
++args=`getopt c:d:mn:r:v $*`
++if [ $? -ne 0 ]
++then
++	usage
++fi
++set -- ${args}
+ 
+-set -- `getopt c:d:mn:r:v $*` || usage
+ 
+ for i
+ do
diff -urN bsdav.cvs/pkg-plist bsdav/pkg-plist
--- bsdav.cvs/pkg-plist	Sat Nov 19 23:49:09 2005
+++ bsdav/pkg-plist	Sun Nov 20 01:16:35 2005
@@ -1,9 +1,9 @@
 bin/audiorec
-bin/avplay
-bin/bktrplay
+%%X11%%bin/avplay
+%%X11%%bin/bktrplay
 bin/bktrrec
 bin/bsdavdemux
-bin/bsdavplay
+%%X11%%bin/bsdavplay
 bin/bsdavrec
 bin/btv
 bin/tunerctl
--- bsdav-1.3_to_1.3_1.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: