FreeBSD Bugzilla – Attachment 21239 Details for
Bug 37260
update-port: graphics/xawtv
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.75 KB, created by
Oliver Lehmann
on 2002-04-19 20:30:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Oliver Lehmann
Created:
2002-04-19 20:30:00 UTC
Size:
7.75 KB
patch
obsolete
>diff -ruN xawtv.old/Makefile /usr/ports/graphics/xawtv/Makefile >--- xawtv.old/Makefile Sun Apr 14 20:29:42 2002 >+++ /usr/ports/graphics/xawtv/Makefile Sun Apr 14 21:03:56 2002 >@@ -6,7 +6,7 @@ > # > > PORTNAME= xawtv >-PORTVERSION= 3.73 >+PORTVERSION= 3.74 > CATEGORIES= graphics > MASTER_SITES= http://bytesex.org/xawtv/ > DISTNAME= ${PORTNAME}_${PORTVERSION} >@@ -30,10 +30,9 @@ > FILES_X11BASE= configure Make.config.in > FILES_LOCALBASE=configure > >-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 >+MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 \ >+ radio.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 > >diff -ruN xawtv.old/distinfo /usr/ports/graphics/xawtv/distinfo >--- xawtv.old/distinfo Sun Apr 14 20:29:42 2002 >+++ /usr/ports/graphics/xawtv/distinfo Sun Apr 14 20:44:30 2002 >@@ -1 +1 @@ >-MD5 (xawtv_3.73.tar.gz) = c9a8b96439a877bccd9463bf3331b538 >+MD5 (xawtv_3.74.tar.gz) = e517590defc52441011ca541577bcf8f >diff -ruN xawtv.old/files/patch-configure /usr/ports/graphics/xawtv/files/patch-configure >--- xawtv.old/files/patch-configure Sun Apr 14 20:29:42 2002 >+++ /usr/ports/graphics/xawtv/files/patch-configure Sun Apr 14 20:35:56 2002 >@@ -1,15 +1,15 @@ >---- configure.orig Thu Mar 14 14:51:55 2002 >-+++ configure Fri Mar 15 21:49:45 2002 >+--- configure.orig Wed Apr 10 12:03:15 2002 >++++ configure Sun Apr 14 20:35:36 2002 > @@ -2022,7 +2022,7 @@ > OpenBSD | FreeBSD | NetBSD) >- # *BSD has important stuff (from ports) in >- # /usr/local ... >+ # *BSD has important stuff (from ports) >+ # in /usr/local ... > - CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib" > + CFLAGS="$CFLAGS -I%%LOCALBASE%%/include -L/%%LOCALBASE%%/lib" >- PLUGINS="drv0-bsd.so snd-oss.so" >- VBIFLAGS="-DBSD" >+ FOUND_OS="bsd" > ;; >-@@ -2586,10 +2586,10 @@ >+ *) >+@@ -2585,10 +2585,10 @@ > /usr/XFree86/include/X11 > > /usr/include >@@ -22,24 +22,25 @@ > /usr/lpp/Xamples/include > > /usr/openwin/include >-@@ -4329,18 +4329,13 @@ >- echo "$as_me:4329: checking for X11 config directory" >&5 >+@@ -4374,19 +4374,13 @@ >+ >+ echo "$as_me:4375: checking for X11 config directory" >&5 > echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6 >- x11conf=/usr/X11R6/lib/X11 >+-x11conf=/usr/X11R6/lib/X11 > -if test -d /etc/X11; then > - x11conf=/etc/X11 > -fi > +x11conf=%%X11BASE%%/lib/X11 >- echo "$as_me:4335: result: $x11conf" >&5 >+ echo "$as_me:4381: result: $x11conf" >&5 > echo "${ECHO_T}$x11conf" >&6 > >- echo "$as_me:4338: checking for X11 app-defaults directory" >&5 >+ echo "$as_me:4384: 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 > +resdir=%%X11BASE%%/lib/X11 >- echo "$as_me:4344: result: $resdir/app-defaults" >&5 >+ echo "$as_me:4390: result: $resdir/app-defaults" >&5 > echo "${ECHO_T}$resdir/app-defaults" >&6 > >diff -ruN xawtv.old/files/patch-font::Makefile.in /usr/ports/graphics/xawtv/files/patch-font::Makefile.in >--- xawtv.old/files/patch-font::Makefile.in Sun Apr 14 20:29:42 2002 >+++ /usr/ports/graphics/xawtv/files/patch-font::Makefile.in Thu Jan 1 01:00:00 1970 >@@ -1,10 +0,0 @@ >---- 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 "$(DESTDIR)" = ""; then \ >- (cd $(fontdir); mkfontdir); \ >-- xset fp rehash || true; \ >- fi >- >- >diff -ruN xawtv.old/files/patch-src::Makefile.in /usr/ports/graphics/xawtv/files/patch-src::Makefile.in >--- xawtv.old/files/patch-src::Makefile.in Sun Apr 14 20:29:42 2002 >+++ /usr/ports/graphics/xawtv/files/patch-src::Makefile.in Thu Jan 1 01:00:00 1970 >@@ -1,19 +0,0 @@ >---- 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 -ruN xawtv.old/files/patch-src::motif.c /usr/ports/graphics/xawtv/files/patch-src::motif.c >--- xawtv.old/files/patch-src::motif.c Sun Apr 14 20:29:42 2002 >+++ /usr/ports/graphics/xawtv/files/patch-src::motif.c Thu Jan 1 01:00:00 1970 >@@ -1,22 +0,0 @@ >---- 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 -ruN xawtv.old/patch-font::Makefile.in /usr/ports/graphics/xawtv/patch-font::Makefile.in >--- xawtv.old/patch-font::Makefile.in Thu Jan 1 01:00:00 1970 >+++ /usr/ports/graphics/xawtv/patch-font::Makefile.in Wed Jan 16 23:08:43 2002 >@@ -0,0 +1,10 @@ >+--- 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 "$(DESTDIR)" = ""; then \ >+ (cd $(fontdir); mkfontdir); \ >+- xset fp rehash || true; \ >+ fi >+ >+ >diff -ruN xawtv.old/patch-src::Makefile.in /usr/ports/graphics/xawtv/patch-src::Makefile.in >--- xawtv.old/patch-src::Makefile.in Thu Jan 1 01:00:00 1970 >+++ /usr/ports/graphics/xawtv/patch-src::Makefile.in Wed Jan 16 23:08:43 2002 >@@ -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 -ruN xawtv.old/patch-src::motif.c /usr/ports/graphics/xawtv/patch-src::motif.c >--- xawtv.old/patch-src::motif.c Thu Jan 1 01:00:00 1970 >+++ /usr/ports/graphics/xawtv/patch-src::motif.c Sat Feb 23 22:03:49 2002 >@@ -0,0 +1,22 @@ >+--- 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 -ruN xawtv.old/pkg-plist /usr/ports/graphics/xawtv/pkg-plist >--- xawtv.old/pkg-plist Sun Apr 14 20:29:42 2002 >+++ /usr/ports/graphics/xawtv/pkg-plist Sun Apr 14 21:23:35 2002 >@@ -21,6 +21,13 @@ > lib/xawtv/snd-oss.so > lib/xawtv/write-avi.so > @dirrm lib/xawtv >+man/es/man1/fbtv.1 >+man/es/man1/scantv.1 >+man/es/man1/xawtv.1 >+@dirrm man/es/man1 >+man/es/man5/xawtvrc.5 >+@dirrm man/es/man5 >+@dirrm man/es > @cwd %%X11BASE%% > lib/X11/app-defaults/MoTV > lib/X11/fonts/misc/led-iso8859-1.pcf.gz
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 37260
: 21239