Date: Mon, 20 May 2013 11:16:57 +0000 (UTC) From: Oliver Lehmann <oliver@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318593 - in head/multimedia/xawtv: . files Message-ID: <201305201116.r4KBGvGr042598@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oliver Date: Mon May 20 11:16:57 2013 New Revision: 318593 URL: http://svnweb.freebsd.org/changeset/ports/318593 Log: update to 3.103 Deleted: head/multimedia/xawtv/files/patch-common::Subdir.mk head/multimedia/xawtv/files/patch-libng-plugins-read-qt.c head/multimedia/xawtv/files/patch-libng-plugins-write-qt.c head/multimedia/xawtv/files/patch-x11:vbi-gui.c Modified: head/multimedia/xawtv/Makefile (contents, props changed) head/multimedia/xawtv/distinfo (contents, props changed) head/multimedia/xawtv/files/patch-Makefile.in (contents, props changed) head/multimedia/xawtv/files/patch-configure (contents, props changed) head/multimedia/xawtv/pkg-descr (contents, props changed) head/multimedia/xawtv/pkg-plist (contents, props changed) Modified: head/multimedia/xawtv/Makefile ============================================================================== --- head/multimedia/xawtv/Makefile Mon May 20 10:43:12 2013 (r318592) +++ head/multimedia/xawtv/Makefile Mon May 20 11:16:57 2013 (r318593) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= xawtv -PORTVERSION= 3.95 -PORTREVISION= 12 +PORTVERSION= 3.103 CATEGORIES= multimedia -MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ +MASTER_SITES= http://linuxtv.org/downloads/xawtv/ MAINTAINER= oliver@FreeBSD.org COMMENT= A TV viewing application and a few TV utilities @@ -22,6 +21,7 @@ OPTIONS_DEFINE_i386= MMX OPTIONS_DEFAULT= AALIB ZVBI_DESC= Enable libzvbi support +USE_BZIP2= yes USE_MOTIF= yes GNU_CONFIGURE= yes USE_GMAKE= yes @@ -33,7 +33,7 @@ MAKE_ENV= verbose=yes USE_LDCONFIG= yes ONLY_FOR_ARCHS= alpha amd64 i386 -FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk +FILES_LIBJPEG= console/Subdir.mk x11/Subdir.mk libng/plugins/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 \ @@ -94,6 +94,10 @@ post-patch: s|-lquicktime|-L${LOCALBASE}/lib &|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-ldl||g' \ + ${WRKSRC}/console/Subdir.mk \ + ${WRKSRC}/x11/Subdir.mk + .for i in ${FILES_LIBJPEG} @${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i .endfor Modified: head/multimedia/xawtv/distinfo ============================================================================== --- head/multimedia/xawtv/distinfo Mon May 20 10:43:12 2013 (r318592) +++ head/multimedia/xawtv/distinfo Mon May 20 11:16:57 2013 (r318593) @@ -1,2 +1,2 @@ -SHA256 (xawtv-3.95.tar.gz) = 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f -SIZE (xawtv-3.95.tar.gz) = 555731 +SHA256 (xawtv-3.103.tar.bz2) = 2cf3a91b5d59a094bd86e101684a65c0e3d09225c11a787e060fa01bfbc8dd52 +SIZE (xawtv-3.103.tar.bz2) = 475816 Modified: head/multimedia/xawtv/files/patch-Makefile.in ============================================================================== --- head/multimedia/xawtv/files/patch-Makefile.in Mon May 20 10:43:12 2013 (r318592) +++ head/multimedia/xawtv/files/patch-Makefile.in Mon May 20 11:16:57 2013 (r318593) @@ -1,7 +1,7 @@ ---- Makefile.in.orig Tue Jan 7 16:17:13 2003 -+++ Makefile.in Sat Jan 18 00:43:02 2003 -@@ -65,23 +65,11 @@ - USE_MMX := @USE_MMX@ +--- Makefile.in.orig 2013-04-02 15:19:10.000000000 +0200 ++++ Makefile.in 2013-05-15 11:20:52.000000000 +0200 +@@ -68,25 +68,12 @@ + FOUND_EXPLAIN := @FOUND_EXPLAIN@ # build final cflags -CFLAGS := @CFLAGS@ @@ -9,19 +9,21 @@ -CFLAGS += $(LFS_FLAGS) -CFLAGS += $(X11_FLAGS) -CFLAGS += $(LIB_FLAGS) +-CFLAGS += $(QT_FLAGS) -CFLAGS += -DCONFIGFILE='"$(config)"' -CFLAGS += -DLIBDIR='"$(libdir)"' -CFLAGS += -DDATADIR='"$(datadir)"' -CFLAGS += -DVERSION='"$(VERSION)"' -+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC ++CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) $(QT_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC CXXFLAGS := $(CFLAGS) # for gcc3 #CFLAGS += -std-gnu99 -- + -# shared objects need -fPIC -%.so : CFLAGS += -fPIC -%.so : CXXFLAGS += -fPIC - +- # libraries LDLIBS := @LDLIBS@ + Modified: head/multimedia/xawtv/files/patch-configure ============================================================================== --- head/multimedia/xawtv/files/patch-configure Mon May 20 10:43:12 2013 (r318592) +++ head/multimedia/xawtv/files/patch-configure Mon May 20 11:16:57 2013 (r318593) @@ -1,49 +1,56 @@ ---- configure.orig Wed Aug 18 17:48:30 2004 -+++ configure Wed Aug 18 20:20:36 2004 -@@ -5710,7 +5710,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 +--- configure.orig 2013-04-02 15:20:33.000000000 +0200 ++++ configure 2013-05-15 11:26:05.000000000 +0200 +@@ -5244,7 +5244,7 @@ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lzvbi $LIBPTHREAD $LIBS" +LIBS="-lunicode -lzvbi $LIBPTHREAD $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5772,7 +5772,7 @@ - cat >>confdefs.h <<\_ACEOF - #define HAVE_ZVBI 1 - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5277,7 +5277,7 @@ + if test "x$ac_cv_lib_zvbi_vbi_capture_fd" = xyes; then : + + $as_echo "#define HAVE_ZVBI 1" >>confdefs.h - FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz" -+ FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -L/usr/X11R6/lib -lunicode -lpthread -lm -lpng -lz" ++ FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lunicode -lpthread -lm -lpng -lz" fi else -@@ -5930,7 +5930,7 @@ - cat >>confdefs.h <<\_ACEOF - #define HAVE_DV 1 - _ACEOF +@@ -5379,7 +5379,7 @@ + if test "x$ac_cv_lib_dv_dv_decoder_new" = xyes; then : + + $as_echo "#define HAVE_DV 1" >>confdefs.h - FOUND_DV="yes"; LIBDV="-ldv -lm" + FOUND_DV="yes"; LIBDV="-ldv -lm $LIBPTHREAD $LIBS" fi else -@@ -6768,9 +6768,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 +@@ -5914,23 +5914,14 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 config directory" >&5 + $as_echo_n "checking for X11 config directory... " >&6; } +-x11conf=/usr/lib/X11 -if test -d /etc/X11; then - x11conf=/etc/X11 -fi - echo "$as_me:$LINENO: result: $x11conf" >&5 - echo "${ECHO_T}$x11conf" >&6 - -@@ -6778,9 +6775,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 ++x11conf=/etc/X11 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $x11conf" >&5 + $as_echo "$x11conf" >&6; } + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 app-defaults directory" >&5 + $as_echo_n "checking for X11 app-defaults directory... " >&6; } +-resdir=/usr/lib/X11 +-if test -d /usr/share/X11/app-defaults; then +- resdir=/usr/share/X11 +-fi -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 - ++resdir=/usr/X11R6/lib/X11 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $resdir/app-defaults" >&5 + $as_echo "$resdir/app-defaults" >&6; } + + Modified: head/multimedia/xawtv/pkg-descr ============================================================================== --- head/multimedia/xawtv/pkg-descr Mon May 20 10:43:12 2013 (r318592) +++ head/multimedia/xawtv/pkg-descr Mon May 20 11:16:57 2013 (r318593) @@ -1,4 +1,4 @@ This is a _simple_ xaw-based TV Program which uses the bttv driver or video4linux (included in 2.1.x). Copy Policy is GNU GPL. -WWW: http://bytesex.org/xawtv/ +WWW: http://linuxtv.org/ Modified: head/multimedia/xawtv/pkg-plist ============================================================================== --- head/multimedia/xawtv/pkg-plist Mon May 20 10:43:12 2013 (r318592) +++ head/multimedia/xawtv/pkg-plist Mon May 20 11:16:57 2013 (r318593) @@ -84,15 +84,14 @@ share/xawtv/uhf.list lib/X11/app-defaults/MoTV lib/X11/app-defaults/Xawtv lib/X11/app-defaults/mtt -lib/X11/de/app-defaults/MoTV lib/X11/de_DE.UTF-8/app-defaults/MoTV -lib/X11/fr/app-defaults/MoTV -lib/X11/it/app-defaults/MoTV -@dirrm lib/X11/it/app-defaults -@dirrm lib/X11/it -@dirrm lib/X11/fr/app-defaults -@dirrm lib/X11/fr +lib/X11/fr_FR.UTF-8/app-defaults/MoTV +lib/X11/it_IT.UTF-8/app-defaults/MoTV @dirrm lib/X11/de_DE.UTF-8/app-defaults @dirrm lib/X11/de_DE.UTF-8 +@dirrm lib/X11/fr_FR.UTF-8/app-defaults +@dirrm lib/X11/fr_FR.UTF-8 +@dirrm lib/X11/it_IT.UTF-8/app-defaults +@dirrm lib/X11/it_IT.UTF-8 @dirrm lib/X11/de/app-defaults @dirrm lib/X11/de
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305201116.r4KBGvGr042598>