diff options
author | Diane Bruce <db@FreeBSD.org> | 2012-11-05 00:05:15 +0000 |
---|---|---|
committer | Diane Bruce <db@FreeBSD.org> | 2012-11-05 00:05:15 +0000 |
commit | 6dbc85d8dfa09dd117beb38c16c1285a4a5723bd (patch) | |
tree | a268e5649fba52d8e5c00cd49f4b1ca6a4982f44 /audio/xoscope | |
parent | Update to the 20121103 snapshot of GCC 4.7.3. (diff) |
- upgrade to version 2.0
- unbreak on x64
- clean up header
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=306989
Diffstat (limited to 'audio/xoscope')
-rw-r--r-- | audio/xoscope/Makefile | 12 | ||||
-rw-r--r-- | audio/xoscope/distinfo | 4 | ||||
-rw-r--r-- | audio/xoscope/files/patch-config.h.in | 21 | ||||
-rw-r--r-- | audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.am | 11 | ||||
-rw-r--r-- | audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.in | 13 | ||||
-rw-r--r-- | audio/xoscope/files/patch-sc_linux.c | 33 | ||||
-rw-r--r-- | audio/xoscope/files/patch-ser_unix.c | 35 | ||||
-rw-r--r-- | audio/xoscope/pkg-plist | 5 |
8 files changed, 46 insertions, 88 deletions
diff --git a/audio/xoscope/Makefile b/audio/xoscope/Makefile index 76f8bd63beb4..722385c54926 100644 --- a/audio/xoscope/Makefile +++ b/audio/xoscope/Makefile @@ -1,12 +1,7 @@ -# ports collection makefile for: xoscope -# Date created: March 29, 2008 -# Whom: db -# # $FreeBSD$ -# PORTNAME= xoscope -PORTVERSION= 1.12 +PORTVERSION= 2.0 CATEGORIES= audio hamradio MASTER_SITES= SF EXTRACT_SUFX= .tgz @@ -17,10 +12,9 @@ COMMENT= Sound card oscilloscope GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} USE_GMAKE= yes -USE_GNOME= gtk12 +USE_GNOME= gtk20 USE_XORG= x11 -ONLY_FOR_ARCHS= i386 -MAN1= xoscope.1 oscope.1 +MAN1= xoscope.1 .include <bsd.port.mk> diff --git a/audio/xoscope/distinfo b/audio/xoscope/distinfo index 1019fd6cebf9..0c127e43836e 100644 --- a/audio/xoscope/distinfo +++ b/audio/xoscope/distinfo @@ -1,2 +1,2 @@ -SHA256 (xoscope-1.12.tgz) = d7dec98f0d85f7ce889d0b2fcb4ed683a6384057ccea2ab531a0710969ff7ca2 -SIZE (xoscope-1.12.tgz) = 269889 +SHA256 (xoscope-2.0.tgz) = a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 +SIZE (xoscope-2.0.tgz) = 334875 diff --git a/audio/xoscope/files/patch-config.h.in b/audio/xoscope/files/patch-config.h.in deleted file mode 100644 index ce1aa903b5fc..000000000000 --- a/audio/xoscope/files/patch-config.h.in +++ /dev/null @@ -1,21 +0,0 @@ ---- config.h.in.orig 2008-03-29 22:30:23.000000000 -0400 -+++ config.h.in 2008-03-29 22:33:00.000000000 -0400 -@@ -11,6 +11,9 @@ - * - */ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - - /* Define to empty if the keyword does not work. */ - #undef const -@@ -200,4 +203,8 @@ - - /* extra places to look for serial scopes (set to {""} to not search) */ - /* ({"", "/dev/ttyS0", "/dev/ttyS1", "/dev/ttyS2", "/dev/ttyS3"}) */ -+#ifdef BSD -+#define PSDEVS {"", "/dev/ttyd0", "/dev/ttyd1", "/dev/ttyd2", "/dev/ttyd3"} -+#else - #define PSDEVS {"", "/dev/ttyS0", "/dev/ttyS1", "/dev/ttyS2", "/dev/ttyS3"} -+#endif diff --git a/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.am b/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.am new file mode 100644 index 000000000000..e87e83d5dfea --- /dev/null +++ b/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.am @@ -0,0 +1,11 @@ +--- gtkdatabox-0.6.0.0/gtk/Makefile.am.orig 2012-11-04 10:55:25.000000000 -0500 ++++ gtkdatabox-0.6.0.0/gtk/Makefile.am 2012-11-04 10:55:48.000000000 -0500 +@@ -30,8 +30,4 @@ + AM_CFLAGS =\ + -O2\ + -Wall -pedantic\ +- -DG_DISABLE_DEPRECATED\ +- -DGDK_DISABLE_DEPRECATED\ +- -DGDK_PIXBUF_DISABLE_DEPRECATED\ +- -DGTK_DISABLE_DEPRECATED\ + `pkg-config gtk+-2.0 --cflags` diff --git a/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.in b/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.in new file mode 100644 index 000000000000..c8caf31af229 --- /dev/null +++ b/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.in @@ -0,0 +1,13 @@ +--- gtkdatabox-0.6.0.0/gtk/Makefile.in.orig 2012-11-04 10:45:01.000000000 -0500 ++++ gtkdatabox-0.6.0.0/gtk/Makefile.in 2012-11-04 10:45:27.000000000 -0500 +@@ -193,10 +193,6 @@ + AM_CFLAGS = \ + -O2\ + -Wall -pedantic\ +- -DG_DISABLE_DEPRECATED\ +- -DGDK_DISABLE_DEPRECATED\ +- -DGDK_PIXBUF_DISABLE_DEPRECATED\ +- -DGTK_DISABLE_DEPRECATED\ + `pkg-config gtk+-2.0 --cflags` + + all: all-am diff --git a/audio/xoscope/files/patch-sc_linux.c b/audio/xoscope/files/patch-sc_linux.c deleted file mode 100644 index 3d0e179b3476..000000000000 --- a/audio/xoscope/files/patch-sc_linux.c +++ /dev/null @@ -1,33 +0,0 @@ ---- sc_linux.c.orig 2005-06-28 17:34:50.000000000 -0400 -+++ sc_linux.c 2008-07-26 19:20:00.000000000 -0400 -@@ -21,6 +21,9 @@ - #include <stdio.h> - #include <unistd.h> - #include <string.h> -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - #include <fcntl.h> - #include <errno.h> - #include <stdlib.h> /* for abs() */ -@@ -91,6 +94,9 @@ - static void - check_status_ioctl(int d, int request, void *argp, int line) - { -+ if (d < 0) { -+ return; -+ } - if (ioctl(d, request, argp) < 0) { - snd_errormsg1 = "sound ioctl"; - snd_errormsg2 = strerror(errno); -@@ -169,8 +175,10 @@ - return 0; - } - -+#ifndef BSD - parm = dma; /* set DMA buffer size */ - check_status_ioctl(snd, SOUND_PCM_SUBDIVIDE, &parm, __LINE__); -+#endif - - parm = chan; /* set mono/stereo */ - //check_status_ioctl(snd, SOUND_PCM_WRITE_CHANNELS, &parm, __LINE__); diff --git a/audio/xoscope/files/patch-ser_unix.c b/audio/xoscope/files/patch-ser_unix.c index 4b5b42de2ba2..90609fa51f31 100644 --- a/audio/xoscope/files/patch-ser_unix.c +++ b/audio/xoscope/files/patch-ser_unix.c @@ -1,7 +1,7 @@ ---- ser_unix.c.orig 2008-03-29 20:34:36.000000000 -0400 -+++ ser_unix.c 2008-03-29 20:53:04.000000000 -0400 -@@ -13,7 +13,14 @@ - #include <stdlib.h> +--- ser_unix.c.orig 2008-12-17 12:46:15.000000000 -0500 ++++ ser_unix.c 2012-11-04 09:22:00.000000000 -0500 +@@ -14,7 +14,14 @@ + #include <errno.h> #include <unistd.h> #include <string.h> +#if (defined(__unix__) || defined(unix)) && !defined(USG) @@ -15,7 +15,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/ioctl.h> -@@ -23,7 +30,11 @@ +@@ -24,7 +31,11 @@ char device[512] = ""; /* Serial device */ int sflags; @@ -25,9 +25,9 @@ struct termio stbuf, svbuf; /* termios: svbuf=saved, stbuf=set */ +#endif - /* return a single byte from the serial device or return -1 if none avail. */ - int -@@ -65,7 +76,11 @@ + char serial_error[256]; + +@@ -68,7 +79,11 @@ cleanup_serial(int fd) { if (fd > 0) { @@ -36,11 +36,11 @@ +#else if (ioctl(fd, TCSETA, &svbuf) < 0) { +#endif - sprintf(error, "%s: can't ioctl set device %s", progname, device); - perror(error); + /* sprintf(serial_error, "Can't ioctl set device %s", device); */ + /* perror(error); */ } -@@ -84,13 +99,21 @@ - perror(error); +@@ -86,12 +101,20 @@ + sprintf(serial_error, "%s %s", dev, strerror(errno)); return(0); } +#ifdef BSD @@ -48,8 +48,7 @@ +#else if (ioctl(fd, TCGETA, &svbuf) < 0) { /* save settings */ +#endif - sprintf(error, "%s: can't ioctl get device %s", progname, dev); - perror(error); + sprintf(serial_error, "%s Can't ioctl TCGETA", dev); close(fd); return(0); } @@ -58,9 +57,9 @@ +#else if (ioctl(fd, TCSETA, &stbuf) < 0) { +#endif - sprintf(error, "%s: can't ioctl set device %s", progname, dev); - perror(error); + sprintf(serial_error, "%s Can't ioctl TCSETA", dev); close(fd); + return(0); @@ -101,7 +124,11 @@ return (1); /* serial port scope found! */ } @@ -70,6 +69,6 @@ +#else if (ioctl(fd, TCSETA, &svbuf) < 0) { /* restore settings */ +#endif - sprintf(error, "%s: can't ioctl set device %s", progname, dev); - perror(error); + #if 0 + sprintf(serial_error, "Can't ioctl (set) %s", dev); close(fd); diff --git a/audio/xoscope/pkg-plist b/audio/xoscope/pkg-plist index 12a404dee7c9..557f4edbce5b 100644 --- a/audio/xoscope/pkg-plist +++ b/audio/xoscope/pkg-plist @@ -1,7 +1,2 @@ bin/xoscope -bin/bitscope -libexec/xoscope/operl -libexec/xoscope/xy -libexec/xoscope/ofreq.ini -libexec/xoscope/offt @dirrm libexec/xoscope |