diff options
| author | arved <arved@FreeBSD.org> | 2005-01-10 00:19:24 +0800 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2005-01-10 00:19:24 +0800 |
| commit | c87a29e5c474e5ab564ffe028327794132346c74 (patch) | |
| tree | cc26efea8b69fc0688ca4526a6b51693b0f79e7a /multimedia | |
| parent | f2359424cfeb187bd8d208bf7c8e02827690364a (diff) | |
| download | freebsd-ports-graphics-c87a29e5c474e5ab564ffe028327794132346c74.tar.gz freebsd-ports-graphics-c87a29e5c474e5ab564ffe028327794132346c74.tar.zst freebsd-ports-graphics-c87a29e5c474e5ab564ffe028327794132346c74.zip | |
Update to 2.7.4
PR: 75765
Submitted by: Simon Barner <barner@gmx.de>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/nxtvepg/Makefile | 11 | ||||
| -rw-r--r-- | multimedia/nxtvepg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/nxtvepg/files/patch-tvsim::tvsim_main.c | 52 |
3 files changed, 11 insertions, 56 deletions
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile index f505713cd5e..1d223dd5ab9 100644 --- a/multimedia/nxtvepg/Makefile +++ b/multimedia/nxtvepg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nxtvepg -PORTVERSION= 2.7.1 +PORTVERSION= 2.7.4 CATEGORIES= multimedia tcl84 tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=${PORTNAME} @@ -19,6 +19,7 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 USE_GMAKE= yes USE_XLIB= yes USE_X_PREFIX= yes +USE_REINPLACE= yes MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} MAN1= nxtvepg.1 @@ -26,13 +27,19 @@ MYPORTDOCS= README TODO CHANGES manual.html .include <bsd.port.pre.mk> -pre-everything:: .if ${OSVERSION} < 500000 ONLY_FOR_ARCHS= i386 .else ONLY_FOR_ARCHS= alpha i386 .endif +.if ${OSVERSION} > 502100 +post-patch: + ${REINPLACE_CMD} -e "s,machine/ioctl_bt848.h,dev/bktr/ioctl_bt848.h,; \ + s,machine/ioctl_meteor.h,dev/bktr/ioctl_meteor.h," \ + ${WRKSRC}/epgvbi/btdrv4linux.c ${WRKSRC}/tvsim/tvsim_main.c +.endif + post-install: ${INSTALL_PROGRAM} ${WRKSRC}/nxtvepg ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/Nxtvepg.ad ${PREFIX}/lib/X11/app-defaults/Nxtvepg diff --git a/multimedia/nxtvepg/distinfo b/multimedia/nxtvepg/distinfo index b694fe9e15c..fbbdbdadf1a 100644 --- a/multimedia/nxtvepg/distinfo +++ b/multimedia/nxtvepg/distinfo @@ -1,2 +1,2 @@ -MD5 (nxtvepg-2.7.1.tar.gz) = 7625d7e9d4a57ab58277e7edb073f931 -SIZE (nxtvepg-2.7.1.tar.gz) = 1217393 +MD5 (nxtvepg-2.7.4.tar.gz) = 92259e3c8e805fa863b00b8a29791ebd +SIZE (nxtvepg-2.7.4.tar.gz) = 1235854 diff --git a/multimedia/nxtvepg/files/patch-tvsim::tvsim_main.c b/multimedia/nxtvepg/files/patch-tvsim::tvsim_main.c deleted file mode 100644 index 52442bf286b..00000000000 --- a/multimedia/nxtvepg/files/patch-tvsim::tvsim_main.c +++ /dev/null @@ -1,52 +0,0 @@ ---- tvsim/tvsim_main.c.orig Fri Jul 30 16:37:05 2004 -+++ tvsim/tvsim_main.c Fri Jul 30 17:00:10 2004 -@@ -63,6 +63,9 @@ - #include "tvsim/tvsim_gui.h" - #include "tvsim/tvsim_version.h" - -+#if defined(__FreeBSD__) || defined(__NetBSD__) -+#include <machine/ioctl_bt848.h> -+#endif - - // prior to 8.4 there's a SEGV when evaluating const scripts (Tcl tries to modify the string) - #if (TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) -@@ -493,7 +496,6 @@ - } - - #else // __NetBSD__ || __FreeBSD__ -- char * pDevName; - ulong lfreq; - uint norm; - bool result = FALSE; -@@ -505,26 +507,26 @@ - { - if ( (*pIsTuner) && (lfreq != 0) ) - { -- if (tuner_fd != -1) -+ if (video_fd != -1) - { - // mute audio - int mute_arg = AUDIO_MUTE; -- if (ioctl (tuner_fd, BT848_SAUDIO, &mute_arg) == 0) -+ if (ioctl (video_fd, BT848_SAUDIO, &mute_arg) == 0) - { - dprintf0("Muted tuner audio.\n"); - } - else -- fprintf(stderr, "muting audio (ioctl AUDIO_MUTE)\n", strerror(errno)); -+ fprintf(stderr, "muting audio (ioctl AUDIO_MUTE): %s\n", strerror(errno)); - - // Set the tuner frequency -- if(ioctl(tuner_fd, VIDIOCSFREQ, &lfreq) == 0) -+ if(ioctl(video_fd, TVTUNER_SETFREQ, &lfreq) == 0) - { - dprintf1("Vbi-TuneChannel: set to %.2f\n", (double)freq/16); - - result = TRUE; - } - else -- fprintf(stderr, "setting tuner frequency (ioctl VIDIOCSFREQ): \n", strerror(errno)); -+ fprintf(stderr, "setting tuner frequency (ioctl TVTUNER_SETFREQ): %s\n", strerror(errno)); - } - } - } |