Date: Sat, 28 Dec 2013 22:18:49 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337926 - in head/comms/unixcw: . files Message-ID: <201312282218.rBSMInRZ084677@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Sat Dec 28 22:18:48 2013 New Revision: 337926 URL: http://svnweb.freebsd.org/changeset/ports/337926 Log: - Use distribution from sourceforge which updates us to 3.2.0 - This unbreaks unixcw on QT4 - Use stage - Add LICENSE Added: head/comms/unixcw/files/patch-configure.qt.inc (contents, props changed) head/comms/unixcw/files/patch-src_cwutils_dictionary.h (contents, props changed) head/comms/unixcw/files/patch-src_libcw_Makefile.am (contents, props changed) head/comms/unixcw/files/patch-src_libcw_Makefile.in (contents, props changed) head/comms/unixcw/files/patch-src_libcw_libcw.c (contents, props changed) head/comms/unixcw/files/patch-src_libcw_libcw_console.c (contents, props changed) head/comms/unixcw/files/patch-src_libcw_libcw_oss.c (contents, props changed) head/comms/unixcw/files/patch-src_xcwcp_Makefile.am (contents, props changed) head/comms/unixcw/files/patch-src_xcwcp_Makefile.in (contents, props changed) Deleted: head/comms/unixcw/files/patch-Makefile.inc.in head/comms/unixcw/files/patch-src_cw_Makefile head/comms/unixcw/files/patch-src_cwcp_Makefile head/comms/unixcw/files/patch-src_cwgen_Makefile head/comms/unixcw/files/patch-src_cwlib_Makefile head/comms/unixcw/files/patch-src_cwlib_cwlib.c head/comms/unixcw/files/patch-src_cwutils_Makefile head/comms/unixcw/files/patch-src_xcwcp_Makefile Modified: head/comms/unixcw/Makefile head/comms/unixcw/distinfo (contents, props changed) head/comms/unixcw/files/patch-configure.ac (contents, props changed) head/comms/unixcw/pkg-plist (contents, props changed) Modified: head/comms/unixcw/Makefile ============================================================================== --- head/comms/unixcw/Makefile Sat Dec 28 22:05:27 2013 (r337925) +++ head/comms/unixcw/Makefile Sat Dec 28 22:18:48 2013 (r337926) @@ -1,40 +1,35 @@ -# Created by: Diane Bruce <db@db.net> # $FreeBSD$ PORTNAME= unixcw -PORTVERSION= 2.3 -PORTREVISION= 1 +PORTVERSION= 3.2.0 CATEGORIES= comms hamradio -MASTER_SITES= http://www.ibiblio.org/pub/linux/apps/ham/morse/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= db -EXTRACT_SUFX= .tgz +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} +DISTNAME= unixcw_3.2.0.orig MAINTAINER= db@FreeBSD.org COMMENT= Libs for cw on unix +LICENSE= GPLv2 + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --includedir="${LOCALBASE}/include" \ - --libdir="${LOCALBASE}/lib" -MAN1= cw.1 cwgen.1 cwcp.1 -MAN3= cwlib.3 + --libdir="${LOCALBASE}/lib" \ + --disable-alsa --disable-pulseaudio + .if defined(WITH_XCWCP) -BROKEN= Depends on QT3 which is removed, update is in progress -MAN1+= xcwcp.1 -USE_QT_VER= 3 -CONFIGURE_ARGS+= QTLIB=qt-mt +USE_QT4= gui moc_build qmake_build rcc_build uic_build designer +USE_AUTOTOOLS= autoconf PLIST_SUB+= XCWCP="" +CONFIGURE_ARGS+= --enable-xcwcp .else PLIST_SUB+= XCWCP="@comment " +CONFIGURE_ARGS+= --disable-xcwcp .endif -MAN7= cw.7 CW.7 -MANCOMPRESSED= yes -USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes USE_GMAKE= yes -AUTOTOOLSFILES= configure.ac +USE_CSTD= gnu99 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -NO_STAGE= yes pre-extract: .if !defined(WITH_XCWCP) @${ECHO_CMD} @@ -44,8 +39,4 @@ pre-extract: @sleep 3 .endif -post-patch: - @${REINPLACE_CMD} -e "s|%%LIBDATA%%|${PREFIX}/libdata|" \ - ${WRKSRC}/src/cwlib/Makefile - .include <bsd.port.mk> Modified: head/comms/unixcw/distinfo ============================================================================== --- head/comms/unixcw/distinfo Sat Dec 28 22:05:27 2013 (r337925) +++ head/comms/unixcw/distinfo Sat Dec 28 22:18:48 2013 (r337926) @@ -1,2 +1,2 @@ -SHA256 (unixcw-2.3.tgz) = 124c60c6c7ef596a7c96c94a0e76204c7d986373564121155f0f206ad71f30a0 -SIZE (unixcw-2.3.tgz) = 202048 +SHA256 (unixcw_3.2.0.orig.tar.gz) = 638eb9cf2255dfee7e0b548716abbcdfe685b973a4180f28718284a972f5eba8 +SIZE (unixcw_3.2.0.orig.tar.gz) = 604561 Modified: head/comms/unixcw/files/patch-configure.ac ============================================================================== --- head/comms/unixcw/files/patch-configure.ac Sat Dec 28 22:05:27 2013 (r337925) +++ head/comms/unixcw/files/patch-configure.ac Sat Dec 28 22:18:48 2013 (r337926) @@ -1,47 +1,11 @@ ---- configure.ac.orig 2006-07-13 01:31:21.000000000 -0400 -+++ configure.ac 2007-12-28 15:31:58.000000000 -0500 -@@ -18,11 +18,10 @@ - # +--- 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]) - # General initializations. --AC_PREREQ(2.57) -+AC_PREREQ(%%AUTOCONF_VERSION%%) - AC_INIT([UnixCW], 2.3, [simon_baldwin@yahoo.com]) -- - # Specify a configuration header. --AC_CONFIG_HEADERS(src/config.h) -+AC_CONFIG_HEADER(src/config.h) - - # General checks for programs. - AC_PROG_CC -@@ -48,6 +47,7 @@ - - # Checks for libraries. - AC_CHECK_LIB(curses, initscr) -+AC_CHECK_LIB(intl, gettext) - - # Checks for header files, and refuse to go on if no KIOCSOUND is available. - AC_HEADER_STDC -@@ -136,7 +136,12 @@ - AC_MSG_WARN([Hint: try setting a value for the QTDIR variable]) - fi - AC_SUBST(SUBDIRS) -- -+if test -n "$QTLIB" ; then -+ QTLIBR=$QTLIB -+else -+ QTLIBR="qt" -+fi -+AC_SUBST(QTLIBR) - # Add -Wall, -W, -pedantic, and other paranoia to gcc command flags, and -Wall - # to with a few suppressions to icc command flags, then similarly, though less - # so, for g++ and icpc. -@@ -200,6 +205,8 @@ - fi - fi - rm -f conftest.so -+dnl fake it here for now -+ CC_LINKS_SO="yes" - if test $CC_LINKS_SO = "yes" ; then - AC_MSG_RESULT(yes) - else +- 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' Added: head/comms/unixcw/files/patch-configure.qt.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-configure.qt.inc Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,80 @@ +--- 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 Added: head/comms/unixcw/files/patch-src_cwutils_dictionary.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_cwutils_dictionary.h Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,19 @@ +--- 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 Added: head/comms/unixcw/files/patch-src_libcw_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_libcw_Makefile.am Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,36 @@ +--- 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 +@@ -41,7 +41,7 @@ + + # target-specific linker flags (objects to link) + # libcw_la_LIBADD=-lm -lpthread $(AC_ALSA_LIBS) $(AC_PULSEAUDIO_LIBS) +-libcw_la_LIBADD=-lm -lpthread -ldl ++libcw_la_LIBADD=-lm -lpthread + + # target-specific linker flags (additional flags) + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +@@ -78,7 +78,7 @@ + libcwunittests_CPPFLAGS = $(AM_CPPFLAGS) -DLIBCW_UNIT_TESTS + + # target-specific linker flags (objects to link) +-libcwunittests_LDADD=-lm -lpthread -ldl ++libcwunittests_LDADD=-lm -lpthread + + # target-specific compiler flags + libcwunittests_CFLAGS = -rdynamic +@@ -94,12 +94,12 @@ + + + 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 + + + # target: libcw.pc +-pkgconfigdir = $(libdir)/pkgconfig +- ++#pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = ${prefix}/libdata/pkgconfig + + + Added: head/comms/unixcw/files/patch-src_libcw_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_libcw_Makefile.in Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,36 @@ +--- 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 @@ + + # target-specific linker flags (objects to link) + # libcw_la_LIBADD=-lm -lpthread $(AC_ALSA_LIBS) $(AC_PULSEAUDIO_LIBS) +-libcw_la_LIBADD = -lm -lpthread -ldl ++libcw_la_LIBADD = -lm -lpthread + + # target-specific linker flags (additional flags) + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +@@ -355,13 +355,13 @@ + libcwunittests_CPPFLAGS = $(AM_CPPFLAGS) -DLIBCW_UNIT_TESTS + + # target-specific linker flags (objects to link) +-libcwunittests_LDADD = -lm -lpthread -ldl ++libcwunittests_LDADD = -lm -lpthread + + # target-specific compiler flags + libcwunittests_CFLAGS = -rdynamic + + # target: libcw.pc +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = ${prefix}/libdata/pkgconfig + + # CLEANFILES extends list of files that need to be removed when + # calling "make clean" +@@ -1114,7 +1114,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 + greptest.sh: + echo './libcwunittests | grep "test result: success"' > greptest.sh + chmod +x greptest.sh Added: head/comms/unixcw/files/patch-src_libcw_libcw.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_libcw_libcw.c Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,44 @@ +--- 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) Added: head/comms/unixcw/files/patch-src_libcw_libcw_console.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_libcw_libcw_console.c Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,19 @@ +--- 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" Added: head/comms/unixcw/files/patch-src_libcw_libcw_oss.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_libcw_libcw_oss.c Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,19 @@ +--- 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 @@ + "cw_oss: ioctl(SNDCTL_DSP_SYNC): \"%s\"", strerror(errno)); + return CW_FAILURE; + } +- ++#if 0 + parameter = 0; /* ignored */ + if (ioctl(*fd, SNDCTL_DSP_POST, ¶meter) == -1) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, + "cw_oss: ioctl(SNDCTL_DSP_POST): \"%s\"", strerror(errno)); + return CW_FAILURE; + } +- ++#endif + /* Set the audio format to 8-bit unsigned. */ + parameter = CW_OSS_SAMPLE_FORMAT; + if (ioctl(*fd, SNDCTL_DSP_SETFMT, ¶meter) == -1) { Added: head/comms/unixcw/files/patch-src_xcwcp_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_xcwcp_Makefile.am Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,14 @@ +--- 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 + + # 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) + # 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 + + + Added: head/comms/unixcw/files/patch-src_xcwcp_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/unixcw/files/patch-src_xcwcp_Makefile.in Sat Dec 28 22:18:48 2013 (r337926) @@ -0,0 +1,14 @@ +--- 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 @@ + + + # 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 + # 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 + + # copy man page to proper directory during installation + man_MANS = xcwcp.1 Modified: head/comms/unixcw/pkg-plist ============================================================================== --- head/comms/unixcw/pkg-plist Sat Dec 28 22:05:27 2013 (r337925) +++ head/comms/unixcw/pkg-plist Sat Dec 28 22:18:48 2013 (r337926) @@ -1,11 +1,17 @@ bin/cw bin/cwcp -%%XCWCP%%bin/xcwcp bin/cwgen -include/cw.h -include/cwlib.h +%%XCWCP%%bin/xcwcp +include/libcw.h +include/libcw_debug.h lib/libcw.a lib/libcw.so -lib/libcw.so.0 -lib/libcw.so.0.0.0 +lib/libcw.so.5 +lib/libcw.la libdata/pkgconfig/libcw.pc +man/man1/cw.1.gz +man/man1/cwgen.1.gz +man/man1/cwcp.1.gz +%%XCWCP%%/man/man1/xcwcp.1.gz +man/man3/libcw.3.gz +man/man7/cw.7.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312282218.rBSMInRZ084677>