Date: Wed, 29 Jan 2014 12:38:58 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341725 - in head/multimedia/fxtv: . files Message-ID: <201401291238.s0TCcwqb041490@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Jan 29 12:38:57 2014 New Revision: 341725 URL: http://svnweb.freebsd.org/changeset/ports/341725 QAT: https://qat.redports.org/buildarchive/r341725/ Log: - Stagify, contract MASTER_SITES, s/X/X11/ in COMMENT, remove alpha from ONLY_FOR_ARCHS, sort the knobs, etc. - Modernize LIB_DEPENDS syntax, convert USE_GMAKE, rename a patch file - Clean up Makefile and port description text while here Added: head/multimedia/fxtv/files/patch-Makefile - copied, changed from r341154, head/multimedia/fxtv/files/patch-ab Deleted: head/multimedia/fxtv/files/patch-ab Modified: head/multimedia/fxtv/Makefile head/multimedia/fxtv/pkg-descr head/multimedia/fxtv/pkg-plist Modified: head/multimedia/fxtv/Makefile ============================================================================== --- head/multimedia/fxtv/Makefile Wed Jan 29 12:23:20 2014 (r341724) +++ head/multimedia/fxtv/Makefile Wed Jan 29 12:38:57 2014 (r341725) @@ -5,40 +5,33 @@ PORTNAME= fxtv PORTVERSION= 1.03 PORTREVISION= 11 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= sanpei +MASTER_SITES= LOCAL/sanpei EXTRACT_SUFX= .tgz MAINTAINER= sanpei@FreeBSD.org -COMMENT= X-based TV Display and Capture Application (for use with bt848 driver) +COMMENT= X11-based TV display and capture application (for use with bt848 driver) -LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +ONLY_FOR_ARCHS= i386 ia64 amd64 +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ + libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d + +USES= gmake MAKE_ENV= X11BASE=${LOCALBASE} USE_XORG= ice sm x11 xaw xext xmu xt xpm xxf86vm xxf86dga -USE_GMAKE= yes MAKE_FLAGS= -e -MAN1= fxtv.1 - -ONLY_FOR_ARCHS= alpha i386 ia64 amd64 OPTIONS_DEFINE= EXTRA EXTRA_DESC= Extra programs required to record/playback/save -NO_STAGE= yes -.include <bsd.port.options.mk> - # This program does not actually require the programs below unless you -# use audio/video recording and/or playback and save to a non-raw format. -.if ${PORT_OPTIONS:MEXTRA} -RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox \ - mpg123:${PORTSDIR}/audio/mpg123 \ - mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \ - mplex:${PORTSDIR}/multimedia/mplex -.endif +# use audio/video recording and/or playback and save to a non-raw format. +EXTRA_RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \ + mpg123:${PORTSDIR}/audio/mpg123 \ + mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \ + mplex:${PORTSDIR}/multimedia/mplex pre-install: - ${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man + ${CP} -p ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man .include <bsd.port.mk> Copied and modified: head/multimedia/fxtv/files/patch-Makefile (from r341154, head/multimedia/fxtv/files/patch-ab) ============================================================================== --- head/multimedia/fxtv/files/patch-ab Sun Jan 26 03:20:55 2014 (r341154, copy source) +++ head/multimedia/fxtv/files/patch-Makefile Wed Jan 29 12:38:57 2014 (r341725) @@ -1,6 +1,6 @@ --- Makefile.orig Tue Feb 13 09:08:59 2001 +++ Makefile Sat Mar 10 17:36:25 2001 -@@ -62,7 +62,7 @@ +@@ -62,7 +62,7 @@ endif ifneq ($(DEBUG),NO) override CFLAGS = -DDEBUG -g else @@ -9,3 +9,30 @@ endif C_WARN_FLAG = -Wall override CFLAGS += $(C_WARN_FLAG) $(INC) $(CF_VERS) +@@ -116,15 +116,17 @@ $(VIDEOLIB_LIB) : + tv.o : tv.c app_rsrc.h + + install : fxtv +- mkdir -p $(FXTV_LIBDIR)/bitmaps +- install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps +- install -c -m 444 -o root README $(FXTV_LIBDIR) +- mkdir -p $(X11BASEINST)/lib/X11/app-defaults +- install -c -m 444 -o root Fxtv $(X11BASEINST)/lib/X11/app-defaults +- mkdir -p $(X11BASEINST)/bin +- install -c -m 444 -o root fxtv.1 $(X11BASEINST)/man/man1/fxtv.1 +- install -c -m 555 -o root fxtv $(X11BASEINST)/bin +- install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR) ++ mkdir -p $(DESTDIR)$(FXTV_LIBDIR)/bitmaps ++ install -c -m 444 -o root $(PIXMAPS) $(DESTDIR)$(FXTV_LIBDIR)/bitmaps ++ install -c -m 444 -o root README $(DESTDIR)$(FXTV_LIBDIR) ++ mkdir -p $(DESTDIR)$(X11BASEINST)/lib/X11/app-defaults ++ install -c -m 444 -o root Fxtv \ ++ $(DESTDIR)$(X11BASEINST)/lib/X11/app-defaults ++ mkdir -p $(DESTDIR)$(X11BASEINST)/bin ++ install -c -m 444 -o root fxtv.1 \ ++ $(DESTDIR)$(X11BASEINST)/man/man1/fxtv.1 ++ install -c -m 555 -o root fxtv $(DESTDIR)$(X11BASEINST)/bin ++ install -c -m 555 -o root fxtv_cnvt.sh $(DESTDIR)$(FXTV_LIBDIR) + + clean: + rm -f *.o fxtv *.core *~ Modified: head/multimedia/fxtv/pkg-descr ============================================================================== --- head/multimedia/fxtv/pkg-descr Wed Jan 29 12:23:20 2014 (r341724) +++ head/multimedia/fxtv/pkg-descr Wed Jan 29 12:38:57 2014 (r341725) @@ -3,10 +3,7 @@ image/audio/video capture capabilities f and Pinnacle PCTV tuner/capture cards. To use this app, you need a capture card supported by the bktr(4) driver. -Examples include the Hauppauge Wincast/TV, the STB TV PCI, and the -Intel Smart Video Recorder III. See the 'bktr' man page -for more information. - -Refer to the README for details on usage. +Examples include the Hauppauge Wincast/TV, the STB TV PCI, and the Intel +Smart Video Recorder III. See the 'bktr' man page for more information. WWW: http://people.FreeBSD.org/~rhh/fxtv/ Modified: head/multimedia/fxtv/pkg-plist ============================================================================== --- head/multimedia/fxtv/pkg-plist Wed Jan 29 12:23:20 2014 (r341724) +++ head/multimedia/fxtv/pkg-plist Wed Jan 29 12:38:57 2014 (r341725) @@ -9,5 +9,6 @@ lib/X11/fxtv/bitmaps/mini-up.xbm lib/X11/fxtv/bitmaps/radio_off.xbm lib/X11/fxtv/bitmaps/radio_on.xbm lib/X11/fxtv/fxtv_cnvt.sh +man/man1/fxtv.1.gz @dirrm lib/X11/fxtv/bitmaps @dirrm lib/X11/fxtv
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401291238.s0TCcwqb041490>