svn commit: r306989 - in head/audio/xoscope: . files
Diane Bruce
db at FreeBSD.org
Mon Nov 5 00:05:16 UTC 2012
Author: db
Date: Mon Nov 5 00:05:15 2012
New Revision: 306989
URL: http://svnweb.freebsd.org/changeset/ports/306989
Log:
- upgrade to version 2.0
- unbreak on x64
- clean up header
Feature safe: yes
Added:
head/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.am (contents, props changed)
head/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.in (contents, props changed)
Deleted:
head/audio/xoscope/files/patch-config.h.in
head/audio/xoscope/files/patch-sc_linux.c
Modified:
head/audio/xoscope/Makefile (contents, props changed)
head/audio/xoscope/distinfo (contents, props changed)
head/audio/xoscope/files/patch-ser_unix.c (contents, props changed)
head/audio/xoscope/pkg-plist (contents, props changed)
Modified: head/audio/xoscope/Makefile
==============================================================================
--- head/audio/xoscope/Makefile Sun Nov 4 22:25:22 2012 (r306988)
+++ head/audio/xoscope/Makefile Mon Nov 5 00:05:15 2012 (r306989)
@@ -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>
Modified: head/audio/xoscope/distinfo
==============================================================================
--- head/audio/xoscope/distinfo Sun Nov 4 22:25:22 2012 (r306988)
+++ head/audio/xoscope/distinfo Mon Nov 5 00:05:15 2012 (r306989)
@@ -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
Added: head/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.am Mon Nov 5 00:05:15 2012 (r306989)
@@ -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`
Added: head/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/xoscope/files/patch-gtkdatabox-0.6.0_gtk_Makefile.in Mon Nov 5 00:05:15 2012 (r306989)
@@ -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
Modified: head/audio/xoscope/files/patch-ser_unix.c
==============================================================================
--- head/audio/xoscope/files/patch-ser_unix.c Sun Nov 4 22:25:22 2012 (r306988)
+++ head/audio/xoscope/files/patch-ser_unix.c Mon Nov 5 00:05:15 2012 (r306989)
@@ -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);
Modified: head/audio/xoscope/pkg-plist
==============================================================================
--- head/audio/xoscope/pkg-plist Sun Nov 4 22:25:22 2012 (r306988)
+++ head/audio/xoscope/pkg-plist Mon Nov 5 00:05:15 2012 (r306989)
@@ -1,7 +1,2 @@
bin/xoscope
-bin/bitscope
-libexec/xoscope/operl
-libexec/xoscope/xy
-libexec/xoscope/ofreq.ini
-libexec/xoscope/offt
@dirrm libexec/xoscope
More information about the svn-ports-head
mailing list