svn commit: r338163 - in head/comms/unixcw: . files
Diane Bruce
db at FreeBSD.org
Mon Dec 30 19:41:23 UTC 2013
Author: db
Date: Mon Dec 30 19:41:21 2013
New Revision: 338163
URL: http://svnweb.freebsd.org/changeset/ports/338163
Log:
- Update to latest 3.3.0
- Upstream have fixed some of the FreeBSD problems but not all, hence
some of our patches are no longer required
Submitted by: portscout@
Deleted:
head/comms/unixcw/files/patch-configure.ac
head/comms/unixcw/files/patch-configure.qt.inc
head/comms/unixcw/files/patch-src_cwutils_dictionary.h
head/comms/unixcw/files/patch-src_libcw_libcw.c
head/comms/unixcw/files/patch-src_libcw_libcw_console.c
Modified:
head/comms/unixcw/Makefile
head/comms/unixcw/distinfo
head/comms/unixcw/files/patch-src_libcw_Makefile.am
head/comms/unixcw/files/patch-src_libcw_Makefile.in
head/comms/unixcw/files/patch-src_libcw_libcw_oss.c
head/comms/unixcw/files/patch-src_xcwcp_Makefile.am
head/comms/unixcw/files/patch-src_xcwcp_Makefile.in
head/comms/unixcw/pkg-plist
Modified: head/comms/unixcw/Makefile
==============================================================================
--- head/comms/unixcw/Makefile Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/Makefile Mon Dec 30 19:41:21 2013 (r338163)
@@ -1,10 +1,10 @@
# $FreeBSD$
PORTNAME= unixcw
-PORTVERSION= 3.2.0
+PORTVERSION= 3.3.0
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME= unixcw_3.2.0.orig
+DISTNAME= unixcw_3.3.0.orig
MAINTAINER= db at FreeBSD.org
COMMENT= Libs for cw on unix
Modified: head/comms/unixcw/distinfo
==============================================================================
--- head/comms/unixcw/distinfo Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/distinfo Mon Dec 30 19:41:21 2013 (r338163)
@@ -1,2 +1,2 @@
-SHA256 (unixcw_3.2.0.orig.tar.gz) = 638eb9cf2255dfee7e0b548716abbcdfe685b973a4180f28718284a972f5eba8
-SIZE (unixcw_3.2.0.orig.tar.gz) = 604561
+SHA256 (unixcw_3.3.0.orig.tar.gz) = 2d0e38b5758014942612369eaa1b4989c44edcc1120abf3a30515c55413d4db0
+SIZE (unixcw_3.3.0.orig.tar.gz) = 657613
Modified: head/comms/unixcw/files/patch-src_libcw_Makefile.am
==============================================================================
--- head/comms/unixcw/files/patch-src_libcw_Makefile.am Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/files/patch-src_libcw_Makefile.am Mon Dec 30 19:41:21 2013 (r338163)
@@ -1,5 +1,5 @@
---- src/libcw/Makefile.am.orig 2013-01-05 07:03:23.000000000 -0500
-+++ src/libcw/Makefile.am 2013-07-17 10:05:14.000000000 -0500
+--- src/libcw/Makefile.am.orig 2013-10-21 13:44:21.000000000 -0500
++++ src/libcw/Makefile.am 2013-12-30 09:58:21.000000000 -0500
@@ -41,7 +41,7 @@
# target-specific linker flags (objects to link)
@@ -9,7 +9,7 @@
# target-specific linker flags (additional flags)
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-@@ -78,7 +78,7 @@
+@@ -79,7 +79,7 @@
libcwunittests_CPPFLAGS = $(AM_CPPFLAGS) -DLIBCW_UNIT_TESTS
# target-specific linker flags (objects to link)
@@ -18,19 +18,12 @@
# target-specific compiler flags
libcwunittests_CFLAGS = -rdynamic
-@@ -94,12 +94,12 @@
+@@ -95,7 +95,7 @@
standalone:
-- gcc -O0 -g -DHAVE_CONFIG_H -std=c99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -ldl -lpthread
-+ $(CC) -O0 -g -DHAVE_CONFIG_H -std=c99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -lpthread
+- gcc -O0 -g -DHAVE_CONFIG_H -std=gnu99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcwtest.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -ldl -lpthread -o libcw_standalone
++ ${CC} -O0 -g -DHAVE_CONFIG_H -std=gnu99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcwtest.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -ldl -lpthread -o libcw_standalone
# target: libcw.pc
--pkgconfigdir = $(libdir)/pkgconfig
--
-+#pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${prefix}/libdata/pkgconfig
-
-
-
Modified: head/comms/unixcw/files/patch-src_libcw_Makefile.in
==============================================================================
--- head/comms/unixcw/files/patch-src_libcw_Makefile.in Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/files/patch-src_libcw_Makefile.in Mon Dec 30 19:41:21 2013 (r338163)
@@ -1,6 +1,6 @@
---- src/libcw/Makefile.in.orig 2013-01-11 13:29:34.000000000 -0500
-+++ src/libcw/Makefile.in 2013-12-28 16:17:07.533315780 -0500
-@@ -324,7 +324,7 @@
+--- src/libcw/Makefile.in.orig 2013-12-09 18:00:56.000000000 -0500
++++ src/libcw/Makefile.in 2013-12-30 09:56:43.000000000 -0500
+@@ -572,7 +572,7 @@
# target-specific linker flags (objects to link)
# libcw_la_LIBADD=-lm -lpthread $(AC_ALSA_LIBS) $(AC_PULSEAUDIO_LIBS)
@@ -9,7 +9,7 @@
# target-specific linker flags (additional flags)
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-@@ -355,13 +355,13 @@
+@@ -604,13 +604,13 @@
libcwunittests_CPPFLAGS = $(AM_CPPFLAGS) -DLIBCW_UNIT_TESTS
# target-specific linker flags (objects to link)
@@ -25,12 +25,12 @@
# CLEANFILES extends list of files that need to be removed when
# calling "make clean"
-@@ -1114,7 +1114,7 @@
+@@ -1430,7 +1430,7 @@
rm -f signatures functions
standalone:
-- gcc -O0 -g -DHAVE_CONFIG_H -std=c99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -ldl -lpthread
-+ gcc -O0 -g -DHAVE_CONFIG_H -std=c99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -lpthread
+- gcc -O0 -g -DHAVE_CONFIG_H -std=gnu99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcwtest.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -ldl -lpthread -o libcw_standalone
++ ${CC} -O0 -g -DHAVE_CONFIG_H -std=gnu99 -I. -I../../src -I../../src/ -I../../src/libcw/ -I../../src/cwutils/ -DLIBCW_WITH_DEV -DLIBCW_STANDALONE -DLIBCW_WITH_PULSEAUDIO -DLIBCW_WITH_OSS -DLIBCW_WITH_ALSA -DLIBCW_WITH_CONSOLE libcw.c libcwtest.c libcw_console.c libcw_null.c libcw_pa.c libcw_debug.c libcw_oss.c libcw_alsa.c -lm -ldl -lpthread -o libcw_standalone
greptest.sh:
echo './libcwunittests | grep "test result: success"' > greptest.sh
chmod +x greptest.sh
Modified: head/comms/unixcw/files/patch-src_libcw_libcw_oss.c
==============================================================================
--- head/comms/unixcw/files/patch-src_libcw_libcw_oss.c Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/files/patch-src_libcw_libcw_oss.c Mon Dec 30 19:41:21 2013 (r338163)
@@ -1,11 +1,21 @@
---- src/libcw/libcw_oss.c.orig 2013-12-26 11:47:03.000000000 -0500
-+++ src/libcw/libcw_oss.c 2013-12-27 18:56:52.000000000 -0500
-@@ -291,14 +291,14 @@
+--- src/libcw/libcw_oss.c.orig 2013-01-03 17:09:29.000000000 -0500
++++ src/libcw/libcw_oss.c 2013-12-30 14:20:18.000000000 -0500
+@@ -48,6 +48,9 @@
+ #include <stdbool.h>
+ #include <math.h>
+
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++# include <sys/param.h>
++#endif
+
+ #include "libcw_internal.h"
+ #include "libcw_oss.h"
+@@ -291,14 +294,14 @@
"cw_oss: ioctl(SNDCTL_DSP_SYNC): \"%s\"", strerror(errno));
return CW_FAILURE;
}
-
-+#if 0
++#ifndef __FreeBSD__
parameter = 0; /* ignored */
if (ioctl(*fd, SNDCTL_DSP_POST, ¶meter) == -1) {
cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
Modified: head/comms/unixcw/files/patch-src_xcwcp_Makefile.am
==============================================================================
--- head/comms/unixcw/files/patch-src_xcwcp_Makefile.am Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/files/patch-src_xcwcp_Makefile.am Mon Dec 30 19:41:21 2013 (r338163)
@@ -1,14 +1,11 @@
---- src/xcwcp/Makefile.am.orig 2013-01-06 09:36:57.000000000 -0500
-+++ src/xcwcp/Makefile.am 2013-12-28 12:59:43.473131692 -0500
-@@ -35,9 +35,9 @@
- sender.cc sender.h
-
+--- src/xcwcp/Makefile.am.orig 2013-12-30 10:51:14.000000000 -0500
++++ src/xcwcp/Makefile.am 2013-12-30 10:51:39.000000000 -0500
+@@ -37,7 +37,7 @@
# target-specific preprocessor flags (#defs and include dirs)
--xcwcp_CPPFLAGS = $(AM_CPPFLAGS) -I$(AC_QT4INC) #-I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui
-+xcwcp_CPPFLAGS = $(AM_CPPFLAGS) $(AC_QT4INC)
+ xcwcp_CPPFLAGS = $(AM_CPPFLAGS) $(AC_QT4CFLAGS) #-I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui
# target-specific linker flags (objects to link)
-xcwcp_LDADD = -L$(top_builddir)/src/libcw/.libs -lcw -lQtGui -lQtCore $(top_builddir)/src/cwutils/lib_xcwcp.a
-+xcwcp_LDADD = -L$(top_builddir)/src/libcw/.libs -lcw -L$(QT4LIBS) -lQtGui -lQtCore $(top_builddir)/src/cwutils/lib_xcwcp.a
++xcwcp_LDADD = -L$(top_builddir)/src/libcw/.libs -L$(QT4LIBS) -lcw -lQtGui -lQtCore $(top_builddir)/src/cwutils/lib_xcwcp.a
Modified: head/comms/unixcw/files/patch-src_xcwcp_Makefile.in
==============================================================================
--- head/comms/unixcw/files/patch-src_xcwcp_Makefile.in Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/files/patch-src_xcwcp_Makefile.in Mon Dec 30 19:41:21 2013 (r338163)
@@ -1,14 +1,11 @@
---- src/xcwcp/Makefile.in.orig 2013-12-28 13:25:22.498024595 -0500
-+++ src/xcwcp/Makefile.in 2013-12-28 13:54:24.916904378 -0500
-@@ -297,9 +297,9 @@
-
-
+--- src/xcwcp/Makefile.in.orig 2013-12-30 10:51:06.000000000 -0500
++++ src/xcwcp/Makefile.in 2013-12-30 10:51:22.000000000 -0500
+@@ -380,7 +380,7 @@
# target-specific preprocessor flags (#defs and include dirs)
--xcwcp_CPPFLAGS = $(AM_CPPFLAGS) -I$(AC_QT4INC) #-I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui
-+xcwcp_CPPFLAGS = $(AM_CPPFLAGS) $(AC_QT4INC) #-I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui
+ xcwcp_CPPFLAGS = $(AM_CPPFLAGS) $(AC_QT4CFLAGS) #-I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui
# target-specific linker flags (objects to link)
-xcwcp_LDADD = -L$(top_builddir)/src/libcw/.libs -lcw -lQtGui -lQtCore $(top_builddir)/src/cwutils/lib_xcwcp.a
-+xcwcp_LDADD = -L$(top_builddir)/src/libcw/.libs -L$(QT4LIBS) -lcw -lQtGui -lQtCore $(top_builddir)/src/cwutils/lib_xcwcp.a
++xcwcp_LDADD = -L$(top_builddir)/src/libcw/.libs -L$(QT4LIBS) -lcw -lQtGui -lQtCore $(top_builddir)/src/cwutils/lib_xcwcp.a
# copy man page to proper directory during installation
man_MANS = xcwcp.1
Modified: head/comms/unixcw/pkg-plist
==============================================================================
--- head/comms/unixcw/pkg-plist Mon Dec 30 19:33:46 2013 (r338162)
+++ head/comms/unixcw/pkg-plist Mon Dec 30 19:41:21 2013 (r338163)
@@ -6,7 +6,7 @@ include/libcw.h
include/libcw_debug.h
lib/libcw.a
lib/libcw.so
-lib/libcw.so.5
+lib/libcw.so.6
lib/libcw.la
libdata/pkgconfig/libcw.pc
man/man1/cw.1.gz
More information about the svn-ports-head
mailing list