diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-06-24 06:24:56 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-06-24 06:24:56 +0000 |
commit | 064986c34f6d23b61af4a72a23f392cc6c63de2f (patch) | |
tree | 2dbeec2d2db93a06ae6d3d2df4338fe031884cef /multimedia | |
parent | Update to 1.35 (diff) |
Update to 3.75
PR: ports/39669
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=61869
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/xawtv/Makefile | 13 | ||||
-rw-r--r-- | multimedia/xawtv/distinfo | 2 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-Makefile.in | 21 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-configure | 20 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-console::Subdir.mk | 19 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-debug::Subdir.mk | 13 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-libvbi::os.h | 8 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-x11::Subdir.mk | 18 | ||||
-rw-r--r-- | multimedia/xawtv/pkg-plist | 23 |
9 files changed, 99 insertions, 38 deletions
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 5a78f7c9a931..4dbd5966045e 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.74 +PORTVERSION= 3.75 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -25,10 +25,8 @@ USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes -FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \ - libng libvbi http -FILES_X11BASE= configure Make.config.in -FILES_LOCALBASE=configure +FILES_X11BASE= configure +FILES_LOCALBASE=configure console/Subdir.mk debug/Subdir.mk x11/Subdir.mk 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 \ @@ -53,9 +51,4 @@ post-patch: ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i .endfor -post-configure: -.for i in ${FILES_CFLAGS} - ${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile -.endfor - .include <bsd.port.post.mk> diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo index d97d6da4aa5a..125bedb5ed8a 100644 --- a/multimedia/xawtv/distinfo +++ b/multimedia/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.74.tar.gz) = e517590defc52441011ca541577bcf8f +MD5 (xawtv_3.75.tar.gz) = 9ae700538a7b0bbfa7e7aeb971d66930 diff --git a/multimedia/xawtv/files/patch-Makefile.in b/multimedia/xawtv/files/patch-Makefile.in new file mode 100644 index 000000000000..54af686eae78 --- /dev/null +++ b/multimedia/xawtv/files/patch-Makefile.in @@ -0,0 +1,21 @@ +--- Makefile.in.orig Wed Jun 19 11:13:15 2002 ++++ Makefile.in Mon Jun 24 02:07:45 2002 +@@ -58,17 +58,7 @@ + FOUND_ZVBI := @FOUND_ZVBI@ + + # build final cflags +-CFLAGS := @CFLAGS@ +-CFLAGS += $(WARN_FLAGS) +-CFLAGS += $(LFS_FLAGS) +-CFLAGS += $(X11_FLAGS) +-CFLAGS += $(LIB_FLAGS) +-CFLAGS += -DCONFIGFILE='"$(config)"' +-CFLAGS += -DLIBDIR='"$(libdir)"' +-CFLAGS += -DVERSION='"$(VERSION)"' +- +-# shared objects need -fPIC +-%.so : CFLAGS += -fPIC ++CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC + + + ######################################################### diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure index cf5ef1642a7d..34e560b7a2a3 100644 --- a/multimedia/xawtv/files/patch-configure +++ b/multimedia/xawtv/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Wed Apr 10 12:03:15 2002 -+++ configure Sun Apr 14 20:35:36 2002 -@@ -2022,7 +2022,7 @@ +--- configure.orig Thu Jun 20 10:08:52 2002 ++++ configure Sat Jun 22 16:54:00 2002 +@@ -2028,7 +2028,7 @@ OpenBSD | FreeBSD | NetBSD) # *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" ++ CFLAGS="-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib" FOUND_OS="bsd" ;; *) -@@ -2585,10 +2585,10 @@ +@@ -2591,10 +2591,10 @@ /usr/XFree86/include/X11 /usr/include @@ -22,25 +22,25 @@ /usr/lpp/Xamples/include /usr/openwin/include -@@ -4374,19 +4374,13 @@ +@@ -4442,19 +4442,13 @@ - echo "$as_me:4375: checking for X11 config directory" >&5 + echo "$as_me:4443: checking for X11 config directory" >&5 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6 -x11conf=/usr/X11R6/lib/X11 -if test -d /etc/X11; then - x11conf=/etc/X11 -fi +x11conf=%%X11BASE%%/lib/X11 - echo "$as_me:4381: result: $x11conf" >&5 + echo "$as_me:4449: result: $x11conf" >&5 echo "${ECHO_T}$x11conf" >&6 - echo "$as_me:4384: checking for X11 app-defaults directory" >&5 + echo "$as_me:4452: 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:4390: result: $resdir/app-defaults" >&5 + echo "$as_me:4458: result: $resdir/app-defaults" >&5 echo "${ECHO_T}$resdir/app-defaults" >&6 diff --git a/multimedia/xawtv/files/patch-console::Subdir.mk b/multimedia/xawtv/files/patch-console::Subdir.mk new file mode 100644 index 000000000000..891683a314e7 --- /dev/null +++ b/multimedia/xawtv/files/patch-console::Subdir.mk @@ -0,0 +1,19 @@ +--- console/Subdir.mk.orig Sat Jun 22 17:04:53 2002 ++++ console/Subdir.mk Sat Jun 22 17:05:30 2002 +@@ -65,11 +65,11 @@ + # libraries to link + console/fbtv : LDLIBS := \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(FS_LIBS) -ljpeg -lm +-console/ttv : LDLIBS := $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm +-console/scantv : LDLIBS := $(THREAD_LIBS) $(VBI_LIBS) -ljpeg +-console/streamer : LDLIBS := $(THREAD_LIBS) -ljpeg -lm +-console/webcam : LDLIBS := $(THREAD_LIBS) -ljpeg ++ $(FS_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm ++console/ttv : LDLIBS := $(THREAD_LIBS) $(AA_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm ++console/scantv : LDLIBS := $(THREAD_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg ++console/streamer : LDLIBS := $(THREAD_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm ++console/webcam : LDLIBS := $(THREAD_LIBS) -L%%LOCALBASE%%/lib -ljpeg + console/radio : LDLIBS := $(CURSES_LIBS) + console/record : LDLIBS := $(CURSES_LIBS) + console/v4l-conf : LDLIBS := $(ATHENA_LIBS) diff --git a/multimedia/xawtv/files/patch-debug::Subdir.mk b/multimedia/xawtv/files/patch-debug::Subdir.mk new file mode 100644 index 000000000000..542ea9b30354 --- /dev/null +++ b/multimedia/xawtv/files/patch-debug::Subdir.mk @@ -0,0 +1,13 @@ +--- debug/Subdir.mk.orig Mon Jun 24 02:12:21 2002 ++++ debug/Subdir.mk Mon Jun 24 02:12:46 2002 +@@ -22,8 +22,8 @@ + + debug/xvideo: debug/xvideo.o + +-debug/gl : LDLIBS := $(THREADLIB) $(MOTIF_LIBS) -lGLU -lGL -ljpeg -lm +-debug/hwscan : LDLIBS := $(ALSA_LIBS) -ljpeg ++debug/gl : LDLIBS := $(THREADLIB) $(MOTIF_LIBS) -L%%LOCALBASE%%/lib -lGLU -lGL -ljpeg -lm ++debug/hwscan : LDLIBS := $(ALSA_LIBS) -L%%LOCALBASE%%/lib -ljpeg + debug/xvideo : LDLIBS := $(ATHENA_LIBS) + + debug/gl : LDFLAGS := $(DLFLAGS) diff --git a/multimedia/xawtv/files/patch-libvbi::os.h b/multimedia/xawtv/files/patch-libvbi::os.h deleted file mode 100644 index dd8788a0fe2c..000000000000 --- a/multimedia/xawtv/files/patch-libvbi::os.h +++ /dev/null @@ -1,8 +0,0 @@ ---- libvbi/os.h.orig Sun Mar 10 13:20:37 2002 -+++ libvbi/os.h Sun Mar 10 13:19:45 2002 -@@ -1,4 +1,4 @@ --#ifndef OS_H -+#if !defined(OS_H) && !defined(BSD) - #define OS_H - - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBsd__) \ diff --git a/multimedia/xawtv/files/patch-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11::Subdir.mk new file mode 100644 index 000000000000..f1b3ad5adb63 --- /dev/null +++ b/multimedia/xawtv/files/patch-x11::Subdir.mk @@ -0,0 +1,18 @@ +--- x11/Subdir.mk.orig Sat Jun 22 17:13:04 2002 ++++ x11/Subdir.mk Sat Jun 22 17:13:43 2002 +@@ -83,12 +83,12 @@ + # libraries to link + x11/xawtv : LDLIBS := \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(ATHENA_LIBS) $(VBI_LIBS) -ljpeg -lm ++ $(ATHENA_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm + x11/motv : LDLIBS := \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg -lm ++ $(MOTIF_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm + x11/mtt : LDLIBS := $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) +-x11/v4lctl : LDLIBS := $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm ++x11/v4lctl : LDLIBS := $(THREAD_LIBS) $(ATHENA_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm + x11/rootv : LDLIBS := $(ATHENA_LIBS) + x11/xawtv-remote : LDLIBS := $(ATHENA_LIBS) + x11/propwatch : LDLIBS := $(ATHENA_LIBS) diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index 9f464eb00b96..ee4c2b2a1a13 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -1,11 +1,9 @@ -bin/alevtd bin/dump-mixers bin/motv bin/ntsc-cc bin/propwatch bin/record bin/rootv -bin/scantv bin/showriff bin/streamer bin/subtitles @@ -22,21 +20,28 @@ lib/xawtv/snd-oss.so lib/xawtv/write-avi.so @dirrm lib/xawtv man/es/man1/fbtv.1 +man/es/man1/rootv.1 man/es/man1/scantv.1 +man/es/man1/streamer.1 +man/es/man1/subtitles.1 +man/es/man1/ttv.1 +man/es/man1/v4lctl.1 +man/es/man1/xawtv-remote.1 man/es/man1/xawtv.1 -@dirrm man/es/man1 man/es/man5/xawtvrc.5 +man/es/man8/v4l-conf.8 +man/fr/man1/xawtv.1 +@dirrm man/fr/man1 +@dirrm man/fr +@dirrm man/es/man8 @dirrm man/es/man5 +@dirrm man/es/man1 @dirrm man/es @cwd %%X11BASE%% lib/X11/app-defaults/MoTV -lib/X11/fonts/misc/led-iso8859-1.pcf.gz -lib/X11/fonts/misc/led-iso8859-15.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 +@dirrm lib/X11/de/app-defaults +@dirrm lib/X11/de |