Date: Sat, 27 Jul 2002 10:43:46 +0200 (CEST) From: Oliver Lehmann <lehmann@ans-netz.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <lehmann@ans-netz.de> Subject: ports/41037: update-port: graphics/xawtv Message-ID: <200207270843.g6R8hkNJ042578@kartoffel.salatschuessel.net>
next in thread | raw e-mail | index | archive | help
>Number: 41037 >Category: ports >Synopsis: update-port: graphics/xawtv >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jul 27 01:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 4.6-STABLE FreeBSD 4.6-STABLE #2: Wed Jul 10 21:57:02 CEST 2002 olivleh1@nudel.salatschuessel.net:/usr/obj/i386/usr/src/sys/KARTOFFEL i386 update xawtv port 3.75 => 3.76 following patch files are removed: patch-console::Subdir.mk patch-debug::Subdir.mk patch-x11::Subdir.mk >Description: >How-To-Repeat: >Fix: --- xawtv.patch begins here --- diff -ruN xawtv.old/Makefile /usr/ports/graphics/xawtv/Makefile --- xawtv.old/Makefile Sat Jul 27 10:01:11 2002 +++ /usr/ports/graphics/xawtv/Makefile Sat Jul 27 10:37:33 2002 @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.75 +PORTVERSION= 3.76 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -24,13 +24,14 @@ 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 @@ -44,11 +45,14 @@ 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 <bsd.port.post.mk> diff -ruN xawtv.old/distinfo /usr/ports/graphics/xawtv/distinfo --- xawtv.old/distinfo Sat Jul 27 10:01:11 2002 +++ /usr/ports/graphics/xawtv/distinfo Sat Jul 27 10:13:29 2002 @@ -1 +1 @@ -MD5 (xawtv_3.75.tar.gz) = 9ae700538a7b0bbfa7e7aeb971d66930 +MD5 (xawtv_3.76.tar.gz) = b566d24b1212fd73e2d7a40a64400261 diff -ruN xawtv.old/files/patch-common::Subdir.mk /usr/ports/graphics/xawtv/files/patch-common::Subdir.mk --- xawtv.old/files/patch-common::Subdir.mk Thu Jan 1 01:00:00 1970 +++ /usr/ports/graphics/xawtv/files/patch-common::Subdir.mk Sat Jul 27 10:24:52 2002 @@ -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 -ruN xawtv.old/files/patch-configure /usr/ports/graphics/xawtv/files/patch-configure --- xawtv.old/files/patch-configure Sat Jul 27 10:01:11 2002 +++ /usr/ports/graphics/xawtv/files/patch-configure Sat Jul 27 10:05:35 2002 @@ -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 -ruN xawtv.old/files/patch-console::Subdir.mk /usr/ports/graphics/xawtv/files/patch-console::Subdir.mk --- xawtv.old/files/patch-console::Subdir.mk Sat Jul 27 10:01:11 2002 +++ /usr/ports/graphics/xawtv/files/patch-console::Subdir.mk Thu Jan 1 01:00:00 1970 @@ -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 -ruN xawtv.old/files/patch-debug::Subdir.mk /usr/ports/graphics/xawtv/files/patch-debug::Subdir.mk --- xawtv.old/files/patch-debug::Subdir.mk Sat Jul 27 10:01:11 2002 +++ /usr/ports/graphics/xawtv/files/patch-debug::Subdir.mk Thu Jan 1 01:00:00 1970 @@ -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 -ruN xawtv.old/files/patch-x11::Subdir.mk /usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk --- xawtv.old/files/patch-x11::Subdir.mk Sat Jul 27 10:01:11 2002 +++ /usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk Thu Jan 1 01:00:00 1970 @@ -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 -ruN xawtv.old/pkg-plist /usr/ports/graphics/xawtv/pkg-plist --- xawtv.old/pkg-plist Sat Jul 27 10:01:11 2002 +++ /usr/ports/graphics/xawtv/pkg-plist Sat Jul 27 10:36:45 2002 @@ -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-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 --- xawtv.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207270843.g6R8hkNJ042578>