Index: head/multimedia/xawtv/Makefile =================================================================== --- head/multimedia/xawtv/Makefile (revision 100504) +++ head/multimedia/xawtv/Makefile (revision 100505) @@ -1,95 +1,115 @@ # New ports collection makefile for: xawtv # Date created: 03 March 2001 # Whom: George Reid # # $FreeBSD$ # PORTNAME= xawtv PORTVERSION= 3.91 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= A TV viewing application and a few TV utilities BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ aa.1:${PORTSDIR}/graphics/aalib WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} USE_MOTIF= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes USE_REINPLACE= yes CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" MAKE_ENV= verbose=yes INSTALLS_SHLIB= yes FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk MAN1= alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.1 \ propwatch.1 radio.1 record.1 rootv.1 scantv.1 showriff.1 \ streamer.1 subtitles.1 ttv.1 v4l-info.1 v4lctl.1 webcam.1 \ xawtv-remote.1 xawtv.1 MAN5= xawtvrc.5 MAN8= v4l-conf.8 .include .if ${OSVERSION} < 500000 ONLY_FOR_ARCHS= i386 .else ONLY_FOR_ARCHS= alpha i386 ia64 .endif +.if defined(WITH_LIBZVBI) +LIB_DEPENDS+= zvbi.2:${PORTSDIR}/devel/libzvbi +CONFIGURE_ARGS+=--enable-zvbi +.if ${OSVERSION} > 500000 +PLIST_SUB+= ZVBI="" ZVBI5="" +.else +PLIST_SUB+= ZVBI="" ZVBI5="@comment " +.endif +.else +CONFIGURE_ARGS+=--enable-zvbi=no +PLIST_SUB+= ZVBI="@comment " ZVBI5="@comment " +.endif + .if defined(WITH_LIBDV) LIB_DEPENDS+= dv.3:${PORTSDIR}/multimedia/libdv CONFIGURE_ARGS+=--enable-dv PLIST_SUB+= DV= .else CONFIGURE_ARGS+=--enable-dv=no PLIST_SUB+= DV="@comment " .endif .if defined(WITH_MMX) CONFIGURE_ARGS+=--enable-mmx CFLAGS+= -DMMX=1 .endif .if defined(WITH_LIBQTIME) CONFIGURE_ARGS+=--enable-quicktime LIB_DEPENDS+= quicktime.0:${PORTSDIR}/multimedia/libquicktime PLIST_SUB+= QT= .else CONFIGURE_ARGS+=--enable-quicktime=no PLIST_SUB+= QT="@comment " .endif PLIST_SUB+= X11PREFIX=${X11BASE} pre-everything:: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" @${ECHO} " WITH_LIBDV=yes Enable reading/writing raw dv files" @${ECHO} " WITH_LIBQTIME=yes Enable quicktime support" + @${ECHO} " WITH_LIBZVBI=yes Enable libzvbi support" + @${ECHO} " (scantv compiles, but doesn't work for me)" @${ECHO} " WITH_MMX=yes Enable mmx support" @${ECHO} "" post-patch: @${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \ -e "s|/usr/local|${LOCALBASE}|g" \ -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure .for i in ${FILES_LIBJPEG} @${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i .endfor + +.if ${OSVERSION} < 500000 + @${REINPLACE_CMD} -e "s|FOUND_ZVBI|NOT_WORKING_&|g" \ + ${WRKSRC}/vbistuff/Subdir.mk +.endif .include Property changes on: head/multimedia/xawtv/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property Index: head/multimedia/xawtv/files/patch-configure =================================================================== --- head/multimedia/xawtv/files/patch-configure (revision 100504) +++ head/multimedia/xawtv/files/patch-configure (revision 100505) @@ -1,58 +1,76 @@ ---- configure.orig Fri Feb 7 12:02:43 2003 -+++ configure Thu Feb 13 16:57:29 2003 -@@ -5399,7 +5399,7 @@ +--- configure.orig Tue Apr 15 14:37:29 2003 ++++ configure Sun Feb 8 21:07:06 2004 +@@ -5287,7 +5287,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS +-LIBS="-lzvbi $LIBS" ++LIBS="-lzvbi -L/usr/X11R6/lib -lunicode -lpthread $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -5340,7 +5340,7 @@ + cat >>confdefs.h <<\_ACEOF + #define HAVE_ZVBI 1 + _ACEOF +- FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz" ++ FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -L/usr/X11R6/lib -lunicode -lpthread -lm -lpng -lz" + fi + + else +@@ -5427,7 +5427,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS -LIBS="-ldv -lm $LIBS" +LIBS="-ldv -lm $LIBPTHREAD $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -5452,7 +5452,7 @@ +@@ -5480,7 +5480,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_DV 1 _ACEOF - FOUND_DV="yes"; LIBDV="-ldv -lm" + FOUND_DV="yes"; LIBDV="-ldv -lm $LIBPTHREAD $LIBS" fi else -@@ -5466,7 +5466,7 @@ +@@ -5494,7 +5494,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lquicktime -ldl -lglib $LIBPTHREAD $LIBS" +LIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -5527,7 +5527,7 @@ +@@ -5555,7 +5555,7 @@ fi QTLIBS="" if test "$FOUND_LQT" = "yes"; then - QTLIBS="-lquicktime -ldl -lglib -lm" + QTLIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS" fi -@@ -6062,9 +6062,6 @@ +@@ -6218,9 +6218,6 @@ echo "$as_me:$LINENO: checking for X11 config directory" >&5 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6 x11conf=/usr/X11R6/lib/X11 -if test -d /etc/X11; then - x11conf=/etc/X11 -fi echo "$as_me:$LINENO: result: $x11conf" >&5 echo "${ECHO_T}$x11conf" >&6 -@@ -6072,9 +6069,6 @@ +@@ -6228,9 +6225,6 @@ echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6 resdir=/usr/X11R6/lib/X11 -if test -d /etc/X11/app-defaults; then - resdir=/etc/X11 -fi echo "$as_me:$LINENO: result: $resdir/app-defaults" >&5 echo "${ECHO_T}$resdir/app-defaults" >&6 Property changes on: head/multimedia/xawtv/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/multimedia/xawtv/files/patch-x11::Subdir.mk =================================================================== --- head/multimedia/xawtv/files/patch-x11::Subdir.mk (revision 100504) +++ head/multimedia/xawtv/files/patch-x11::Subdir.mk (revision 100505) @@ -1,28 +1,37 @@ ---- x11/Subdir.mk.orig Tue Jan 7 16:17:05 2003 -+++ x11/Subdir.mk Sat Jan 18 00:46:26 2003 -@@ -110,8 +110,8 @@ +--- x11/Subdir.mk.orig Mon Jan 12 18:56:17 2004 ++++ x11/Subdir.mk Mon Feb 9 18:49:10 2004 +@@ -15,7 +15,7 @@ + TARGETS-x11 += \ + x11/motv + endif +-ifeq ($(FOUND_MOTIF)$(FOUND_ZVBI),yesyes) ++ifeq ($(FOUND_MOTIF)$(NOT_WORKINGFOUND_ZVBI),yesyes) + TARGETS-x11 += \ + x11/mtt + endif +@@ -116,8 +116,8 @@ x11/pia : LDFLAGS := $(DLFLAGS) # compile flags -x11/complete-xaw.o : CFLAGS += -DATHENA=1 -x11/complete-motif.o : CFLAGS += -DMOTIF=1 +#x11/complete-xaw.o : CFLAGS += -DATHENA=1 +#x11/complete-motif.o : CFLAGS += -DMOTIF=1 # i18n -@@ -122,12 +122,12 @@ +@@ -128,12 +128,12 @@ # local targets x11/complete-xaw.o: x11/complete.c @$(echo_compile_c) - @$(compile_c) + @$(compile_c) -DATHENA=1 @$(fixup_deps) x11/complete-motif.o: x11/complete.c @$(echo_compile_c) - @$(compile_c) + @$(compile_c) -DMOTIF=1 @$(fixup_deps) Property changes on: head/multimedia/xawtv/files/patch-x11::Subdir.mk ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/multimedia/xawtv/pkg-plist =================================================================== --- head/multimedia/xawtv/pkg-plist (revision 100504) +++ head/multimedia/xawtv/pkg-plist (revision 100505) @@ -1,88 +1,89 @@ bin/dump-mixers bin/motv bin/ntsc-cc bin/pia bin/propwatch bin/record bin/rootv +%%ZVBI%%bin/scantv bin/showqt bin/showriff bin/streamer bin/subtitles bin/ttv bin/v4lctl bin/webcam bin/xawtv bin/xawtv-remote lib/xawtv/bilinear.so @comment lib/xawtv/conv-audio.so lib/xawtv/conv-mjpeg.so lib/xawtv/cubic.so lib/xawtv/drv0-bsd.so lib/xawtv/flt-disor.so lib/xawtv/flt-gamma.so lib/xawtv/flt-invert.so lib/xawtv/flt-smooth.so lib/xawtv/linear-blend.so lib/xawtv/linedoubler.so lib/xawtv/read-avi.so %%DV%%lib/xawtv/read-dv.so %%QT%%lib/xawtv/read-qt.so lib/xawtv/snd-oss.so lib/xawtv/write-avi.so %%DV%%lib/xawtv/write-dv.so %%QT%%lib/xawtv/write-qt.so @dirrm lib/xawtv man/es/man1/fbtv.1 man/es/man1/rootv.1 man/es/man1/scantv.1 man/es/man1/streamer.1 man/es/man1/subtitles.1 man/es/man1/ttv.1 man/es/man1/v4lctl.1 man/es/man1/xawtv-remote.1 man/es/man1/xawtv.1 man/es/man5/xawtvrc.5 man/es/man8/v4l-conf.8 man/fr/man1/xawtv.1 @dirrm man/fr/man1 @dirrm man/fr @dirrm man/es/man8 @dirrm man/es/man5 @dirrm man/es/man1 @dirrm man/es share/xawtv/Index.map share/xawtv/argentina.list share/xawtv/ccir-h.list share/xawtv/ccir-i-iii.list share/xawtv/ccir-sl-sh.list share/xawtv/europe-east.list share/xawtv/europe-west.list share/xawtv/ntsc-bcast-jp.list share/xawtv/ntsc-bcast.list share/xawtv/ntsc-cable-ca.list share/xawtv/ntsc-cable-jp.list share/xawtv/ntsc-cable.list share/xawtv/ntsc-hrc.list share/xawtv/oirt-h.list share/xawtv/oirt-i-iii.list share/xawtv/oirt-sl-sh.list share/xawtv/pal-australia-optus.list share/xawtv/pal-australia.list share/xawtv/pal-bcast-cn.list share/xawtv/pal-bcast-za.list share/xawtv/pal-ireland.list share/xawtv/pal-italy.list share/xawtv/pal-newzealand.list share/xawtv/secam-france.list share/xawtv/secam-russia.list share/xawtv/uhf.list @dirrm share/xawtv @cwd %%X11BASE%% lib/X11/app-defaults/MoTV lib/X11/de/app-defaults/MoTV lib/X11/it/app-defaults/MoTV @dirrm lib/X11/it/app-defaults @dirrm lib/X11/it @dirrm lib/X11/de/app-defaults @dirrm lib/X11/de Property changes on: head/multimedia/xawtv/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property