From cc1ec24ac147ddcdbd00f3737470668e0b67cd0f Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Fri, 17 Jun 2011 19:53:44 +0000 Subject: Update to 20110616. --- multimedia/w_scan/Makefile | 8 +++++--- multimedia/w_scan/distinfo | 4 ++-- multimedia/w_scan/files/patch-Makefile.in | 10 +++++----- multimedia/w_scan/files/patch-dump-vlc-m3u.c | 17 ----------------- multimedia/w_scan/files/patch-scan.c | 22 +++++++++++----------- 5 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 multimedia/w_scan/files/patch-dump-vlc-m3u.c (limited to 'multimedia/w_scan') diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile index d5d102ad8ee5..10b5cddfbbe2 100644 --- a/multimedia/w_scan/Makefile +++ b/multimedia/w_scan/Makefile @@ -6,8 +6,7 @@ # PORTNAME= w_scan -PORTVERSION= 20110206 -PORTREVISION= 2 +PORTVERSION= 20110616 CATEGORIES= multimedia MASTER_SITES= http://wirbel.htpc-forum.de/w_scan/ @@ -19,11 +18,14 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia USE_BZIP2= yes GNU_CONFIGURE= yes PATCH_STRIP= -p1 -CFLAGS+= -I"${LOCALBASE}/include" +USE_GETTEXT= yes +CPPFLAGS+= -I"${LOCALBASE}/include" +LDFLAGS+= -L"${LOCALBASE}/lib\ -liconv" PORTDOCS= COPYING ChangeLog README PLIST_FILES= bin/${PORTNAME} MAN1= w_scan.1 MAKE_JOBS_SAFE= yes +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" post-patch: ${REINPLACE_CMD} -f ${FILESDIR}/types.sed ${WRKSRC}/configure ${WRKSRC}/*.c ${WRKSRC}/*.h diff --git a/multimedia/w_scan/distinfo b/multimedia/w_scan/distinfo index 1a5cec718e24..678516a19537 100644 --- a/multimedia/w_scan/distinfo +++ b/multimedia/w_scan/distinfo @@ -1,2 +1,2 @@ -SHA256 (w_scan-20110206.tar.bz2) = 6fc8f2046ab8c656460d1f293cc0af41877b471ad70df276ad2f8fb9ba32c41f -SIZE (w_scan-20110206.tar.bz2) = 454215 +SHA256 (w_scan-20110616.tar.bz2) = 23fa9a85ff494fdb20a693a0f2a682fc6e72cedcf6c97d85dd8532bc73c048aa +SIZE (w_scan-20110616.tar.bz2) = 484326 diff --git a/multimedia/w_scan/files/patch-Makefile.in b/multimedia/w_scan/files/patch-Makefile.in index 7a3bd6471043..338d6915a452 100644 --- a/multimedia/w_scan/files/patch-Makefile.in +++ b/multimedia/w_scan/files/patch-Makefile.in @@ -1,11 +1,11 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -209,7 +209,7 @@ __VERSION = $(shell date +%Y%m%d) - __OLDVER = $(shell cat configure.in | grep AC_INIT | sed -e "s|\[|\\\[|g" -e "s|\]|\\\]|g") - AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip - w_scan_SOURCES = atsc_psip_section.c atsc_psip_section.h config.h countries.c countries.h descriptors.c descriptors.h diseqc.c diseqc.h dump-dvbscan.c dump-dvbscan.h dump-kaffeine.c dump-kaffeine.h dump-vdr.c dump-vdr.h dump-xine.c dump-xine.h dump-mplayer.c dump-mplayer.h dump-vlc-m3u.c dump-vlc-m3u.h dvbscan.c dvbscan.h extended_frontend.h list.h lnb.c lnb.h parse-dvbscan.c parse-dvbscan.h satellites.c satellites.h scan.c scan.h section.c section.h version.h +@@ -218,7 +218,7 @@ w_scan_SOURCES = atsc_psip_section.c ats + parse-dvbscan.c parse-dvbscan.h satellites.c satellites.h \ + scan.c scan.h section.c section.h version.h iconv_codes.c \ + iconv_codes.h char-coding.c char-coding.h -bin_SCRIPTS = w_scan_start.sh +#bin_SCRIPTS = w_scan_start.sh dist_man_MANS = doc/w_scan.1 EXTRA_DIST = doc pci.classes pci.ids usb.classes usb.ids w_scan w_scan_start.sh - all: config.h + AM_CFLAGS = -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter diff --git a/multimedia/w_scan/files/patch-dump-vlc-m3u.c b/multimedia/w_scan/files/patch-dump-vlc-m3u.c deleted file mode 100644 index b51b4c3b55fd..000000000000 --- a/multimedia/w_scan/files/patch-dump-vlc-m3u.c +++ /dev/null @@ -1,17 +0,0 @@ ---- a/dump-vlc-m3u.c -+++ b/dump-vlc-m3u.c -@@ -488,11 +488,11 @@ void vlc_dump_dvb_parameters_as_xspf (FI - switch (p->u.qpsk.polarization) { - case POLARIZATION_HORIZONTAL: - case POLARIZATION_CIRCULAR_LEFT: -- fprintf (f, "dvb-voltage=18,\n"); -+ fprintf (f, "voltage=18,"); - break; - default: -- fprintf (f, "dvb-voltage=13,\n"); -- break; -+ fprintf (f, "voltage=13,"); -+ break; - } - fprintf (f, "tone=%i", p->frequency >= lnbp->switch_val); - diff --git a/multimedia/w_scan/files/patch-scan.c b/multimedia/w_scan/files/patch-scan.c index 12b5180c50c5..5fa98523dca7 100644 --- a/multimedia/w_scan/files/patch-scan.c +++ b/multimedia/w_scan/files/patch-scan.c @@ -1,13 +1,13 @@ --- a/scan.c +++ b/scan.c -@@ -2866,8 +2866,8 @@ int main (int argc, char **argv) - bad_usage(argv[0]); - return -1; - } -- if (((adapter > 7) && (adapter != 999)) || (adapter < 0)) { -- info("Invalid adapter: out of range (0..7)\n"); -+ if (((adapter > 255) && (adapter != 999)) || (adapter < 0)) { -+ info("Invalid adapter: out of range (0..255)\n"); - bad_usage(argv[0]); - return -1; - } +@@ -2936,8 +2936,8 @@ int main (int argc, char **argv) + cleanup(); + return -1; + } +- if (((adapter > 7) && (adapter != 999)) || (adapter < 0)) { +- info("Invalid adapter: out of range (0..7)\n"); ++ if (((adapter > 255) && (adapter != 999)) || (adapter < 0)) { ++ info("Invalid adapter: out of range (0..255)\n"); + bad_usage(argv[0]); + cleanup(); + return -1; -- cgit v1.2.3