From 3f44d94bb724f0b8680f22c6255aa6bc76373ab8 Mon Sep 17 00:00:00 2001 From: Patrick Li Date: Sat, 27 Jul 2002 15:51:14 +0000 Subject: [PATCH] Update to 3.76 PR: ports/41037 Submitted by: maintainer --- graphics/xawtv/Makefile | 27 ++++++------ graphics/xawtv/distinfo | 2 +- graphics/xawtv/files/patch-common::Subdir.mk | 11 +++++ graphics/xawtv/files/patch-configure | 43 ++++--------------- graphics/xawtv/files/patch-console::Subdir.mk | 19 -------- graphics/xawtv/files/patch-debug::Subdir.mk | 13 ------ graphics/xawtv/files/patch-x11::Subdir.mk | 18 -------- graphics/xawtv/pkg-plist | 6 ++- multimedia/xawtv/Makefile | 27 ++++++------ multimedia/xawtv/distinfo | 2 +- .../xawtv/files/patch-common::Subdir.mk | 11 +++++ multimedia/xawtv/files/patch-configure | 43 ++++--------------- .../xawtv/files/patch-console::Subdir.mk | 19 -------- multimedia/xawtv/files/patch-debug::Subdir.mk | 13 ------ multimedia/xawtv/files/patch-x11::Subdir.mk | 18 -------- multimedia/xawtv/pkg-plist | 6 ++- 16 files changed, 80 insertions(+), 198 deletions(-) create mode 100644 graphics/xawtv/files/patch-common::Subdir.mk delete mode 100644 graphics/xawtv/files/patch-console::Subdir.mk delete mode 100644 graphics/xawtv/files/patch-debug::Subdir.mk delete mode 100644 graphics/xawtv/files/patch-x11::Subdir.mk create mode 100644 multimedia/xawtv/files/patch-common::Subdir.mk delete mode 100644 multimedia/xawtv/files/patch-console::Subdir.mk delete mode 100644 multimedia/xawtv/files/patch-debug::Subdir.mk delete mode 100644 multimedia/xawtv/files/patch-x11::Subdir.mk diff --git a/graphics/xawtv/Makefile b/graphics/xawtv/Makefile index 4dbd5966045e..7d8dc9e0b990 100644 --- a/graphics/xawtv/Makefile +++ b/graphics/xawtv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.75 +PORTVERSION= 3.76 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -24,31 +24,32 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes +USE_REINPLACE= yes -FILES_X11BASE= configure -FILES_LOCALBASE=configure console/Subdir.mk debug/Subdir.mk x11/Subdir.mk +FILES_LIBJPEG= 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 \ - subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1 +MAN1= alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.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 .include .if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients .endif PLIST_SUB+= X11PREFIX=${X11BASE} post-patch: -.for i in ${FILES_X11BASE} - ${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i -.endfor -.for i in ${FILES_LOCALBASE} - ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i + ${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \ + -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure + +.for i in ${FILES_LIBJPEG} + ${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i .endfor .include diff --git a/graphics/xawtv/distinfo b/graphics/xawtv/distinfo index 125bedb5ed8a..9acb5120fd1d 100644 --- a/graphics/xawtv/distinfo +++ b/graphics/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.75.tar.gz) = 9ae700538a7b0bbfa7e7aeb971d66930 +MD5 (xawtv_3.76.tar.gz) = b566d24b1212fd73e2d7a40a64400261 diff --git a/graphics/xawtv/files/patch-common::Subdir.mk b/graphics/xawtv/files/patch-common::Subdir.mk new file mode 100644 index 000000000000..a781967ff22e --- /dev/null +++ b/graphics/xawtv/files/patch-common::Subdir.mk @@ -0,0 +1,11 @@ +--- common/Subdir.mk.orig Sat Jul 27 10:24:27 2002 ++++ common/Subdir.mk Sat Jul 27 10:22:47 2002 +@@ -16,7 +16,7 @@ + common/midictrl.o + + # RegEdit.c is good old K&R ... +-common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes ++#common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes + + common/channel-no-x11.o:: common/channel.c + $(CC) $(CFLAGS) -DNO_X11=1 -Wp,-MD,$*.dep -c -o $@ $< diff --git a/graphics/xawtv/files/patch-configure b/graphics/xawtv/files/patch-configure index 34e560b7a2a3..cdbe16aa09be 100644 --- a/graphics/xawtv/files/patch-configure +++ b/graphics/xawtv/files/patch-configure @@ -1,46 +1,21 @@ ---- 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="-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib" - FOUND_OS="bsd" - ;; - *) -@@ -2591,10 +2591,10 @@ - /usr/XFree86/include/X11 - - /usr/include --/usr/local/include -+%%LOCALBASE%%/include - /usr/unsupported/include - /usr/athena/include --/usr/local/x11r5/include -+%%LOCALBASE%%/x11r5/include - /usr/lpp/Xamples/include - - /usr/openwin/include -@@ -4442,19 +4442,13 @@ - - echo "$as_me:4443: checking for X11 config directory" >&5 +--- configure.orig Wed Jul 24 19:13:38 2002 ++++ configure Sat Jul 27 10:05:07 2002 +@@ -4460,18 +4460,12 @@ + echo "$as_me:4460: 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:4449: result: $x11conf" >&5 + echo "$as_me:4466: result: $x11conf" >&5 echo "${ECHO_T}$x11conf" >&6 - echo "$as_me:4452: checking for X11 app-defaults directory" >&5 + echo "$as_me:4469: 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/X11R6/lib/X11 -if test -d /etc/X11/app-defaults; then - resdir=/etc/X11 -fi -+resdir=%%X11BASE%%/lib/X11 - echo "$as_me:4458: result: $resdir/app-defaults" >&5 + echo "$as_me:4475: result: $resdir/app-defaults" >&5 echo "${ECHO_T}$resdir/app-defaults" >&6 diff --git a/graphics/xawtv/files/patch-console::Subdir.mk b/graphics/xawtv/files/patch-console::Subdir.mk deleted file mode 100644 index 891683a314e7..000000000000 --- a/graphics/xawtv/files/patch-console::Subdir.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- 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/graphics/xawtv/files/patch-debug::Subdir.mk b/graphics/xawtv/files/patch-debug::Subdir.mk deleted file mode 100644 index 542ea9b30354..000000000000 --- a/graphics/xawtv/files/patch-debug::Subdir.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/graphics/xawtv/files/patch-x11::Subdir.mk b/graphics/xawtv/files/patch-x11::Subdir.mk deleted file mode 100644 index f1b3ad5adb63..000000000000 --- a/graphics/xawtv/files/patch-x11::Subdir.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/graphics/xawtv/pkg-plist b/graphics/xawtv/pkg-plist index ee4c2b2a1a13..ac028d55e8e0 100644 --- a/graphics/xawtv/pkg-plist +++ b/graphics/xawtv/pkg-plist @@ -1,6 +1,7 @@ bin/dump-mixers bin/motv bin/ntsc-cc +bin/pia bin/propwatch bin/record bin/rootv @@ -14,8 +15,11 @@ bin/xawtv bin/xawtv-remote lib/xawtv/conv-mjpeg.so lib/xawtv/drv0-bsd.so +lib/xawtv/flt-disor.so lib/xawtv/flt-gamma.so lib/xawtv/flt-invert.so +lib/xawtv/flt-smooth.so +lib/xawtv/read-avi.so lib/xawtv/snd-oss.so lib/xawtv/write-avi.so @dirrm lib/xawtv @@ -41,7 +45,7 @@ man/fr/man1/xawtv.1 lib/X11/app-defaults/MoTV lib/X11/de/app-defaults/MoTV lib/X11/it/app-defaults/MoTV -@dirrm lib/X11/it/app-defaults +@dirrm lib/X11/it/app-defaults @dirrm lib/X11/it @dirrm lib/X11/de/app-defaults @dirrm lib/X11/de diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 4dbd5966045e..7d8dc9e0b990 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.75 +PORTVERSION= 3.76 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -24,31 +24,32 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes +USE_REINPLACE= yes -FILES_X11BASE= configure -FILES_LOCALBASE=configure console/Subdir.mk debug/Subdir.mk x11/Subdir.mk +FILES_LIBJPEG= 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 \ - subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1 +MAN1= alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.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 .include .if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients .endif PLIST_SUB+= X11PREFIX=${X11BASE} post-patch: -.for i in ${FILES_X11BASE} - ${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i -.endfor -.for i in ${FILES_LOCALBASE} - ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i + ${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \ + -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure + +.for i in ${FILES_LIBJPEG} + ${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i .endfor .include diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo index 125bedb5ed8a..9acb5120fd1d 100644 --- a/multimedia/xawtv/distinfo +++ b/multimedia/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.75.tar.gz) = 9ae700538a7b0bbfa7e7aeb971d66930 +MD5 (xawtv_3.76.tar.gz) = b566d24b1212fd73e2d7a40a64400261 diff --git a/multimedia/xawtv/files/patch-common::Subdir.mk b/multimedia/xawtv/files/patch-common::Subdir.mk new file mode 100644 index 000000000000..a781967ff22e --- /dev/null +++ b/multimedia/xawtv/files/patch-common::Subdir.mk @@ -0,0 +1,11 @@ +--- common/Subdir.mk.orig Sat Jul 27 10:24:27 2002 ++++ common/Subdir.mk Sat Jul 27 10:22:47 2002 +@@ -16,7 +16,7 @@ + common/midictrl.o + + # RegEdit.c is good old K&R ... +-common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes ++#common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes + + common/channel-no-x11.o:: common/channel.c + $(CC) $(CFLAGS) -DNO_X11=1 -Wp,-MD,$*.dep -c -o $@ $< diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure index 34e560b7a2a3..cdbe16aa09be 100644 --- a/multimedia/xawtv/files/patch-configure +++ b/multimedia/xawtv/files/patch-configure @@ -1,46 +1,21 @@ ---- 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="-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib" - FOUND_OS="bsd" - ;; - *) -@@ -2591,10 +2591,10 @@ - /usr/XFree86/include/X11 - - /usr/include --/usr/local/include -+%%LOCALBASE%%/include - /usr/unsupported/include - /usr/athena/include --/usr/local/x11r5/include -+%%LOCALBASE%%/x11r5/include - /usr/lpp/Xamples/include - - /usr/openwin/include -@@ -4442,19 +4442,13 @@ - - echo "$as_me:4443: checking for X11 config directory" >&5 +--- configure.orig Wed Jul 24 19:13:38 2002 ++++ configure Sat Jul 27 10:05:07 2002 +@@ -4460,18 +4460,12 @@ + echo "$as_me:4460: 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:4449: result: $x11conf" >&5 + echo "$as_me:4466: result: $x11conf" >&5 echo "${ECHO_T}$x11conf" >&6 - echo "$as_me:4452: checking for X11 app-defaults directory" >&5 + echo "$as_me:4469: 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/X11R6/lib/X11 -if test -d /etc/X11/app-defaults; then - resdir=/etc/X11 -fi -+resdir=%%X11BASE%%/lib/X11 - echo "$as_me:4458: result: $resdir/app-defaults" >&5 + echo "$as_me:4475: 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 deleted file mode 100644 index 891683a314e7..000000000000 --- a/multimedia/xawtv/files/patch-console::Subdir.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index 542ea9b30354..000000000000 --- a/multimedia/xawtv/files/patch-debug::Subdir.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11::Subdir.mk deleted file mode 100644 index f1b3ad5adb63..000000000000 --- a/multimedia/xawtv/files/patch-x11::Subdir.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 ee4c2b2a1a13..ac028d55e8e0 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -1,6 +1,7 @@ bin/dump-mixers bin/motv bin/ntsc-cc +bin/pia bin/propwatch bin/record bin/rootv @@ -14,8 +15,11 @@ bin/xawtv bin/xawtv-remote lib/xawtv/conv-mjpeg.so lib/xawtv/drv0-bsd.so +lib/xawtv/flt-disor.so lib/xawtv/flt-gamma.so lib/xawtv/flt-invert.so +lib/xawtv/flt-smooth.so +lib/xawtv/read-avi.so lib/xawtv/snd-oss.so lib/xawtv/write-avi.so @dirrm lib/xawtv @@ -41,7 +45,7 @@ man/fr/man1/xawtv.1 lib/X11/app-defaults/MoTV lib/X11/de/app-defaults/MoTV lib/X11/it/app-defaults/MoTV -@dirrm lib/X11/it/app-defaults +@dirrm lib/X11/it/app-defaults @dirrm lib/X11/it @dirrm lib/X11/de/app-defaults @dirrm lib/X11/de