- 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@

13 files changed, 42 insertions, 218 deletions

diff --git a/comms/unixcw/Makefile b/comms/unixcw/Makefile
index 376436b32887..af10f2bf1d18 100644
--- a/comms/unixcw/Makefile
+++ b/comms/unixcw/Makefile
@@ -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@FreeBSD.org
 COMMENT=	Libs for cw on unix
diff --git a/comms/unixcw/distinfo b/comms/unixcw/distinfo
index 1b800e62ea95..4dfb7fa6ffb1 100644
--- a/comms/unixcw/distinfo
+++ b/comms/unixcw/distinfo
@@ -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
diff --git a/comms/unixcw/files/patch-configure.ac b/comms/unixcw/files/patch-configure.ac
deleted file mode 100644
index 112cfd44c63b..000000000000
--- a/comms/unixcw/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2013-07-16 21:37:30.000000000 -0500
-+++ configure.ac	2013-07-16 21:37:49.000000000 -0500
-@@ -292,7 +292,7 @@
-     # autodetection of Qt4 dependencies
-     m4_include([configure.qt.inc])
- 
--    if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then
-+    if [[ "$QT4INC" -a "$QT4MOC" ]] ; then
-         # we have moc4 and path to Qt4 include files,
-         # so we can build xcwcp
- 	WITH_XCWCP='yes'
diff --git a/comms/unixcw/files/patch-configure.qt.inc b/comms/unixcw/files/patch-configure.qt.inc
deleted file mode 100644
index 6be5b4986266..000000000000
--- a/comms/unixcw/files/patch-configure.qt.inc
+++ /dev/null
@@ -1,80 +0,0 @@
---- configure.qt.inc.orig	2013-01-06 09:53:52.000000000 -0500
-+++ configure.qt.inc	2013-07-16 21:39:12.000000000 -0500
-@@ -51,10 +51,19 @@
- QT4MOC=""  # full path to Qt4 moc
- # QT4DIR="" # for testing purposes
- 
--
-+AC_ARG_WITH([qt-includes],
-+AC_HELP_STRING([--with-qt-includes=<path>],
-+    [path to qt4 include files]),
-+    [QT4INC=$with_qt_includes])
-+
-+AC_ARG_WITH([qt-libraries],
-+AC_HELP_STRING([--with-qt-libraries=<path>],
-+    [path to qt4 libraries]),
-+    [QT4LIBS=$with_qt_libraries])
- 
- 
- # Task 1: find Qt4 include directory, and for QT4 library
-+
- PKG_CHECK_MODULES([QT4], [ "QtCore QtGui"],
- 			 [ AC_SUBST(QT4INC, $QT4_CFLAGS) AC_SUBST(QT4LIBS) ],
- 			 [ AC_MSG_ERROR([Qt4 libs not found])
-@@ -66,8 +75,12 @@
- # Task 2: find Qt4 moc
- QT4MOC=""
- QT4MOC_PATH=""
--
--if [[[ $QT4DIR = "" ]]] ; then
-+QT4MOC_PATH=${MOC}
-+if [[ $MOC ]] ; then
-+  QT4MOC_PATH=${MOC}
-+  ac_cv_path_QT4MOC_PATH=$MOC
-+  echo ac_cv_path_QT4MOC_PATH $ac_cv_path_QT4MOC_PATH
-+elif [[ -z $QT4DIR ]] ; then
- 
-     # we should guess where Qt4 moc binary is;
-     # first we see if we are lucky and Qt4 moc installed on build machine
-@@ -93,17 +106,15 @@
- 
- 
- 
--
--
- # Task 3: make sure that major version of the moc is >= MOC_MAJOR_EARLIEST
--if [[[ "$QT4MOC_PATH" != "" ]]] ; then
-+if [[ "$QT4MOC_PATH" ]] ; then
-     MOC_VERSION="`$QT4MOC_PATH -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`"
--    if [[[ "$MOC_VERSION" != "" ]]] ; then
-+    if [[ "$MOC_VERSION" ]] ; then
- 	MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`"
- 	expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null
- 	status=$?
--	if [[[ "$MOC_MAJOR" != "" && $status = 0 ]]] ; then
--	    if [[[ "$MOC_MAJOR" < "$MOC_MAJOR_EARLIEST" ]]] ; then
-+	if [[ "$MOC_MAJOR" -a $status = "0" ]] ; then
-+	    if [[ "$MOC_MAJOR" -lt "$MOC_MAJOR_EARLIEST" ]] ; then
- 		AC_MSG_WARN("Found moc $MOC_VERSION - unable to build xcwcp")
- 		AC_MSG_WARN(["xcwcp requires moc version >= $MOC_MAJOR_EARLIEST"])
- 	    else
-@@ -126,16 +137,16 @@
- 
- 
- # Task 4: on success set up some build system variables (AC_SUBST)
--if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then
-+if [[ "$QT4INC" -a "$QT4MOC" ]] ; then
-     echo "Qt4 headers dir is $QT4INC"
-     echo "Qt4 moc is $QT4MOC"
- 
- else
--    if [[[ $QT4INC = "" ]]] ; then
-+    if [[ "$QT4INC" ]] ; then
- 	AC_MSG_WARN(["Can't find directory with Qt4 header files - unable to build xcwcp"])
-     fi
- 
--    if [[[ $QT4MOC = "" ]]] ; then
-+    if [[ "$QT4MOC" ]] ; then
- 	AC_MSG_WARN(["Can't find Qt moc version >= $MOC_MAJOR_EARLIEST - unable to build xcwcp"])
- 	AC_MSG_WARN(["Hint: to build xcwcp make sure that moc is in QT4DIR/bin on your PATH"])
-     fi
diff --git a/comms/unixcw/files/patch-src_cwutils_dictionary.h b/comms/unixcw/files/patch-src_cwutils_dictionary.h
deleted file mode 100644
index 82afa7feb3c2..000000000000
--- a/comms/unixcw/files/patch-src_cwutils_dictionary.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/cwutils/dictionary.h.orig	2013-01-03 17:12:43.000000000 -0500
-+++ src/cwutils/dictionary.h	2013-07-15 18:50:15.000000000 -0500
-@@ -41,6 +41,7 @@
- 
- /* Everything below is deprecated. */
- typedef struct cw_dictionary_s dictionary;
-+#if 0
- 
- extern int  dictionary_load(const char *file)  __attribute__ ((deprecated("Use cw_dictionaries_read()")));
- extern void dictionary_unload(void)            __attribute__ ((deprecated("Use cw_dictionaries_unload()")));
-@@ -51,7 +52,7 @@
- extern const char *get_dictionary_description(const dictionary *dict) __attribute__ ((deprecated("Use cw_dictionary_get_description()")));
- extern int         get_dictionary_group_size(const dictionary *dict)  __attribute__ ((deprecated("Use cw_dictionary_get_group_size()")));
- extern const char *get_dictionary_random_word(const dictionary *dict) __attribute__ ((deprecated("Use cw_dictionary_get_random_word()")));
--
-+#endif
- #if defined(__cplusplus)
- }
- #endif
diff --git a/comms/unixcw/files/patch-src_libcw_Makefile.am b/comms/unixcw/files/patch-src_libcw_Makefile.am
index 6d60c28dc726..d73c2e5635eb 100644
--- a/comms/unixcw/files/patch-src_libcw_Makefile.am
+++ b/comms/unixcw/files/patch-src_libcw_Makefile.am
@@ -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
- 
- 
- 
diff --git a/comms/unixcw/files/patch-src_libcw_Makefile.in b/comms/unixcw/files/patch-src_libcw_Makefile.in
index 8e2f2a30cf18..883a268981aa 100644
--- a/comms/unixcw/files/patch-src_libcw_Makefile.in
+++ b/comms/unixcw/files/patch-src_libcw_Makefile.in
@@ -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
diff --git a/comms/unixcw/files/patch-src_libcw_libcw.c b/comms/unixcw/files/patch-src_libcw_libcw.c
deleted file mode 100644
index 297729492af2..000000000000
--- a/comms/unixcw/files/patch-src_libcw_libcw.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/libcw/libcw.c.orig	2013-07-15 14:27:57.000000000 -0500
-+++ src/libcw/libcw.c	2013-07-15 17:28:22.000000000 -0500
-@@ -43,15 +43,9 @@
-    - Section:Global variables
- */
- 
--
- #include "config.h"
- 
- 
--#define _BSD_SOURCE   /* usleep() */
--#define _POSIX_SOURCE /* sigaction() */
--#define _POSIX_C_SOURCE 200112L /* pthread_sigmask() */
--
--
- #include <sys/time.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-@@ -84,7 +78,6 @@
- # include <strings.h>
- #endif
- 
--
- /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=403043 */
- #if defined(NSIG)             /* Debian GNU/Linux: signal.h; Debian kFreeBSD: signal.h (libc0.1-dev_2.13-21_kfreebsd-i386.deb) */
- #define CW_SIG_MAX (NSIG)
-@@ -92,10 +85,17 @@
- #define CW_SIG_MAX (_NSIG)
- #elif defined(RTSIG_MAX)      /* Debian GNU/Linux: linux/limits.h */
- #define CW_SIG_MAX ((RTSIG_MAX)+1)
-+#elif defined(__FreeBSD__)
-+#define CW_SIG_MAX (_SIG_MAXSIG)
- #else
- #error "unknown number of signals"
- #endif
- 
-+#ifndef __FreeBSD__
-+#define _BSD_SOURCE   /* usleep() */
-+#define _POSIX_SOURCE /* sigaction() */
-+#define _POSIX_C_SOURCE 200112L /* pthread_sigmask() */
-+#endif
- 
- 
- #if defined(BSD)
diff --git a/comms/unixcw/files/patch-src_libcw_libcw_console.c b/comms/unixcw/files/patch-src_libcw_libcw_console.c
deleted file mode 100644
index 2354f4493a1f..000000000000
--- a/comms/unixcw/files/patch-src_libcw_libcw_console.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/libcw/libcw_console.c.orig	2013-01-08 14:50:13.000000000 -0500
-+++ src/libcw/libcw_console.c	2013-07-15 18:53:39.000000000 -0500
-@@ -39,6 +39,16 @@
- #       include <sys/kbio.h>
- #endif
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+# include <sys/param.h>
-+#endif
-+
-+#ifdef __FreeBSD__
-+#include <fcntl.h>
-+#include <errno.h>
-+#include <assert.h>
-+#endif
-+
- 
- #include "libcw_console.h"
- #include "libcw_debug.h"
diff --git a/comms/unixcw/files/patch-src_libcw_libcw_oss.c b/comms/unixcw/files/patch-src_libcw_libcw_oss.c
index 84d887240ee8..ba77367d8b45 100644
--- a/comms/unixcw/files/patch-src_libcw_libcw_oss.c
+++ b/comms/unixcw/files/patch-src_libcw_libcw_oss.c
@@ -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, &parameter) == -1) {
  		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
diff --git a/comms/unixcw/files/patch-src_xcwcp_Makefile.am b/comms/unixcw/files/patch-src_xcwcp_Makefile.am
index 5b206803b553..fb7046075e2b 100644
--- a/comms/unixcw/files/patch-src_xcwcp_Makefile.am
+++ b/comms/unixcw/files/patch-src_xcwcp_Makefile.am
@@ -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
  
  
  
diff --git a/comms/unixcw/files/patch-src_xcwcp_Makefile.in b/comms/unixcw/files/patch-src_xcwcp_Makefile.in
index 4d2093889e8b..c53d77d4c1e4 100644
--- a/comms/unixcw/files/patch-src_xcwcp_Makefile.in
+++ b/comms/unixcw/files/patch-src_xcwcp_Makefile.in
@@ -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
diff --git a/comms/unixcw/pkg-plist b/comms/unixcw/pkg-plist
index eb0a821a119b..e5508da54260 100644
--- a/comms/unixcw/pkg-plist
+++ b/comms/unixcw/pkg-plist
@@ -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