diff -dpruN /usr/ports/comms/libcodec2/Makefile ./Makefile
--- /usr/ports/comms/libcodec2/Makefile	2016-04-21 16:43:14.000000000 +0000
+++ ./Makefile	2016-05-02 06:09:30.000000000 +0000
@@ -2,7 +2,7 @@
 # $FreeBSD: head/comms/libcodec2/Makefile 413746 2016-04-21 16:43:14Z swills $
 
 PORTNAME=	libcodec2
-PORTVERSION=	0.5
+PORTVERSION=	0.5.1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://files.freedv.org/codec2/
 DISTNAME=	codec2-${PORTVERSION}
@@ -14,9 +14,40 @@ LICENSE=	LGPL21
 
 BROKEN_powerpc64=	Does not build
 
-LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
+TEST_LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
 
 USE_LDCONFIG=	yes
 USES=		cmake:outsource tar:xz
 
+OPTIONS_DEFINE=	EXAMPLES TEST
+OPTIONS_SUB=	yes
+OPTIONS_UNSET=	EXAMPLES TEST
+EXAMPLES_CMAKE_ON=	-DINSTALL_EXAMPLES=ON
+TEST_CMAKE_ON=		-DUNITTEST=ON
+
+CMAKE_ARGS=	-DCMAKE_CXX_COMPILER:STRING="${CXX}"\
+		-DCMAKE_MODULE_LINKER_FLAGS:STRING=""
+
+TEST_SRCFILES=	cohpsk_ch cohpsk_demod cohpsk_get_test_bits cohpsk_mod\
+		cohpsk_put_test_bits fdmdv_channel freedv_rx freedv_tx\
+		generate_codebook genlspdtcb
+TEST_UNITTESTFILES=	c2validate create_interleaver de extract fdmdv_mem\
+			genampdata genlsp genphdata genres lspsync polar2rect\
+			pre raw2h scalarlsptest speexnoisesup t16_8\
+			t16_8_short tcohpsk test_cohpsk_ch tfdmdv tfifo\
+			tinterp tlspsens tnlp tprede tquant vq_train_jvm\
+			vqtrain vqtrainjnd vqtrainph vqtrainsp
+
+pre-patch-TEST-on:
+	${REINPLACE_CMD} 's|speex/speex.h|speex/speex_preprocess.h|;\
+		s|"_FLAGS"|_FLAGS|' ${WRKSRC}/CMakeLists.txt
+
+post-install-TEST-on:
+.for a in ${TEST_SRCFILES}
+	@${INSTALL_PROGRAM} ${WRKDIR}/.build/src/${a} ${STAGEDIR}${PREFIX}/bin
+.endfor
+.for a in ${TEST_UNITTESTFILES}
+	@${INSTALL_PROGRAM} ${WRKDIR}/.build/unittest/${a} ${STAGEDIR}${PREFIX}/bin
+.endfor
+
 .include <bsd.port.mk>
diff -dpruN /usr/ports/comms/libcodec2/distinfo ./distinfo
--- /usr/ports/comms/libcodec2/distinfo	2016-03-03 10:28:42.000000000 +0000
+++ ./distinfo	2016-05-02 05:20:53.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (codec2-0.5.tar.xz) = 1ffda04ec6629f5ad5a38349c6d9d38d29bfbc1c677c12014ff20d480a343f17
-SIZE (codec2-0.5.tar.xz) = 7845164
+SHA256 (codec2-0.5.1.tar.xz) = f7cf14b02763ffdcd231027f9811b06862790bf76d900ba9443d2a57f4ce7b38
+SIZE (codec2-0.5.1.tar.xz) = 7862968
diff -dpruN /usr/ports/comms/libcodec2/pkg-descr ./pkg-descr
--- /usr/ports/comms/libcodec2/pkg-descr	2016-02-28 23:32:46.000000000 +0000
+++ ./pkg-descr	2016-05-02 05:08:19.000000000 +0000
@@ -1,4 +1,4 @@
 Codec 2 is an open source (LGPL licensed) speech codec for 3200 bit/s
 and below.
 
-WWW: http://www.rowetel.com/codec2.html
+WWW: http://www.rowetel.com/blog/?page_id=452
diff -dpruN /usr/ports/comms/libcodec2/pkg-plist ./pkg-plist
--- /usr/ports/comms/libcodec2/pkg-plist	2016-03-03 10:28:42.000000000 +0000
+++ ./pkg-plist	2016-05-02 06:06:31.000000000 +0000
@@ -26,3 +26,234 @@ include/codec2/modem_stats.h
 include/codec2/varicode.h
 lib/libcodec2.so
 lib/libcodec2.so.0.5
+%%EXAMPLES%%share/codec2/octave/adc_sfdr_ut.m
+%%EXAMPLES%%share/codec2/octave/adcres.m
+%%EXAMPLES%%share/codec2/octave/autotest.m
+%%EXAMPLES%%share/codec2/octave/av_imp.m
+%%EXAMPLES%%share/codec2/octave/bandpasssampling.m
+%%EXAMPLES%%share/codec2/octave/bpf.m
+%%EXAMPLES%%share/codec2/octave/cbphase.m
+%%EXAMPLES%%share/codec2/octave/cellmodem.m
+%%EXAMPLES%%share/codec2/octave/ciccomp.m
+%%EXAMPLES%%share/codec2/octave/cml.patch
+%%EXAMPLES%%share/codec2/octave/codec2_demo.m
+%%EXAMPLES%%share/codec2/octave/cohpsk.m
+%%EXAMPLES%%share/codec2/octave/cohpsk_demod_plot.m
+%%EXAMPLES%%share/codec2/octave/cohpsk_frame_design.ods
+%%EXAMPLES%%share/codec2/octave/cspec.m
+%%EXAMPLES%%share/codec2/octave/dacres.m
+%%EXAMPLES%%share/codec2/octave/diff_codec.m
+%%EXAMPLES%%share/codec2/octave/fdmdv.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_demod.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_demod_c.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_demod_coh.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_mod.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_sweep.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_ut.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_ut_coh.m
+%%EXAMPLES%%share/codec2/octave/fdmdv_ut_freq_off.m
+%%EXAMPLES%%share/codec2/octave/fm.m
+%%EXAMPLES%%share/codec2/octave/fsk.m
+%%EXAMPLES%%share/codec2/octave/fsk4.m
+%%EXAMPLES%%share/codec2/octave/fuzzy_gray.m
+%%EXAMPLES%%share/codec2/octave/gen_rn_coeffs.m
+%%EXAMPLES%%share/codec2/octave/glottal.m
+%%EXAMPLES%%share/codec2/octave/gmsk.m
+%%EXAMPLES%%share/codec2/octave/hf_sim.m
+%%EXAMPLES%%share/codec2/octave/hfper.m
+%%EXAMPLES%%share/codec2/octave/hp_filt.m
+%%EXAMPLES%%share/codec2/octave/ldpc.m
+%%EXAMPLES%%share/codec2/octave/ldpcdec.m
+%%EXAMPLES%%share/codec2/octave/ldpcenc.m
+%%EXAMPLES%%share/codec2/octave/ldpcut.m
+%%EXAMPLES%%share/codec2/octave/linreg.m
+%%EXAMPLES%%share/codec2/octave/load_comp.m
+%%EXAMPLES%%share/codec2/octave/load_raw.m
+%%EXAMPLES%%share/codec2/octave/lpcauto.m
+%%EXAMPLES%%share/codec2/octave/lpcpf.m
+%%EXAMPLES%%share/codec2/octave/lsp.m
+%%EXAMPLES%%share/codec2/octave/lsp_pdf.m
+%%EXAMPLES%%share/codec2/octave/lspvar.m
+%%EXAMPLES%%share/codec2/octave/lspwarp.m
+%%EXAMPLES%%share/codec2/octave/mag_to_phase.m
+%%EXAMPLES%%share/codec2/octave/make_hilb.m
+%%EXAMPLES%%share/codec2/octave/make_ssbfilt.m
+%%EXAMPLES%%share/codec2/octave/melstats.m
+%%EXAMPLES%%share/codec2/octave/melvq.m
+%%EXAMPLES%%share/codec2/octave/newamp.m
+%%EXAMPLES%%share/codec2/octave/newamp_batch.m
+%%EXAMPLES%%share/codec2/octave/newamp_fbf.m
+%%EXAMPLES%%share/codec2/octave/phase.m
+%%EXAMPLES%%share/codec2/octave/phase2.m
+%%EXAMPLES%%share/codec2/octave/phasesecord.m
+%%EXAMPLES%%share/codec2/octave/pitch_test.m
+%%EXAMPLES%%share/codec2/octave/pl.m
+%%EXAMPLES%%share/codec2/octave/pl2.m
+%%EXAMPLES%%share/codec2/octave/plamp.m
+%%EXAMPLES%%share/codec2/octave/plinterp.m
+%%EXAMPLES%%share/codec2/octave/pllpcpf.m
+%%EXAMPLES%%share/codec2/octave/pllsp.m
+%%EXAMPLES%%share/codec2/octave/pllspdt.m
+%%EXAMPLES%%share/codec2/octave/plnlp.m
+%%EXAMPLES%%share/codec2/octave/plphase.m
+%%EXAMPLES%%share/codec2/octave/plpitch.m
+%%EXAMPLES%%share/codec2/octave/plppe.m
+%%EXAMPLES%%share/codec2/octave/plsub.m
+%%EXAMPLES%%share/codec2/octave/plvoicing.m
+%%EXAMPLES%%share/codec2/octave/png.m
+%%EXAMPLES%%share/codec2/octave/postfilter.m
+%%EXAMPLES%%share/codec2/octave/pulse.m
+%%EXAMPLES%%share/codec2/octave/qpsk.m
+%%EXAMPLES%%share/codec2/octave/save_array_c_header.m
+%%EXAMPLES%%share/codec2/octave/save_raw.m
+%%EXAMPLES%%share/codec2/octave/sd.m
+%%EXAMPLES%%share/codec2/octave/spec.m
+%%EXAMPLES%%share/codec2/octave/tcohpsk.m
+%%EXAMPLES%%share/codec2/octave/test_cohpsk.m
+%%EXAMPLES%%share/codec2/octave/test_cohpsk_ch.m
+%%EXAMPLES%%share/codec2/octave/test_dqpsk.m
+%%EXAMPLES%%share/codec2/octave/test_dqpsk2.m
+%%EXAMPLES%%share/codec2/octave/test_dsss.m
+%%EXAMPLES%%share/codec2/octave/test_dsss_pilot.m
+%%EXAMPLES%%share/codec2/octave/test_fec.m
+%%EXAMPLES%%share/codec2/octave/test_foff.m
+%%EXAMPLES%%share/codec2/octave/test_ftrack.m
+%%EXAMPLES%%share/codec2/octave/test_ml.m
+%%EXAMPLES%%share/codec2/octave/test_pilot.m
+%%EXAMPLES%%share/codec2/octave/test_qpsk.m
+%%EXAMPLES%%share/codec2/octave/test_qpsk2.m
+%%EXAMPLES%%share/codec2/octave/test_qpsk3.m
+%%EXAMPLES%%share/codec2/octave/tfdmdv.m
+%%EXAMPLES%%share/codec2/octave/tget_spec.m
+%%EXAMPLES%%share/codec2/octave/tlinreg.m
+%%EXAMPLES%%share/codec2/octave/tpapr.m
+%%EXAMPLES%%share/codec2/octave/tqpsk.m
+%%EXAMPLES%%share/codec2/octave/trellis.m
+%%EXAMPLES%%share/codec2/octave/twomixer.m
+%%EXAMPLES%%share/codec2/octave/twotone.m
+%%EXAMPLES%%share/codec2/octave/twotone1.m
+%%EXAMPLES%%share/codec2/octave/tximage.m
+%%EXAMPLES%%share/codec2/octave/undersample.m
+%%EXAMPLES%%share/codec2/octave/xormixer.m
+%%EXAMPLES%%share/codec2/raw/b0067.raw
+%%EXAMPLES%%share/codec2/raw/cq_ref.raw
+%%EXAMPLES%%share/codec2/raw/cross.raw
+%%EXAMPLES%%share/codec2/raw/cross_melp2400.raw
+%%EXAMPLES%%share/codec2/raw/f2400.raw
+%%EXAMPLES%%share/codec2/raw/forig.raw
+%%EXAMPLES%%share/codec2/raw/forig_ambe2000.raw
+%%EXAMPLES%%share/codec2/raw/forig_g729a.raw
+%%EXAMPLES%%share/codec2/raw/forig_gsm13k.raw
+%%EXAMPLES%%share/codec2/raw/forig_speex_8k.raw
+%%EXAMPLES%%share/codec2/raw/g3plx.raw
+%%EXAMPLES%%share/codec2/raw/hts.raw
+%%EXAMPLES%%share/codec2/raw/hts1.raw
+%%EXAMPLES%%share/codec2/raw/hts1a.raw
+%%EXAMPLES%%share/codec2/raw/hts1a_ambe2000.raw
+%%EXAMPLES%%share/codec2/raw/hts1a_g729a.raw
+%%EXAMPLES%%share/codec2/raw/hts1a_gsm13k.raw
+%%EXAMPLES%%share/codec2/raw/hts1a_melp.raw
+%%EXAMPLES%%share/codec2/raw/hts1a_speex_8k.raw
+%%EXAMPLES%%share/codec2/raw/hts2.raw
+%%EXAMPLES%%share/codec2/raw/hts2a.raw
+%%EXAMPLES%%share/codec2/raw/hts2a_ambe2000.raw
+%%EXAMPLES%%share/codec2/raw/hts2a_g729a.raw
+%%EXAMPLES%%share/codec2/raw/hts2a_gsm13k.raw
+%%EXAMPLES%%share/codec2/raw/hts2a_melp.raw
+%%EXAMPLES%%share/codec2/raw/hts2a_speex_8k.raw
+%%EXAMPLES%%share/codec2/raw/k6hx.raw
+%%EXAMPLES%%share/codec2/raw/kristoff.raw
+%%EXAMPLES%%share/codec2/raw/m2400.raw
+%%EXAMPLES%%share/codec2/raw/mmt1.raw
+%%EXAMPLES%%share/codec2/raw/mmt1_ambe2000.raw
+%%EXAMPLES%%share/codec2/raw/mmt1_g729a.raw
+%%EXAMPLES%%share/codec2/raw/mmt1_gsm13k.raw
+%%EXAMPLES%%share/codec2/raw/mmt1_speex_8k.raw
+%%EXAMPLES%%share/codec2/raw/morig.raw
+%%EXAMPLES%%share/codec2/raw/morig_ambe2000.raw
+%%EXAMPLES%%share/codec2/raw/morig_g729a.raw
+%%EXAMPLES%%share/codec2/raw/morig_gsm13k.raw
+%%EXAMPLES%%share/codec2/raw/morig_speex_8k.raw
+%%EXAMPLES%%share/codec2/raw/sine1k_2Hz_spread.raw
+%%EXAMPLES%%share/codec2/raw/sine1k_2ms_delay_2Hz_spread.raw
+%%EXAMPLES%%share/codec2/raw/ve9qrp.raw
+%%EXAMPLES%%share/codec2/raw/ve9qrp_10s.raw
+%%EXAMPLES%%share/codec2/script/menu.sh
+%%EXAMPLES%%share/codec2/script/playraw.sh
+%%EXAMPLES%%share/codec2/script/raw2wav.sh
+%%EXAMPLES%%share/codec2/script/wav2raw.sh
+%%EXAMPLES%%share/codec2/wav/all.wav
+%%EXAMPLES%%share/codec2/wav/cross.wav
+%%EXAMPLES%%share/codec2/wav/cross_melp2400.wav
+%%EXAMPLES%%share/codec2/wav/f2400.wav
+%%EXAMPLES%%share/codec2/wav/forig.wav
+%%EXAMPLES%%share/codec2/wav/forig_ambe2000.wav
+%%EXAMPLES%%share/codec2/wav/forig_speex_8k.wav
+%%EXAMPLES%%share/codec2/wav/hts1a.wav
+%%EXAMPLES%%share/codec2/wav/hts1a_ambe2000.wav
+%%EXAMPLES%%share/codec2/wav/hts1a_c2_v0.1.wav
+%%EXAMPLES%%share/codec2/wav/hts1a_c2_v0.1a.wav
+%%EXAMPLES%%share/codec2/wav/hts1a_g729a.wav
+%%EXAMPLES%%share/codec2/wav/hts1a_lpc10.wav
+%%EXAMPLES%%share/codec2/wav/hts1a_speex_8k.wav
+%%EXAMPLES%%share/codec2/wav/hts2a.wav
+%%EXAMPLES%%share/codec2/wav/hts2a_ambe2000.wav
+%%EXAMPLES%%share/codec2/wav/hts2a_c2_v0.1.wav
+%%EXAMPLES%%share/codec2/wav/hts2a_c2_v0.1a.wav
+%%EXAMPLES%%share/codec2/wav/hts2a_g729a.wav
+%%EXAMPLES%%share/codec2/wav/hts2a_lpc10.wav
+%%EXAMPLES%%share/codec2/wav/hts2a_speex_8k.wav
+%%EXAMPLES%%share/codec2/wav/m2400.wav
+%%EXAMPLES%%share/codec2/wav/mmt1.wav
+%%EXAMPLES%%share/codec2/wav/mmt1_ambe2000.wav
+%%EXAMPLES%%share/codec2/wav/mmt1_c2_v01a.wav
+%%EXAMPLES%%share/codec2/wav/mmt1_lpc10.wav
+%%EXAMPLES%%share/codec2/wav/mmt1_speex_8k.wav
+%%EXAMPLES%%share/codec2/wav/morig.wav
+%%EXAMPLES%%share/codec2/wav/morig_ambe2000.wav
+%%EXAMPLES%%share/codec2/wav/morig_speex_8k.wav
+%%EXAMPLES%%share/codec2/wav/ve9qrp.wav
+%%EXAMPLES%%share/codec2/wav/vk5qi.wav
+%%EXAMPLES%%share/codec2/wav/x200_ext.wav
+%%EXAMPLES%%share/codec2/wav/x200_int.wav
+%%TEST%%bin/c2validate
+%%TEST%%bin/cohpsk_ch
+%%TEST%%bin/cohpsk_demod
+%%TEST%%bin/cohpsk_get_test_bits
+%%TEST%%bin/cohpsk_mod
+%%TEST%%bin/cohpsk_put_test_bits
+%%TEST%%bin/create_interleaver
+%%TEST%%bin/de
+%%TEST%%bin/extract
+%%TEST%%bin/fdmdv_channel
+%%TEST%%bin/fdmdv_mem
+%%TEST%%bin/freedv_rx
+%%TEST%%bin/freedv_tx
+%%TEST%%bin/genampdata
+%%TEST%%bin/generate_codebook
+%%TEST%%bin/genlsp
+%%TEST%%bin/genlspdtcb
+%%TEST%%bin/genphdata
+%%TEST%%bin/genres
+%%TEST%%bin/lspsync
+%%TEST%%bin/polar2rect
+%%TEST%%bin/pre
+%%TEST%%bin/raw2h
+%%TEST%%bin/scalarlsptest
+%%TEST%%bin/speexnoisesup
+%%TEST%%bin/t16_8
+%%TEST%%bin/t16_8_short
+%%TEST%%bin/tcohpsk
+%%TEST%%bin/test_cohpsk_ch
+%%TEST%%bin/tfdmdv
+%%TEST%%bin/tfifo
+%%TEST%%bin/tinterp
+%%TEST%%bin/tlspsens
+%%TEST%%bin/tnlp
+%%TEST%%bin/tprede
+%%TEST%%bin/tquant
+%%TEST%%bin/vq_train_jvm
+%%TEST%%bin/vqtrain
+%%TEST%%bin/vqtrainjnd
+%%TEST%%bin/vqtrainph
+%%TEST%%bin/vqtrainsp