diff options
author | Alexander Langer <alex@FreeBSD.org> | 2002-01-16 22:08:43 +0000 |
---|---|---|
committer | Alexander Langer <alex@FreeBSD.org> | 2002-01-16 22:08:43 +0000 |
commit | da648df12fab297c8cc5ad320babf4f4f5c94d66 (patch) | |
tree | 7fd02434752f9e03f442b315c113c79484faade5 | |
parent | o update to 0.1.6. (diff) |
Update port to version 3.67, which fixes all known problems on 5.0.
Hand maintainership to Oliver Lehmann <lehmann@ans-netz.de>, since
greid doesn't seem to be interested in this port any more (various
feedback timeouts and mails from him indicate this)
PR: 31691, 32673, 32802, 33894
Submitted by: Oliver Lehmann <lehmann@ans-netz.de>
Approved by: greid (MAINTAINER) (de-facto approved)
Notes
Notes:
svn path=/head/; revision=53206
-rw-r--r-- | graphics/xawtv/Makefile | 44 | ||||
-rw-r--r-- | graphics/xawtv/distinfo | 2 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-configure | 24 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-font::Makefile.in | 15 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-src::Makefile.in | 19 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-src::motif.c | 23 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-src::xt.c | 17 | ||||
-rw-r--r-- | graphics/xawtv/pkg-descr | 4 | ||||
-rw-r--r-- | graphics/xawtv/pkg-plist | 18 | ||||
-rw-r--r-- | multimedia/xawtv/Makefile | 44 | ||||
-rw-r--r-- | multimedia/xawtv/distinfo | 2 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-configure | 24 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-font::Makefile.in | 15 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-src::Makefile.in | 19 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-src::motif.c | 23 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-src::xt.c | 17 | ||||
-rw-r--r-- | multimedia/xawtv/pkg-descr | 4 | ||||
-rw-r--r-- | multimedia/xawtv/pkg-plist | 18 |
18 files changed, 272 insertions, 60 deletions
diff --git a/graphics/xawtv/Makefile b/graphics/xawtv/Makefile index c73dcdc94c92..ecb963f6ec82 100644 --- a/graphics/xawtv/Makefile +++ b/graphics/xawtv/Makefile @@ -6,38 +6,52 @@ # PORTNAME= xawtv -PORTVERSION= 3.37 +PORTVERSION= 3.67 CATEGORIES= graphics -MASTER_SITES= http://www.strusel007.de/linux/xawtv/ +MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} +WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -MAINTAINER= greid@ukug.uk.freebsd.org +MAINTAINER= lehmann@ans-netz.de LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} +CONFIGURE_ARGS= --prefix=${PREFIX} -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes USE_X_PREFIX= yes -SEDFILES= . font i2c man src radio contrib/cc webcam oldstuff/vtx \ + +FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \ libng libvbi http +FILES_X11BASE= configure Make.config.in -MAN1= alevtd.1 fbtv.1 propwatch.1 rootv.1 showriff.1 v4l-conf.1 \ - v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1 -post-configure: -.for M in ${SEDFILES} - @(${SED} -e 's,^CFLAGS=,CFLAGS+=,g' ${WRKSRC}/$M/Makefile | \ - ${SED} -e 's,-O2,,g' > ${WRKSRC}/foo && ${MV} ${WRKSRC}/foo ${WRKSRC}/$M/Makefile) +MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \ + rootv.1 scantv.1 showriff.1 \ + streamer.1 subtitles.1 ttv.1 v4lctl.1 \ + webcam.1 xawtv-remote.1 xawtv.1 +MAN5= xawtvrc.5 +MAN8= v4l-conf.8 + +PLIST_SUB+= X11PREFIX=${X11BASE} +STRCASESTRFILES=src/commands.c + +post-patch: +.for i in ${FILES_X11BASE} + ${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i +.endfor +.for i in ${STRCASESTRFILES} + ${PERL} -pi -e "s|strcasestr|mystrcasestr|g" ${WRKSRC}/$i .endfor -post-install: -.for F in led-koi8.pcf led-latin1.pcf led-latin2.pcf - @gzip ${PREFIX}/lib/X11/fonts/misc/$F +post-configure: +.for i in ${FILES_CFLAGS} + ${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile .endfor .include <bsd.port.mk> diff --git a/graphics/xawtv/distinfo b/graphics/xawtv/distinfo index b0559cb94ea1..284494ec3ab3 100644 --- a/graphics/xawtv/distinfo +++ b/graphics/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.37.tar.gz) = a264eddc95fa92b83b14be386abc7be8 +MD5 (xawtv_3.67.tar.gz) = bbef18a0b69310d0c3e3c84925d54cd4 diff --git a/graphics/xawtv/files/patch-configure b/graphics/xawtv/files/patch-configure new file mode 100644 index 000000000000..6029fe46a9f5 --- /dev/null +++ b/graphics/xawtv/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig Mon Jan 14 20:33:50 2002 ++++ configure Mon Jan 14 20:35:51 2002 +@@ -2914,19 +2914,13 @@ + + echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6 + echo "configure:2917: checking for X11 config directory" >&5 +-x11conf=/usr/X11R6/lib/X11 +-if test -d /etc/X11; then +- x11conf=/etc/X11 +-fi ++x11conf=%%X11BASE%%/lib/X11 + echo "$ac_t""$x11conf" 1>&6 + + + echo $ac_n "checking for X11 app-defaults directory""... $ac_c" 1>&6 + echo "configure:2926: checking for X11 app-defaults directory" >&5 +-resdir=/usr/X11R6/lib/X11 +-if test -d /etc/X11/app-defaults; then +- resdir=/etc/X11 +-fi ++resdir=%%X11BASE%%/lib/X11 + echo "$ac_t""$resdir/app-defaults" 1>&6 + + diff --git a/graphics/xawtv/files/patch-font::Makefile.in b/graphics/xawtv/files/patch-font::Makefile.in index c3f1bcfd9abf..f9c8412fa849 100644 --- a/graphics/xawtv/files/patch-font::Makefile.in +++ b/graphics/xawtv/files/patch-font::Makefile.in @@ -1,9 +1,10 @@ ---- font/Makefile.in.orig Sat Mar 3 22:50:32 2001 -+++ font/Makefile.in Sat Mar 3 22:50:44 2001 -@@ -16,7 +16,6 @@ +--- font/Makefile.in.orig Sun Sep 2 12:01:30 2001 ++++ font/Makefile.in Sun Sep 2 12:01:45 2001 +@@ -23,7 +23,6 @@ done - if test "$(ROOT)" = ""; then \ - (cd $(FONTDIR); mkfontdir); \ -- xset fp rehash; \ - true; \ + if test "$(DESTDIR)" = ""; then \ + (cd $(fontdir); mkfontdir); \ +- xset fp rehash || true; \ fi + + diff --git a/graphics/xawtv/files/patch-src::Makefile.in b/graphics/xawtv/files/patch-src::Makefile.in new file mode 100644 index 000000000000..d9b6ed2d485a --- /dev/null +++ b/graphics/xawtv/files/patch-src::Makefile.in @@ -0,0 +1,19 @@ +--- src/Makefile.in.orig Thu Dec 13 13:15:07 2001 ++++ src/Makefile.in Mon Jan 14 20:36:59 2002 +@@ -124,12 +124,14 @@ + install-dirs: + $(INSTALL_DIR) $(bindir) + $(INSTALL_DIR) $(resdir)/app-defaults +- $(INSTALL_DIR) $(resdir)/de/app-defaults ++ for lang in $(LANG); do \ ++ $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\ ++ done + + install-common: + $(INSTALL_DIR) $(bindir) + $(INSTALL_DIR) $(resdir)/app-defaults +- $(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir) ++ $(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir) + $(INSTALL_PROGRAM) -s xawtv-remote $(bindir) + $(INSTALL_PROGRAM) -s streamer $(bindir) + $(INSTALL_PROGRAM) -s v4lctl $(bindir) diff --git a/graphics/xawtv/files/patch-src::motif.c b/graphics/xawtv/files/patch-src::motif.c new file mode 100644 index 000000000000..63c9274bf0c3 --- /dev/null +++ b/graphics/xawtv/files/patch-src::motif.c @@ -0,0 +1,23 @@ +--- src/motif.c.orig Mon Sep 17 00:42:53 2001 ++++ src/motif.c Mon Sep 17 00:45:40 2001 +@@ -24,6 +24,19 @@ + # include <sys/soundcard.h> + #endif + ++#if defined(__FreeBSD__) ++typedef struct mixer_info ++{ ++ char id[16]; ++ char name[32]; ++ int modify_counter; ++ int fillers[10]; ++} mixer_info; ++ ++ ++# define SOUND_MIXER_INFO _IOR ('M', 101, mixer_info) ++#endif ++ + #include <X11/Xlib.h> + #include <X11/Intrinsic.h> + #include <Xm/Xm.h> + diff --git a/graphics/xawtv/files/patch-src::xt.c b/graphics/xawtv/files/patch-src::xt.c new file mode 100644 index 000000000000..b7463f7ef497 --- /dev/null +++ b/graphics/xawtv/files/patch-src::xt.c @@ -0,0 +1,17 @@ +--- src/xt.c.orig Mon Sep 17 00:39:58 2001 ++++ src/xt.c Mon Sep 17 00:40:07 2001 +@@ -27,6 +27,13 @@ + # include <linux/videodev.h> + #endif + ++#if defined(__FreeBSD__) ++#define VIDEO_SOUND_MONO 1 ++#define VIDEO_SOUND_STEREO 2 ++#define VIDEO_SOUND_LANG1 4 ++#define VIDEO_SOUND_LANG2 8 ++#endif ++ + #include "config.h" + + #include <X11/Xlib.h> + diff --git a/graphics/xawtv/pkg-descr b/graphics/xawtv/pkg-descr index e3da51a0e569..7228213d229a 100644 --- a/graphics/xawtv/pkg-descr +++ b/graphics/xawtv/pkg-descr @@ -1,7 +1,5 @@ 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://www.strusel007.de/linux/xawtv/ +WWW: http://bytesex.org/xawtv/ -- George Reid -greid@ukug.uk.freebsd.org diff --git a/graphics/xawtv/pkg-plist b/graphics/xawtv/pkg-plist index 68cd85adb71f..8c20d85f4afa 100644 --- a/graphics/xawtv/pkg-plist +++ b/graphics/xawtv/pkg-plist @@ -1,16 +1,26 @@ bin/alevtd bin/dump-mixers +bin/ntsc-cc bin/propwatch bin/record bin/rootv bin/scantv bin/showriff bin/streamer +bin/subtitles +bin/ttv bin/v4lctl bin/webcam bin/xawtv bin/xawtv-remote -lib/X11/app-defaults/Xawtv -lib/X11/fonts/misc/led-koi8.pcf.gz -lib/X11/fonts/misc/led-latin1.pcf.gz -lib/X11/fonts/misc/led-latin2.pcf.gz +@cwd %%X11BASE%% +lib/X11/app-defaults/MoTV +lib/X11/fonts/misc/led-iso8859-1.pcf.gz +lib/X11/fonts/misc/led-iso8859-2.pcf.gz +lib/X11/fonts/misc/led-koi8-r.pcf.gz +lib/X11/de/app-defaults/MoTV +lib/X11/it/app-defaults/MoTV +@dirrm lib/X11/de/app-defaults +@dirrm lib/X11/de +@dirrm lib/X11/it/app-defaults +@dirrm lib/X11/it diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index c73dcdc94c92..ecb963f6ec82 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -6,38 +6,52 @@ # PORTNAME= xawtv -PORTVERSION= 3.37 +PORTVERSION= 3.67 CATEGORIES= graphics -MASTER_SITES= http://www.strusel007.de/linux/xawtv/ +MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} +WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -MAINTAINER= greid@ukug.uk.freebsd.org +MAINTAINER= lehmann@ans-netz.de LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} +CONFIGURE_ARGS= --prefix=${PREFIX} -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes USE_X_PREFIX= yes -SEDFILES= . font i2c man src radio contrib/cc webcam oldstuff/vtx \ + +FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \ libng libvbi http +FILES_X11BASE= configure Make.config.in -MAN1= alevtd.1 fbtv.1 propwatch.1 rootv.1 showriff.1 v4l-conf.1 \ - v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1 -post-configure: -.for M in ${SEDFILES} - @(${SED} -e 's,^CFLAGS=,CFLAGS+=,g' ${WRKSRC}/$M/Makefile | \ - ${SED} -e 's,-O2,,g' > ${WRKSRC}/foo && ${MV} ${WRKSRC}/foo ${WRKSRC}/$M/Makefile) +MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \ + rootv.1 scantv.1 showriff.1 \ + streamer.1 subtitles.1 ttv.1 v4lctl.1 \ + webcam.1 xawtv-remote.1 xawtv.1 +MAN5= xawtvrc.5 +MAN8= v4l-conf.8 + +PLIST_SUB+= X11PREFIX=${X11BASE} +STRCASESTRFILES=src/commands.c + +post-patch: +.for i in ${FILES_X11BASE} + ${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i +.endfor +.for i in ${STRCASESTRFILES} + ${PERL} -pi -e "s|strcasestr|mystrcasestr|g" ${WRKSRC}/$i .endfor -post-install: -.for F in led-koi8.pcf led-latin1.pcf led-latin2.pcf - @gzip ${PREFIX}/lib/X11/fonts/misc/$F +post-configure: +.for i in ${FILES_CFLAGS} + ${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile .endfor .include <bsd.port.mk> diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo index b0559cb94ea1..284494ec3ab3 100644 --- a/multimedia/xawtv/distinfo +++ b/multimedia/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.37.tar.gz) = a264eddc95fa92b83b14be386abc7be8 +MD5 (xawtv_3.67.tar.gz) = bbef18a0b69310d0c3e3c84925d54cd4 diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure new file mode 100644 index 000000000000..6029fe46a9f5 --- /dev/null +++ b/multimedia/xawtv/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig Mon Jan 14 20:33:50 2002 ++++ configure Mon Jan 14 20:35:51 2002 +@@ -2914,19 +2914,13 @@ + + echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6 + echo "configure:2917: checking for X11 config directory" >&5 +-x11conf=/usr/X11R6/lib/X11 +-if test -d /etc/X11; then +- x11conf=/etc/X11 +-fi ++x11conf=%%X11BASE%%/lib/X11 + echo "$ac_t""$x11conf" 1>&6 + + + echo $ac_n "checking for X11 app-defaults directory""... $ac_c" 1>&6 + echo "configure:2926: checking for X11 app-defaults directory" >&5 +-resdir=/usr/X11R6/lib/X11 +-if test -d /etc/X11/app-defaults; then +- resdir=/etc/X11 +-fi ++resdir=%%X11BASE%%/lib/X11 + echo "$ac_t""$resdir/app-defaults" 1>&6 + + diff --git a/multimedia/xawtv/files/patch-font::Makefile.in b/multimedia/xawtv/files/patch-font::Makefile.in index c3f1bcfd9abf..f9c8412fa849 100644 --- a/multimedia/xawtv/files/patch-font::Makefile.in +++ b/multimedia/xawtv/files/patch-font::Makefile.in @@ -1,9 +1,10 @@ ---- font/Makefile.in.orig Sat Mar 3 22:50:32 2001 -+++ font/Makefile.in Sat Mar 3 22:50:44 2001 -@@ -16,7 +16,6 @@ +--- font/Makefile.in.orig Sun Sep 2 12:01:30 2001 ++++ font/Makefile.in Sun Sep 2 12:01:45 2001 +@@ -23,7 +23,6 @@ done - if test "$(ROOT)" = ""; then \ - (cd $(FONTDIR); mkfontdir); \ -- xset fp rehash; \ - true; \ + if test "$(DESTDIR)" = ""; then \ + (cd $(fontdir); mkfontdir); \ +- xset fp rehash || true; \ fi + + diff --git a/multimedia/xawtv/files/patch-src::Makefile.in b/multimedia/xawtv/files/patch-src::Makefile.in new file mode 100644 index 000000000000..d9b6ed2d485a --- /dev/null +++ b/multimedia/xawtv/files/patch-src::Makefile.in @@ -0,0 +1,19 @@ +--- src/Makefile.in.orig Thu Dec 13 13:15:07 2001 ++++ src/Makefile.in Mon Jan 14 20:36:59 2002 +@@ -124,12 +124,14 @@ + install-dirs: + $(INSTALL_DIR) $(bindir) + $(INSTALL_DIR) $(resdir)/app-defaults +- $(INSTALL_DIR) $(resdir)/de/app-defaults ++ for lang in $(LANG); do \ ++ $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\ ++ done + + install-common: + $(INSTALL_DIR) $(bindir) + $(INSTALL_DIR) $(resdir)/app-defaults +- $(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir) ++ $(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir) + $(INSTALL_PROGRAM) -s xawtv-remote $(bindir) + $(INSTALL_PROGRAM) -s streamer $(bindir) + $(INSTALL_PROGRAM) -s v4lctl $(bindir) diff --git a/multimedia/xawtv/files/patch-src::motif.c b/multimedia/xawtv/files/patch-src::motif.c new file mode 100644 index 000000000000..63c9274bf0c3 --- /dev/null +++ b/multimedia/xawtv/files/patch-src::motif.c @@ -0,0 +1,23 @@ +--- src/motif.c.orig Mon Sep 17 00:42:53 2001 ++++ src/motif.c Mon Sep 17 00:45:40 2001 +@@ -24,6 +24,19 @@ + # include <sys/soundcard.h> + #endif + ++#if defined(__FreeBSD__) ++typedef struct mixer_info ++{ ++ char id[16]; ++ char name[32]; ++ int modify_counter; ++ int fillers[10]; ++} mixer_info; ++ ++ ++# define SOUND_MIXER_INFO _IOR ('M', 101, mixer_info) ++#endif ++ + #include <X11/Xlib.h> + #include <X11/Intrinsic.h> + #include <Xm/Xm.h> + diff --git a/multimedia/xawtv/files/patch-src::xt.c b/multimedia/xawtv/files/patch-src::xt.c new file mode 100644 index 000000000000..b7463f7ef497 --- /dev/null +++ b/multimedia/xawtv/files/patch-src::xt.c @@ -0,0 +1,17 @@ +--- src/xt.c.orig Mon Sep 17 00:39:58 2001 ++++ src/xt.c Mon Sep 17 00:40:07 2001 +@@ -27,6 +27,13 @@ + # include <linux/videodev.h> + #endif + ++#if defined(__FreeBSD__) ++#define VIDEO_SOUND_MONO 1 ++#define VIDEO_SOUND_STEREO 2 ++#define VIDEO_SOUND_LANG1 4 ++#define VIDEO_SOUND_LANG2 8 ++#endif ++ + #include "config.h" + + #include <X11/Xlib.h> + diff --git a/multimedia/xawtv/pkg-descr b/multimedia/xawtv/pkg-descr index e3da51a0e569..7228213d229a 100644 --- a/multimedia/xawtv/pkg-descr +++ b/multimedia/xawtv/pkg-descr @@ -1,7 +1,5 @@ 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://www.strusel007.de/linux/xawtv/ +WWW: http://bytesex.org/xawtv/ -- George Reid -greid@ukug.uk.freebsd.org diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index 68cd85adb71f..8c20d85f4afa 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -1,16 +1,26 @@ bin/alevtd bin/dump-mixers +bin/ntsc-cc bin/propwatch bin/record bin/rootv bin/scantv bin/showriff bin/streamer +bin/subtitles +bin/ttv bin/v4lctl bin/webcam bin/xawtv bin/xawtv-remote -lib/X11/app-defaults/Xawtv -lib/X11/fonts/misc/led-koi8.pcf.gz -lib/X11/fonts/misc/led-latin1.pcf.gz -lib/X11/fonts/misc/led-latin2.pcf.gz +@cwd %%X11BASE%% +lib/X11/app-defaults/MoTV +lib/X11/fonts/misc/led-iso8859-1.pcf.gz +lib/X11/fonts/misc/led-iso8859-2.pcf.gz +lib/X11/fonts/misc/led-koi8-r.pcf.gz +lib/X11/de/app-defaults/MoTV +lib/X11/it/app-defaults/MoTV +@dirrm lib/X11/de/app-defaults +@dirrm lib/X11/de +@dirrm lib/X11/it/app-defaults +@dirrm lib/X11/it |