package-update/multimedia/xawtv/X11.patch

# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../xawtv/X11.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---

diff -ur xawtv-3.95/Makefile.in xawtv-3.95-t2/Makefile.in
--- xawtv-3.95/Makefile.in	2004-04-22 16:52:29.000000000 +0200
+++ xawtv-3.95-t2/Makefile.in	2006-02-10 02:38:31.000000000 +0100
@@ -29,7 +29,7 @@
 # for CFLAGS
 WARN_FLAGS	:= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 LFS_FLAGS	:= -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS	:= @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
+X11_FLAGS	:= @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11/include/X11/fonts
 LIB_FLAGS	:= -I. -I./vbistuff -I./x11 \
 		   -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
 		   -I$(srcdir)/x11 -I$(srcdir)/structs \
diff -ur xawtv-3.95/configure xawtv-3.95-t2/configure
--- xawtv-3.95/configure	2005-09-30 12:10:03.000000000 +0200
+++ xawtv-3.95-t2/configure	2006-02-10 02:38:30.000000000 +0100
@@ -4130,22 +4130,22 @@
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
-/usr/X11R6/include
+/usr/X11/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
-/usr/include/X11R6
+/usr/include/X11
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
-/usr/local/X11R6/include
+/usr/local/X11/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
-/usr/local/include/X11R6
+/usr/local/include/X11
 /usr/local/include/X11R5
 /usr/local/include/X11R4
 
@@ -5376,7 +5376,7 @@
     fi
   fi
 
-  # Check for libraries that X11R6 Xt/Xaw programs need.
+  # Check for libraries that X11 Xt/Xaw programs need.
   ac_save_LDFLAGS=$LDFLAGS
   test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
@@ -6812,7 +6812,7 @@
 
 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
+x11conf=/usr/X11/lib/X11
 if test -d /etc/X11; then
 	x11conf=/etc/X11
 fi
@@ -6822,7 +6822,7 @@
 
 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
+resdir=/usr/X11/lib/X11
 if test -d /etc/X11/app-defaults; then
 	resdir=/etc/X11
 fi
diff -ur xawtv-3.95/configure.ac xawtv-3.95-t2/configure.ac
--- xawtv-3.95/configure.ac	2004-08-18 17:48:09.000000000 +0200
+++ xawtv-3.95-t2/configure.ac	2006-02-10 02:38:30.000000000 +0100
@@ -287,7 +287,7 @@
 
 dnl ---------------------------------------------------------------------
 AC_MSG_CHECKING(for X11 config directory)
-x11conf=/usr/X11R6/lib/X11
+x11conf=/usr/X11/lib/X11
 if test -d /etc/X11; then
 	x11conf=/etc/X11
 fi
@@ -295,7 +295,7 @@
 AC_SUBST(x11conf)
 
 AC_MSG_CHECKING(for X11 app-defaults directory)
-resdir=/usr/X11R6/lib/X11
+resdir=/usr/X11/lib/X11
 if test -d /etc/X11/app-defaults; then
 	resdir=/etc/X11
 fi
diff -ur xawtv-3.95/xawtv.spec xawtv-3.95-t2/xawtv.spec
--- xawtv-3.95/xawtv.spec	2005-09-30 14:57:44.000000000 +0200
+++ xawtv-3.95-t2/xawtv.spec	2006-02-10 02:38:30.000000000 +0100
@@ -17,14 +17,14 @@
 %build
 mkdir build
 cd build
-CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11R6
+CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11
 make
 
 %install
 test "%{buildroot}" != "" && rm -rf "%{buildroot}"
 (cd build; make DESTDIR="%{buildroot}" SUID_ROOT="" install)
-gzip -v %{buildroot}/usr/X11R6/man/man*/*.[158]
-gzip -v %{buildroot}/usr/X11R6/man/*/man*/*.[158]
+gzip -v %{buildroot}/usr/X11/man/man*/*.[158]
+gzip -v %{buildroot}/usr/X11/man/*/man*/*.[158]
 find %{buildroot} -type f -print	\
 	| sed -e 's|%{buildroot}||'	\
 	| grep -v -e %{docdir}		\
@@ -34,7 +34,7 @@
 %files -f filelist
 %defattr(-,root,root)
 %doc COPYING Changes TODO README README.* contrib/frequencies*
-%attr(4711,root,root) /usr/X11R6/bin/v4l-conf
+%attr(4711,root,root) /usr/X11/bin/v4l-conf
 
 %clean
 test "%{buildroot}" != "" && rm -rf "%{buildroot}"
diff -ur xawtv-3.95/xawtv.spec.in xawtv-3.95-t2/xawtv.spec.in
--- xawtv-3.95/xawtv.spec.in	2003-02-14 15:14:09.000000000 +0100
+++ xawtv-3.95-t2/xawtv.spec.in	2006-02-10 02:38:31.000000000 +0100
@@ -17,14 +17,14 @@
 %build
 mkdir build
 cd build
-CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11R6
+CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11
 make
 
 %install
 test "%{buildroot}" != "" && rm -rf "%{buildroot}"
 (cd build; make DESTDIR="%{buildroot}" SUID_ROOT="" install)
-gzip -v %{buildroot}/usr/X11R6/man/man*/*.[158]
-gzip -v %{buildroot}/usr/X11R6/man/*/man*/*.[158]
+gzip -v %{buildroot}/usr/X11/man/man*/*.[158]
+gzip -v %{buildroot}/usr/X11/man/*/man*/*.[158]
 find %{buildroot} -type f -print	\
 	| sed -e 's|%{buildroot}||'	\
 	| grep -v -e %{docdir}		\
@@ -34,7 +34,7 @@
 %files -f filelist
 %defattr(-,root,root)
 %doc COPYING Changes TODO README README.* contrib/frequencies*
-%attr(4711,root,root) /usr/X11R6/bin/v4l-conf
+%attr(4711,root,root) /usr/X11/bin/v4l-conf
 
 %clean
 test "%{buildroot}" != "" && rm -rf "%{buildroot}"