Date: Fri, 12 Dec 2014 12:26:04 +0000 (UTC) From: Stephen Hurd <shurd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374590 - in head/comms/unixcw: . files Message-ID: <201412121226.sBCCQ4Rj026106@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Fri Dec 12 12:26:03 2014 New Revision: 374590 URL: https://svnweb.freebsd.org/changeset/ports/374590 QAT: https://qat.redports.org/buildarchive/r374590/ Log: Update to 3.4.0 (build system fixes) Remove XCWCP option and prepare this to be a master port instead. Otherwise there's no way to support xcwcp using pkg without making QT a dependency of comms/cwdaemon. Deleted: head/comms/unixcw/files/patch-src_libcw_Makefile.am 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 Modified: head/comms/unixcw/Makefile head/comms/unixcw/distinfo head/comms/unixcw/files/patch-src_libcw_Makefile.in head/comms/unixcw/pkg-plist Modified: head/comms/unixcw/Makefile ============================================================================== --- head/comms/unixcw/Makefile Fri Dec 12 12:23:41 2014 (r374589) +++ head/comms/unixcw/Makefile Fri Dec 12 12:26:03 2014 (r374590) @@ -1,43 +1,33 @@ # $FreeBSD$ +# NOTE: comms/xcwcp is a sub-port of this. When making changes, ensure +# it still works as well. + PORTNAME= unixcw -PORTVERSION= 3.3.0 -PORTREVISION= 1 -CATEGORIES= comms hamradio +PORTVERSION= 3.4.0 +CATEGORIES?= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} -DISTNAME= unixcw_3.3.0.orig +DISTNAME= unixcw_${PORTVERSION}.orig MAINTAINER= hamradio@FreeBSD.org -COMMENT= Libs for cw on unix +COMMENT?= Libs for cw on unix LICENSE= GPLv2 GNU_CONFIGURE= yes +.ifndef CONFIGURE_ARGS +CONFIGURE_ARGS= --disable-xcwcp +.endif CONFIGURE_ARGS+= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" \ --disable-alsa --disable-pulseaudio -.if defined(WITH_XCWCP) -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 USE_LDCONFIG= yes -USES= gmake libtool +USES= gmake libtool pkgconfig USE_CSTD= gnu99 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -pre-extract: -.if !defined(WITH_XCWCP) - @${ECHO_CMD} - @${ECHO_CMD} "****** To build xcwcp, interrupt the build ******" - @${ECHO_CMD} "****** now, set WITH_XCWCP and start again. ******" - @${ECHO_CMD} - @sleep 3 -.endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcw.so.6.2.1 .include <bsd.port.mk> Modified: head/comms/unixcw/distinfo ============================================================================== --- head/comms/unixcw/distinfo Fri Dec 12 12:23:41 2014 (r374589) +++ head/comms/unixcw/distinfo Fri Dec 12 12:26:03 2014 (r374590) @@ -1,2 +1,2 @@ -SHA256 (unixcw_3.3.0.orig.tar.gz) = 2d0e38b5758014942612369eaa1b4989c44edcc1120abf3a30515c55413d4db0 -SIZE (unixcw_3.3.0.orig.tar.gz) = 657613 +SHA256 (unixcw_3.4.0.orig.tar.gz) = 2c26fc36c9cbcc0c3b05fa186b254392a8439dee54eb9db28ff542094fffd092 +SIZE (unixcw_3.4.0.orig.tar.gz) = 681432 Modified: head/comms/unixcw/files/patch-src_libcw_Makefile.in ============================================================================== --- head/comms/unixcw/files/patch-src_libcw_Makefile.in Fri Dec 12 12:23:41 2014 (r374589) +++ head/comms/unixcw/files/patch-src_libcw_Makefile.in Fri Dec 12 12:26:03 2014 (r374590) @@ -1,23 +1,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) --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 -@@ -604,13 +604,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 +--- src/libcw/Makefile.in.orig 2014-12-12 03:00:52.000000000 -0800 ++++ src/libcw/Makefile.in 2014-12-12 03:04:21.000000000 -0800 +@@ -663,7 +663,7 @@ + libcw_test_simple_gen_CFLAGS = -rdynamic # target: libcw.pc -pkgconfigdir = $(libdir)/pkgconfig @@ -25,12 +9,3 @@ # CLEANFILES extends list of files that need to be removed when # calling "make clean" -@@ -1430,7 +1430,7 @@ - rm -f signatures functions - - standalone: -- 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/pkg-plist ============================================================================== --- head/comms/unixcw/pkg-plist Fri Dec 12 12:23:41 2014 (r374589) +++ head/comms/unixcw/pkg-plist Fri Dec 12 12:26:03 2014 (r374590) @@ -1,17 +1,15 @@ bin/cw bin/cwcp bin/cwgen -%%XCWCP%%bin/xcwcp include/libcw.h include/libcw_debug.h lib/libcw.a lib/libcw.so lib/libcw.so.6 -lib/libcw.so.6.0.1 +lib/libcw.so.6.2.1 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?201412121226.sBCCQ4Rj026106>