Import of pkgsrc-2015Q1

comms/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2013/05/26 23:08:24 rodent Exp $
+# $NetBSD: Makefile,v 1.97 2014/12/06 03:20:41 rodent Exp $
 #
 
 COMMENT=	Communication utilities
@@ -64,7 +64,9 @@ SUBDIR+=	pilot-link
 SUBDIR+=	pilot-link-libs
 SUBDIR+=	pilotmgr
 SUBDIR+=	plp
+SUBDIR+=	py-colorama
 SUBDIR+=	py-gammu
+SUBDIR+=	py-python-termstyle
 SUBDIR+=	py-serial
 SUBDIR+=	qpage
 SUBDIR+=	ruby-termios

comms/asterisk/Makefile

@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.104 2014/02/12 23:17:37 tron Exp $
+# $NetBSD: Makefile,v 1.119 2015/03/15 22:26:26 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-11.7.0
+DISTNAME=	asterisk-11.15.1
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	1
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -17,9 +16,10 @@ OWNER=		jnemeth@NetBSD.org
 HOMEPAGE=	http://www.asterisk.org/
 COMMENT=	The Asterisk Software PBX
 LICENSE=	gnu-gpl-v2
+MAKE_JOBS_SAFE=	NO
 
 # known to have issues on i386, block the package until the bug is fixed
-NOT_FOR_PLATFORM=	NetBSD-*-i386
+BROKEN_ON_PLATFORM=	NetBSD-*-i386
 
 CONFLICTS+=	asterisk-sounds-extra-[0-9]*
 
@@ -115,7 +115,7 @@ PLIST.mgcp= yes
 .include "options.mk"
 
 # check sounds/Makefile for current version when upgrading package
-DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.13.tar.gz
+DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.15.tar.gz
 
 # Override default paths in config files
 SUBST_CLASSES+=		configs
@@ -214,9 +214,9 @@ post-patch:
 
 post-install:
 # check sounds directory for current versions when upgrading package
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
-	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}

comms/asterisk/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:59 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/10/14 03:36:40 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -377,15 +377,15 @@ libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
 libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
 libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
 libdata/asterisk/sounds/en/OfficeSpace.gsm
 libdata/asterisk/sounds/en/Randulo-allison.gsm
 libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -443,7 +443,6 @@ libdata/asterisk/sounds/en/all-reps-busy.gsm
 libdata/asterisk/sounds/en/all-your-base.gsm
 libdata/asterisk/sounds/en/altitude.gsm
 libdata/asterisk/sounds/en/ampersand.gsm
-libdata/asterisk/sounds/en/an-error-has-occured.gsm
 libdata/asterisk/sounds/en/an-error-has-occurred.gsm
 libdata/asterisk/sounds/en/and-area-code.gsm
 libdata/asterisk/sounds/en/and-or.gsm
@@ -1362,6 +1361,7 @@ libdata/asterisk/sounds/en/loss.gsm
 libdata/asterisk/sounds/en/lots-o-monkeys.gsm
 libdata/asterisk/sounds/en/louisiana.gsm
 libdata/asterisk/sounds/en/low.gsm
+libdata/asterisk/sounds/en/lowercase.gsm
 libdata/asterisk/sounds/en/lunch.gsm
 libdata/asterisk/sounds/en/lyrics-louie-louie.gsm
 libdata/asterisk/sounds/en/machine.gsm
@@ -2057,6 +2057,7 @@ libdata/asterisk/sounds/en/units.gsm
 libdata/asterisk/sounds/en/unix.gsm
 libdata/asterisk/sounds/en/unwelcomecall.gsm
 libdata/asterisk/sounds/en/up.gsm
+libdata/asterisk/sounds/en/uppercase.gsm
 libdata/asterisk/sounds/en/uptime.gsm
 libdata/asterisk/sounds/en/user.gsm
 libdata/asterisk/sounds/en/users.gsm
@@ -2116,6 +2117,7 @@ libdata/asterisk/sounds/en/vm-message.gsm
 libdata/asterisk/sounds/en/vm-messages.gsm
 libdata/asterisk/sounds/en/vm-minutes.gsm
 libdata/asterisk/sounds/en/vm-mismatch.gsm
+libdata/asterisk/sounds/en/vm-msgforwarded.gsm
 libdata/asterisk/sounds/en/vm-msginstruct.gsm
 libdata/asterisk/sounds/en/vm-msgsaved.gsm
 libdata/asterisk/sounds/en/vm-newpassword.gsm

comms/asterisk/distinfo

@@ -1,27 +1,28 @@
-$NetBSD: distinfo,v 1.62 2014/01/07 11:07:03 jnemeth Exp $
+$NetBSD: distinfo,v 1.72 2015/01/29 21:54:33 jnemeth Exp $
 
-SHA1 (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = 25182857b97478fd44783e41eb28e08a87c19ac8
-RMD160 (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = f2d96f9bfa648216038f8de66f91179a09b490f1
-Size (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = 34779538 bytes
-SHA1 (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
-RMD160 (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
-Size (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
+SHA1 (asterisk-11.15.1/asterisk-11.15.1.tar.gz) = 8353295dfe1007c184d0ae3868c1a3d914a66a8d
+RMD160 (asterisk-11.15.1/asterisk-11.15.1.tar.gz) = 76f5c63baab826a0c2b1bcd72c62c7f053bda930
+Size (asterisk-11.15.1/asterisk-11.15.1.tar.gz) = 34974674 bytes
+SHA1 (asterisk-11.15.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
+RMD160 (asterisk-11.15.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
+Size (asterisk-11.15.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
 SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
 SHA1 (patch-apps_app__confbridge.c) = c815905994355a19c32e8e3e2eb5dc9f1679eb29
 SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
 SHA1 (patch-apps_app__followme.c) = a54e08d0dd0b6ff12281d4b7b8447707c1cbe20a
 SHA1 (patch-apps_app__meetme.c) = 73485931d63b6482aa549ee73ed6a72ec0e5f9a0
-SHA1 (patch-apps_app__queue.c) = 9d78c6fdaaf7f583f3af8972d32ed3b2c3e67d41
+SHA1 (patch-apps_app__queue.c) = d13a54ba203f182b5d61cf0c2a22f00055e1f358
 SHA1 (patch-apps_app__skel.c) = e661a53b61d36343c54be7ad9ea6cde6cb10f180
 SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
 SHA1 (patch-apps_confbridge_conf__config__parser.c) = 42d5a6e2ce837111d06fa9154c7f66403cb83553
 SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
 SHA1 (patch-channels_chan__motif.c) = db6c97ba02a441633338d492032d78cd86f094f5
-SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
+SHA1 (patch-channels_chan__oss.c) = 0be259a83c4425d08b693a54c43896da039df721
+SHA1 (patch-channels_chan__sip.c) = 61c67e6d7e0a6e27e98614f6d4de15b64c73e7e1
 SHA1 (patch-configure) = 88619fe9072ff69ed8da0a1917ac3852d10998a4
 SHA1 (patch-configure.ac) = 2fdae524cfc95f152b86a32405b80f6edae6fa20
-SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
+SHA1 (patch-funcs_func__strings.c) = 4c1db693d845691492b77bbf489764d362de2087
 SHA1 (patch-include_asterisk_autoconfig.h.in) = 09a8f8d5398612fdadba25f221b16c19429f81e2
 SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
 SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
@@ -35,7 +36,7 @@ SHA1 (patch-main_config__options.c) = e49a946da99546684e8988ca4301bcacbb415987
 SHA1 (patch-main_features.c) = 1c11207c60ce53c1101141e07ae04d0ddb838450
 SHA1 (patch-main_format.c) = a6d446c3de883cf3ef768d03d39e8d8db068b750
 SHA1 (patch-main_http.c) = 1d3d6b47d1ced22faf79fb17c56e7a3067b7c892
-SHA1 (patch-main_manager.c) = 754c77f373bff93cbd33e907823effc12824dd45
+SHA1 (patch-main_manager.c) = 83c8a8b88a0d1b08d2e5f21c8a69ac89461536d4
 SHA1 (patch-main_named__acl.c) = 48c23ed0e558299679bbfc9e564383f9f7dd181f
 SHA1 (patch-main_netsock.c) = 015796266b9806425180c9bb05a1907116ef086d
 SHA1 (patch-main_sched.c) = 73759369470b575e73ca78f9cff096ebb477c9b1
@@ -46,10 +47,12 @@ SHA1 (patch-pbx_pbx__dundi.c) = 2823c48d64d2b96abb5cf627045d17282629521b
 SHA1 (patch-res_pjproject_aconfigure) = 0095894c5daac2dec6a9ec745c0ecb8d46c0b73a
 SHA1 (patch-res_pjproject_aconfigure.ac) = cbabe4a5f1888e180c93404324ddb96728dc20b9
 SHA1 (patch-res_pjproject_build.symbian_makedef.sh) = 37781fe307564ad827e9be67f507f84230ebf299
+SHA1 (patch-res_res__config__pgsql.c) = 719fa8939ca0e6cae256dd1b19a11405f475a620
 SHA1 (patch-res_res__xmpp.c) = 5296a4f7454e432592a058939c7b0f2e328d53e2
 SHA1 (patch-sounds_Makefile) = 792c2e25e1c8334fe8c9038b8b630376a5894c31
 SHA1 (patch-tests_test__abstract__jb.c) = 42cfa303fc2e399aa9fe3bebf51464d0776e171c
 SHA1 (patch-tests_test__config.c) = fa049dc1fedb8a0c898afa6848406d191acb54d3
+SHA1 (patch-tests_test__linkedlists.c) = 73356c76cc48b07737de8a091fa8ad6a49ee9e5c
 SHA1 (patch-tests_test__locale.c) = e8419bed77d4787356adf8bc81893bea2adb48f4
 SHA1 (patch-utils_Makefile) = e776da1fe1233a1f6933256f530f3bfff026de25
 SHA1 (patch-utils_db1-ast_include_db.h) = 94ec413fe6a6154d65c43bdde2b26644d8bb5dac

comms/asterisk/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2012/12/11 08:22:48 jnemeth Exp $
+# $NetBSD: options.mk,v 1.6 2015/01/29 21:54:33 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -97,6 +97,7 @@ CONFIGURE_ARGS+=	--without-ldap
 
 .if !empty(PKG_OPTIONS:Mspeex)
 .include "../../audio/speex/buildlink3.mk"
+.include "../../audio/speexdsp/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-speex
 CONFIGURE_ARGS+=	--with-speexdsp
 PLIST.speex=		yes

comms/asterisk/patches/patch-apps_app__queue.c

@@ -1,17 +1,28 @@
-$NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
+$NetBSD: patch-apps_app__queue.c,v 1.4 2014/07/29 04:20:55 jnemeth Exp $
 
---- apps/app_queue.c.orig	2013-09-12 00:02:37.000000000 +0000
+--- apps/app_queue.c.orig	2014-06-12 15:40:41.000000000 +0000
 +++ apps/app_queue.c
-@@ -4735,7 +4735,7 @@ static int wait_our_turn(struct queue_en
+@@ -4045,8 +4045,8 @@ static void record_abandoned(struct queu
+ 		"Uniqueid: %s\r\n"
+ 		"Position: %d\r\n"
+ 		"OriginalPosition: %d\r\n"
+-		"HoldTime: %d\r\n",
+-		qe->parent->name, ast_channel_uniqueid(qe->chan), qe->pos, qe->opos, (int)(time(NULL) - qe->start));
++		"HoldTime: %jd\r\n",
++		qe->parent->name, ast_channel_uniqueid(qe->chan), qe->pos, qe->opos, (intmax_t)(time(NULL) - qe->start));
  
- 			if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty))) {
+ 	qe->parent->callsabandoned++;
+ 	ao2_unlock(qe->parent);
+@@ -4818,7 +4818,7 @@ static int wait_our_turn(struct queue_en
+ 
+ 			if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty, 0))) {
  				*reason = QUEUE_LEAVEEMPTY;
 -				ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 +				ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
  				leave_queue(qe);
  				break;
  			}
-@@ -4975,12 +4975,12 @@ static void send_agent_complete(const st
+@@ -5058,12 +5058,12 @@ static void send_agent_complete(const st
  		"Channel: %s\r\n"
  		"Member: %s\r\n"
  		"MemberName: %s\r\n"
@@ -27,7 +38,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  		qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
  }
  
-@@ -5023,9 +5023,9 @@ static void queue_transfer_fixup(void *d
+@@ -5106,9 +5106,9 @@ static void queue_transfer_fixup(void *d
  	int callcompletedinsl = qtds->callcompletedinsl;
  	struct ast_datastore *datastore;
  
@@ -40,7 +51,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  
  	update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
  
-@@ -5542,7 +5542,7 @@ static int try_calling(struct queue_ent 
+@@ -5625,7 +5625,7 @@ static int try_calling(struct queue_ent 
  			} else if (ast_check_hangup(qe->chan)) {
  				/* Caller must have hung up just before being connected */
  				ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", ast_channel_name(peer));
@@ -49,7 +60,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  				record_abandoned(qe);
  				ast_autoservice_chan_hangup_peer(qe->chan, peer);
  				ao2_ref(member, -1);
-@@ -5591,8 +5591,8 @@ static int try_calling(struct queue_ent 
+@@ -5674,8 +5674,8 @@ static int try_calling(struct queue_ent 
  		/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
  		/* use  pbx_builtin_setvar to set a load of variables with one call */
  		if (qe->parent->setqueueentryvar) {
@@ -60,7 +71,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  			pbx_builtin_setvar_multiple(qe->chan, interfacevar);
  			pbx_builtin_setvar_multiple(peer, interfacevar);
  		}
-@@ -5809,8 +5809,8 @@ static int try_calling(struct queue_ent 
+@@ -5892,8 +5892,8 @@ static int try_calling(struct queue_ent 
  			}
  		}
  		qe->handled++;
@@ -71,7 +82,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  
  		if (ast_channel_cdr(qe->chan)) {
  			struct ast_cdr *cdr;
-@@ -5864,12 +5864,12 @@ static int try_calling(struct queue_ent 
+@@ -5947,12 +5947,12 @@ static int try_calling(struct queue_ent 
  					"Channel: %s\r\n"
  					"Member: %s\r\n"
  					"MemberName: %s\r\n"
@@ -87,7 +98,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  					qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
  		ast_copy_string(oldcontext, ast_channel_context(qe->chan), sizeof(oldcontext));
  		ast_copy_string(oldexten, ast_channel_exten(qe->chan), sizeof(oldexten));
-@@ -5901,17 +5901,17 @@ static int try_calling(struct queue_ent 
+@@ -5984,17 +5984,17 @@ static int try_calling(struct queue_ent 
  
  			/* detect a blind transfer */
  			if (!(ast_channel_softhangup_internal_flag(qe->chan) | ast_channel_softhangup_internal_flag(peer)) && (strcasecmp(oldcontext, ast_channel_context(qe->chan)) || strcasecmp(oldexten, ast_channel_exten(qe->chan)))) {
@@ -112,7 +123,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  				send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
  			}
  			if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
-@@ -7088,8 +7088,8 @@ check_turns:
+@@ -7174,8 +7174,8 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -123,8 +134,8 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  			break;
  		}
  
-@@ -7133,7 +7133,7 @@ check_turns:
- 			if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
+@@ -7219,7 +7219,7 @@ check_turns:
+ 			if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty, 0))) {
  				record_abandoned(&qe);
  				reason = QUEUE_LEAVEEMPTY;
 -				ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
@@ -132,7 +143,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  				res = 0;
  				break;
  			}
-@@ -7155,7 +7155,7 @@ check_turns:
+@@ -7241,7 +7241,7 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -141,7 +152,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  			break;
  		}
  
-@@ -7183,8 +7183,8 @@ stop:
+@@ -7269,8 +7269,8 @@ stop:
  			if (!qe.handled) {
  				record_abandoned(&qe);
  				ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ABANDON",
@@ -152,3 +163,12 @@ $NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
  				res = -1;
  			} else if (qcontinue) {
  				reason = QUEUE_CONTINUE;
+@@ -7278,7 +7278,7 @@ stop:
+ 			}
+ 		} else if (qe.valid_digits) {
+ 			ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "EXITWITHKEY",
+-				"%s|%d|%d|%ld", qe.digits, qe.pos, qe.opos, (long) time(NULL) - qe.start);
++				"%s|%d|%d|%jd", qe.digits, qe.pos, qe.opos, (intmax_t) time(NULL) - qe.start);
+ 		}
+ 	}
+ 

comms/asterisk/patches/patch-channels_chan__oss.c

@@ -1,13 +1,13 @@
-$NetBSD: patch-channels_chan__oss.c,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
+$NetBSD: patch-channels_chan__oss.c,v 1.2 2014/07/02 03:06:24 jnemeth Exp $
 
---- channels/chan_oss.c.orig	2012-08-21 20:40:18.000000000 +0000
+--- channels/chan_oss.c.orig	2014-04-17 20:06:11.000000000 +0000
 +++ channels/chan_oss.c
 @@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  
  #ifdef __linux
  #include <linux/soundcard.h>
--#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__)
-+#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) || defined(__GLIBC__)
+-#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)
++#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun) || defined(__DragonFly__)
  #include <sys/soundcard.h>
  #else
  #include <soundcard.h>

comms/asterisk/patches/patch-channels_chan__sip.c

@@ -0,0 +1,42 @@
+$NetBSD: patch-channels_chan__sip.c,v 1.1 2014/07/29 04:20:55 jnemeth Exp $
+
+--- channels/chan_sip.c.orig	2014-06-30 19:42:18.000000000 +0000
++++ channels/chan_sip.c
+@@ -17537,6 +17537,8 @@ static int get_rdnis(struct sip_pvt *p, 
+ 	return 0;
+ }
+ 
++RAII_DECL(char *, tmpf, ast_free);
++
+ /*!
+  * \brief Find out who the call is for.
+  *
+@@ -17554,7 +17556,7 @@ static int get_rdnis(struct sip_pvt *p, 
+ static enum sip_get_dest_result get_destination(struct sip_pvt *p, struct sip_request *oreq, int *cc_recall_core_id)
+ {
+ 	char tmp[256] = "", *uri, *unused_password, *domain;
+-	RAII_VAR(char *, tmpf, NULL, ast_free);
++	RAII_VAR(char *, tmpf, NULL);
+ 	char *from = NULL;
+ 	struct sip_request *req;
+ 	char *decoded_uri;
+@@ -18426,6 +18428,8 @@ static enum check_auth_result check_peer
+ 	return res;
+ }
+ 
++RAII_DECL(char *, ofbuf, ast_free); /* beware, everyone starts pointing to this */
++RAII_DECL(char *, namebuf, ast_free);
+ 
+ /*! \brief  Check if matching user or peer is defined
+  	Match user on From: user name and peer on IP/port
+@@ -18437,8 +18441,8 @@ static enum check_auth_result check_user
+ 					      struct ast_sockaddr *addr, struct sip_peer **authpeer)
+ {
+ 	char *of, *name, *unused_password, *domain;
+-	RAII_VAR(char *, ofbuf, NULL, ast_free); /* beware, everyone starts pointing to this */
+-	RAII_VAR(char *, namebuf, NULL, ast_free);
++	RAII_VAR(char *, ofbuf, NULL); /* beware, everyone starts pointing to this */
++	RAII_VAR(char *, namebuf, NULL);
+ 	enum check_auth_result res = AUTH_DONT_KNOW;
+ 	char calleridname[256];
+ 	char *uri2 = ast_strdupa(uri);

comms/asterisk/patches/patch-contrib_scripts_autosupport

@@ -1,22 +0,0 @@
-$NetBSD: patch-contrib_scripts_autosupport,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
-
---- contrib/scripts/autosupport.orig	2012-01-04 20:01:27.000000000 +0000
-+++ contrib/scripts/autosupport
-@@ -33,7 +33,7 @@ NONINTERACTIVE=0
- # If a prefix is specified on command-line, add it.
- if (set -u; : $1) 2> /dev/null
- then
--  if [ $1 == "-h" ] || [ $1 == "--help" ]; then
-+  if [ $1 = "-h" ] || [ $1 = "--help" ]; then
-     echo
-     echo "Digium autosupport script"
-     echo "Copyright (C) 2005-2010, Digium, Inc."
-@@ -53,7 +53,7 @@ then
-     echo "    XXXXXXXX_${TARBALL_OUTPUT_FILE}"
-     echo
-     exit
--  elif [ $1 == "-n" ] || [ $1 == "--non-interactive" ]; then
-+  elif [ $1 = "-n" ] || [ $1 = "--non-interactive" ]; then
-     FILE_PREFIX=
-     NONINTERACTIVE=1
-   else

comms/asterisk/patches/patch-funcs_func__strings.c

@@ -0,0 +1,22 @@
+$NetBSD: patch-funcs_func__strings.c,v 1.1 2014/07/02 03:06:24 jnemeth Exp $
+
+--- funcs/func_strings.c.orig	2014-05-21 19:05:32.000000000 +0000
++++ funcs/func_strings.c
+@@ -790,6 +790,8 @@ static struct ast_custom_function filter
+ 	.read = filter,
+ };
+ 
++RAII_DECL(struct ast_str *, str, ast_free);
++
+ static int replace(struct ast_channel *chan, const char *cmd, char *data, struct ast_str **buf, ssize_t len)
+ {
+ 	AST_DECLARE_APP_ARGS(args,
+@@ -798,7 +800,7 @@ static int replace(struct ast_channel *c
+ 		AST_APP_ARG(replace);
+ 	);
+ 	char *strptr, *varsubst;
+-	RAII_VAR(struct ast_str *, str, ast_str_create(16), ast_free);
++	RAII_VAR(struct ast_str *, str, ast_str_create(16));
+ 	char find[256]; /* Only 256 characters possible */
+ 	char replace[2] = "";
+ 	size_t unused;

comms/asterisk/patches/patch-main_manager.c

@@ -1,8 +1,8 @@
-$NetBSD: patch-main_manager.c,v 1.2 2013/08/08 00:45:10 jnemeth Exp $
+$NetBSD: patch-main_manager.c,v 1.4 2014/12/16 01:00:22 jnemeth Exp $
 
---- main/manager.c.orig	2013-05-13 14:26:57.000000000 +0000
+--- main/manager.c.orig	2014-11-21 18:47:12.000000000 +0000
 +++ main/manager.c
-@@ -1850,7 +1850,7 @@ static char *handle_showmanconn(struct a
+@@ -1886,7 +1886,7 @@ static char *handle_showmanconn(struct a
  	struct mansession_session *session;
  	time_t now = time(NULL);
  #define HSMCONN_FORMAT1 "  %-15.15s  %-55.55s  %-10.10s  %-10.10s  %-8.8s  %-8.8s  %-5.5s  %-5.5s\n"
@@ -11,16 +11,33 @@ $NetBSD: patch-main_manager.c,v 1.2 2013/08/08 00:45:10 jnemeth Exp $
  	int count = 0;
  	struct ao2_iterator i;
  
-@@ -1871,7 +1871,7 @@ static char *handle_showmanconn(struct a
- 	i = ao2_iterator_init(sessions, 0);
- 	while ((session = ao2_iterator_next(&i))) {
- 		ao2_lock(session);
--		ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_sockaddr_stringify_addr(&session->addr), (int)(session->sessionstart), (int)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
-+		ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_sockaddr_stringify_addr(&session->addr), (intmax_t)(session->sessionstart), (intmax_t)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
- 		count++;
- 		ao2_unlock(session);
- 		unref_mansession(session);
-@@ -7203,9 +7203,11 @@ static char *handle_manager_show_events(
+@@ -1912,8 +1912,8 @@ static char *handle_showmanconn(struct a
+ 			ao2_lock(session);
+ 			ast_cli(a->fd, HSMCONN_FORMAT2, session->username,
+ 				ast_sockaddr_stringify_addr(&session->addr),
+-				(int) (session->sessionstart),
+-				(int) (now - session->sessionstart),
++				(intmax_t) (session->sessionstart),
++				(intmax_t) (now - session->sessionstart),
+ 				session->fd,
+ 				session->inuse,
+ 				session->readperm,
+@@ -5735,11 +5735,13 @@ static void append_channel_vars(struct a
+ AST_THREADSTORAGE(manager_event_buf);
+ #define MANAGER_EVENT_BUF_INITSIZE   256
+ 
++RAII_DECL(struct ao2_container *, sessions, ao2_cleanup);
++
+ int __ast_manager_event_multichan(int category, const char *event, int chancount,
+ 	struct ast_channel **chans, const char *file, int line, const char *func,
+ 	const char *fmt, ...)
+ {
+-	RAII_VAR(struct ao2_container *, sessions, ao2_global_obj_ref(mgr_sessions), ao2_cleanup);
++	RAII_VAR(struct ao2_container *, sessions, ao2_global_obj_ref(mgr_sessions));
+ 	struct mansession_session *session;
+ 	struct manager_custom_hook *hook;
+ 	struct ast_str *auth = ast_str_alloca(MAX_AUTH_PERM_STRING);
+@@ -7361,9 +7363,11 @@ static char *handle_manager_show_events(
  	return CLI_SUCCESS;
  }
  

comms/asterisk/patches/patch-res_res__config__pgsql.c

@@ -0,0 +1,83 @@
+$NetBSD: patch-res_res__config__pgsql.c,v 1.1 2014/07/02 03:06:24 jnemeth Exp $
+
+--- res/res_config_pgsql.c.orig	2014-05-02 19:50:07.000000000 +0000
++++ res/res_config_pgsql.c
+@@ -247,12 +247,14 @@ static int pgsql_exec(const char *databa
+ 	return -1;
+ }
+ 
++RAII_DECL(PGresult *, result, PQclear);
++
+ static struct tables *find_table(const char *database, const char *orig_tablename)
+ {
+ 	struct columns *column;
+ 	struct tables *table;
+ 	struct ast_str *sql = ast_str_thread_get(&findtable_buf, 330);
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	int exec_result;
+ 	char *fname, *ftype, *flen, *fnotnull, *fdef;
+ 	int i, rows;
+@@ -416,7 +418,7 @@ static struct columns *find_column(struc
+ 
+ static struct ast_variable *realtime_pgsql(const char *database, const char *tablename, va_list ap)
+ {
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	int num_rows = 0, pgresult;
+ 	struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
+ 	struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 100);
+@@ -531,7 +533,7 @@ static struct ast_variable *realtime_pgs
+ 
+ static struct ast_config *realtime_multi_pgsql(const char *database, const char *table, va_list ap)
+ {
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	int num_rows = 0, pgresult;
+ 	struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
+ 	struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 100);
+@@ -688,7 +690,7 @@ static struct ast_config *realtime_multi
+ static int update_pgsql(const char *database, const char *tablename, const char *keyfield,
+ 						const char *lookup, va_list ap)
+ {
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	int numrows = 0, pgresult;
+ 	const char *newparam, *newval;
+ 	struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
+@@ -819,7 +821,7 @@ static int update_pgsql(const char *data
+ 
+ static int update2_pgsql(const char *database, const char *tablename, va_list ap)
+ {
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	int numrows = 0, pgresult, first = 1;
+ 	struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 16);
+ 	const char *newparam, *newval;
+@@ -933,7 +935,7 @@ static int update2_pgsql(const char *dat
+ 
+ static int store_pgsql(const char *database, const char *table, va_list ap)
+ {
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	int numrows;
+ 	struct ast_str *buf = ast_str_thread_get(&escapebuf_buf, 256);
+ 	struct ast_str *sql1 = ast_str_thread_get(&sql_buf, 256);
+@@ -1014,7 +1016,7 @@ static int store_pgsql(const char *datab
+ 
+ static int destroy_pgsql(const char *database, const char *table, const char *keyfield, const char *lookup, va_list ap)
+ {
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	int numrows = 0;
+ 	int pgresult;
+ 	struct ast_str *sql = ast_str_thread_get(&sql_buf, 256);
+@@ -1096,7 +1098,7 @@ static struct ast_config *config_pgsql(c
+ 									   const char *file, struct ast_config *cfg,
+ 									   struct ast_flags flags, const char *suggested_incl, const char *who_asked)
+ {
+-	RAII_VAR(PGresult *, result, NULL, PQclear);
++	RAII_VAR(PGresult *, result, NULL);
+ 	long num_rows;
+ 	struct ast_variable *new_v;
+ 	struct ast_category *cur_cat = NULL;

comms/asterisk/patches/patch-tests_test__linkedlists.c

@@ -0,0 +1,26 @@
+$NetBSD: patch-tests_test__linkedlists.c,v 1.1 2014/07/02 03:06:24 jnemeth Exp $
+
+--- tests/test_linkedlists.c.orig	2013-10-24 19:55:23.000000000 +0000
++++ tests/test_linkedlists.c
+@@ -124,9 +124,11 @@ static int dbl_list_expect_reverse(struc
+ 		return AST_TEST_FAIL; \
+ 	}
+ 
++RAII_VAR(struct ast_str *, buf, ast_free);
++
+ AST_TEST_DEFINE(single_ll_tests)
+ {
+-	RAII_VAR(struct ast_str *, buf, NULL, ast_free);
++	RAII_VAR(struct ast_str *, buf, NULL);
+ 	struct test_llist test_list = { 0, };
+ 	struct test_llist other_list = { 0, };
+ 	struct test_val *bogus;
+@@ -337,7 +339,7 @@ AST_TEST_DEFINE(single_ll_tests)
+ 
+ AST_TEST_DEFINE(double_ll_tests)
+ {
+-	RAII_VAR(struct ast_str *, buf, NULL, ast_free);
++	RAII_VAR(struct ast_str *, buf, NULL);
+ 	struct test_dbl_llist test_list = { 0, };
+ 	struct test_dbl_llist other_list = { 0, };
+ 	struct test_val *bogus;

comms/asterisk10/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2014/02/12 23:17:37 tron Exp $
+# $NetBSD: Makefile,v 1.63 2015/03/15 22:26:26 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
@@ -7,7 +7,7 @@ DISTNAME=	asterisk-10.12.4
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	1
+PKGREVISION=	6
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -19,7 +19,7 @@ COMMENT=	The Asterisk Software PBX
 LICENSE=	gnu-gpl-v2
 
 # known to have issues on i386, block the package until the bug is fixed
-NOT_FOR_PLATFORM=	NetBSD-*-i386
+BROKEN_ON_PLATFORM=	NetBSD-*-i386
 
 CONFLICTS+=	asterisk-sounds-extra-[0-9]*
 

comms/asterisk10/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2012/09/30 19:24:18 jnemeth Exp $
+# $NetBSD: options.mk,v 1.6 2015/01/29 21:52:28 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -97,6 +97,7 @@ CONFIGURE_ARGS+=	--without-ldap
 
 .if !empty(PKG_OPTIONS:Mspeex)
 .include "../../audio/speex/buildlink3.mk"
+.include "../../audio/speexdsp/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-speex
 CONFIGURE_ARGS+=	--with-speexdsp
 PLIST.speex=		yes

comms/asterisk18/Makefile

@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.80 2014/02/12 23:17:37 tron Exp $
+# $NetBSD: Makefile,v 1.92 2015/03/15 22:26:26 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.25.0
+DISTNAME=	asterisk-1.8.32.2
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	1
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -19,7 +18,7 @@ COMMENT=	The Asterisk Software PBX
 LICENSE=	gnu-gpl-v2
 
 # known to have issues on i386, block the package until the bug is fixed
-NOT_FOR_PLATFORM=	NetBSD-*-i386
+BROKEN_ON_PLATFORM=	NetBSD-*-i386
 
 CONFLICTS+=	asterisk-sounds-extra-[0-9]*
 
@@ -114,7 +113,7 @@ PLIST.mgcp= yes
 .include "options.mk"
 
 # check sounds/Makefile for current version when upgrading package
-DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.13.tar.gz
+DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.15.tar.gz
 
 # Override default paths in config files
 SUBST_CLASSES+=		configs
@@ -138,10 +137,10 @@ SUBST_FILES.atomics=	include/asterisk/autoconfig.h
 SUBST_SED.atomics=	-e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|"
 
 # XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else
-SUBST_CLASSES+=         pktinfo
-SUBST_STAGE.pktinfo=    post-configure
-SUBST_FILES.pktinfo=    include/asterisk/autoconfig.h
-SUBST_SED.pktinfo=      -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
+SUBST_CLASSES+=		pktinfo
+SUBST_STAGE.pktinfo=	post-configure
+SUBST_FILES.pktinfo=	include/asterisk/autoconfig.h
+SUBST_SED.pktinfo=	-e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
 .endif
 
 RCD_SCRIPTS=		asterisk
@@ -205,9 +204,9 @@ post-patch:
 
 post-install:
 # check sounds directory for current versions when upgrading package
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
-	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}

comms/asterisk18/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2014/03/11 14:04:59 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.25 2014/10/14 03:35:05 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -356,15 +356,15 @@ libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
 libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
 libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
 libdata/asterisk/sounds/en/OfficeSpace.gsm
 libdata/asterisk/sounds/en/Randulo-allison.gsm
 libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -422,7 +422,6 @@ libdata/asterisk/sounds/en/all-reps-busy.gsm
 libdata/asterisk/sounds/en/all-your-base.gsm
 libdata/asterisk/sounds/en/altitude.gsm
 libdata/asterisk/sounds/en/ampersand.gsm
-libdata/asterisk/sounds/en/an-error-has-occured.gsm
 libdata/asterisk/sounds/en/an-error-has-occurred.gsm
 libdata/asterisk/sounds/en/and-area-code.gsm
 libdata/asterisk/sounds/en/and-or.gsm
@@ -1341,6 +1340,7 @@ libdata/asterisk/sounds/en/loss.gsm
 libdata/asterisk/sounds/en/lots-o-monkeys.gsm
 libdata/asterisk/sounds/en/louisiana.gsm
 libdata/asterisk/sounds/en/low.gsm
+libdata/asterisk/sounds/en/lowercase.gsm
 libdata/asterisk/sounds/en/lunch.gsm
 libdata/asterisk/sounds/en/lyrics-louie-louie.gsm
 libdata/asterisk/sounds/en/machine.gsm
@@ -2036,6 +2036,7 @@ libdata/asterisk/sounds/en/units.gsm
 libdata/asterisk/sounds/en/unix.gsm
 libdata/asterisk/sounds/en/unwelcomecall.gsm
 libdata/asterisk/sounds/en/up.gsm
+libdata/asterisk/sounds/en/uppercase.gsm
 libdata/asterisk/sounds/en/uptime.gsm
 libdata/asterisk/sounds/en/user.gsm
 libdata/asterisk/sounds/en/users.gsm
@@ -2095,6 +2096,7 @@ libdata/asterisk/sounds/en/vm-message.gsm
 libdata/asterisk/sounds/en/vm-messages.gsm
 libdata/asterisk/sounds/en/vm-minutes.gsm
 libdata/asterisk/sounds/en/vm-mismatch.gsm
+libdata/asterisk/sounds/en/vm-msgforwarded.gsm
 libdata/asterisk/sounds/en/vm-msginstruct.gsm
 libdata/asterisk/sounds/en/vm-msgsaved.gsm
 libdata/asterisk/sounds/en/vm-newpassword.gsm

comms/asterisk18/distinfo

@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.52 2014/01/07 23:33:28 jnemeth Exp $
+$NetBSD: distinfo,v 1.59 2015/01/29 21:48:07 jnemeth Exp $
 
-SHA1 (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = c8783a72d4e5ede1c67faea8d744924a97f686a9
-RMD160 (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = 0be84b6618a7d996bd4b0b38f8dc3016cad08677
-Size (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = 29473304 bytes
-SHA1 (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
-RMD160 (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
-Size (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
+SHA1 (asterisk-1.8.32.2/asterisk-1.8.32.2.tar.gz) = e2a585ff20ab7dc1cb4bad86eda514af7c6a5e45
+RMD160 (asterisk-1.8.32.2/asterisk-1.8.32.2.tar.gz) = 41446c7da1e73ab07455f35b1ed102315eb7ef9c
+Size (asterisk-1.8.32.2/asterisk-1.8.32.2.tar.gz) = 29635914 bytes
+SHA1 (asterisk-1.8.32.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
+RMD160 (asterisk-1.8.32.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
+Size (asterisk-1.8.32.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
 SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
-SHA1 (patch-ak) = f8d5de733807bc6c0701886a3095901d6815a8bd
+SHA1 (patch-ak) = 7cbc0e6e757e5d39cd7a92b76e266623b9fbe680
 SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a
 SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
@@ -22,7 +22,7 @@ SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
 SHA1 (patch-au) = 773398e719dca34640dcdc190857872da1ad7b4f
 SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
 SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab
-SHA1 (patch-ax) = aae5b9954f9ae672aa948f1daa88494f1b407e81
+SHA1 (patch-ax) = 78d61807c7cf97aff3fe6a395ed6b4975b63d8d0
 SHA1 (patch-ay) = 746a609e4d01903ebdf525a7cf5c3925729e74b0
 SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
 SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619

comms/asterisk18/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2012/09/30 19:29:05 jnemeth Exp $
+# $NetBSD: options.mk,v 1.12 2015/01/29 21:48:07 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -97,6 +97,7 @@ CONFIGURE_ARGS+=	--without-ldap
 
 .if !empty(PKG_OPTIONS:Mspeex)
 .include "../../audio/speex/buildlink3.mk"
+.include "../../audio/speexdsp/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-speex
 CONFIGURE_ARGS+=	--with-speexdsp
 PLIST.speex=		yes

comms/asterisk18/patches/patch-ak

@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.2 2012/02/16 16:33:36 hans Exp $
+$NetBSD: patch-ak,v 1.3 2014/07/02 03:20:43 jnemeth Exp $
 
---- channels/chan_oss.c.orig	2008-11-02 16:39:04.000000000 -0800
+--- channels/chan_oss.c.orig	2014-04-17 20:23:01.000000000 +0000
 +++ channels/chan_oss.c
 @@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  
  #ifdef __linux
  #include <linux/soundcard.h>
--#elif defined(__FreeBSD__) || defined(__CYGWIN__)
-+#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) || defined(__sun)
+-#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)
++#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun) || defined(__DragonFly__)
  #include <sys/soundcard.h>
  #else
  #include <soundcard.h>

comms/asterisk18/patches/patch-ax

@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
+$NetBSD: patch-ax,v 1.5 2014/07/26 07:03:26 jnemeth Exp $
 
---- apps/app_queue.c.orig	2013-01-08 20:22:16.000000000 +0000
+--- apps/app_queue.c.orig	2014-06-12 15:38:48.000000000 +0000
 +++ apps/app_queue.c
-@@ -3533,8 +3533,8 @@ static void record_abandoned(struct queu
+@@ -3591,8 +3591,8 @@ static void record_abandoned(struct queu
  		"Uniqueid: %s\r\n"
  		"Position: %d\r\n"
  		"OriginalPosition: %d\r\n"
@@ -13,16 +13,16 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  
  	qe->parent->callsabandoned++;
  	ao2_unlock(qe->parent);
-@@ -4210,7 +4210,7 @@ static int wait_our_turn(struct queue_en
+@@ -4309,7 +4309,7 @@ static int wait_our_turn(struct queue_en
  
- 			if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty))) {
+ 			if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty, 0))) {
  				*reason = QUEUE_LEAVEEMPTY;
 -				ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 +				ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
  				leave_queue(qe);
  				break;
  			}
-@@ -4417,12 +4417,12 @@ static void send_agent_complete(const st
+@@ -4516,12 +4516,12 @@ static void send_agent_complete(const st
  		"Channel: %s\r\n"
  		"Member: %s\r\n"
  		"MemberName: %s\r\n"
@@ -38,7 +38,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  		qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
  }
  
-@@ -4465,9 +4465,9 @@ static void queue_transfer_fixup(void *d
+@@ -4564,9 +4564,9 @@ static void queue_transfer_fixup(void *d
  	int callcompletedinsl = qtds->callcompletedinsl;
  	struct ast_datastore *datastore;
  
@@ -51,7 +51,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  
  	update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
  	
-@@ -4956,7 +4956,7 @@ static int try_calling(struct queue_ent 
+@@ -5055,7 +5055,7 @@ static int try_calling(struct queue_ent 
  			} else if (ast_check_hangup(qe->chan)) {
  				/* Caller must have hung up just before being connected */
  				ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name);
@@ -60,7 +60,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  				record_abandoned(qe);
  				ast_hangup(peer);
  				ao2_ref(member, -1);
-@@ -5002,8 +5002,8 @@ static int try_calling(struct queue_ent 
+@@ -5101,8 +5101,8 @@ static int try_calling(struct queue_ent 
  		/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
  		/* use  pbx_builtin_setvar to set a load of variables with one call */
  		if (qe->parent->setqueueentryvar) {
@@ -71,7 +71,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  			pbx_builtin_setvar_multiple(qe->chan, interfacevar);
  			pbx_builtin_setvar_multiple(peer, interfacevar);
  		}
-@@ -5257,8 +5257,8 @@ static int try_calling(struct queue_ent 
+@@ -5356,8 +5356,8 @@ static int try_calling(struct queue_ent 
  				ast_log(LOG_WARNING, "Asked to execute an AGI on this channel, but could not find application (agi)!\n");
  		}
  		qe->handled++;
@@ -82,7 +82,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  
  		if (qe->chan->cdr) {
  			struct ast_cdr *cdr;
-@@ -5294,12 +5294,12 @@ static int try_calling(struct queue_ent 
+@@ -5393,12 +5393,12 @@ static int try_calling(struct queue_ent 
  					"Channel: %s\r\n"
  					"Member: %s\r\n"
  					"MemberName: %s\r\n"
@@ -98,7 +98,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  					qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
  		ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
  		ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
-@@ -5331,17 +5331,17 @@ static int try_calling(struct queue_ent 
+@@ -5430,17 +5430,17 @@ static int try_calling(struct queue_ent 
  
  			/* detect a blind transfer */
  			if (!(qe->chan->_softhangup | peer->_softhangup) && (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten))) {
@@ -123,7 +123,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  				send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
  			}
  			if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {	
-@@ -6237,8 +6237,8 @@ check_turns:
+@@ -6336,8 +6336,8 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -134,8 +134,8 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  			break;
  		}
  
-@@ -6280,7 +6280,7 @@ check_turns:
- 			if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
+@@ -6379,7 +6379,7 @@ check_turns:
+ 			if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty, 0))) {
  				record_abandoned(&qe);
  				reason = QUEUE_LEAVEEMPTY;
 -				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
@@ -143,7 +143,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  				res = 0;
  				break;
  			}
-@@ -6302,7 +6302,7 @@ check_turns:
+@@ -6401,7 +6401,7 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -152,7 +152,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  			break;
  		}
  
-@@ -6329,8 +6329,8 @@ stop:
+@@ -6428,8 +6428,8 @@ stop:
  			if (!qe.handled) {
  				record_abandoned(&qe);
  				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
@@ -163,3 +163,12 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
  				res = -1;
  			} else if (qcontinue) {
  				reason = QUEUE_CONTINUE;
+@@ -6437,7 +6437,7 @@ stop:
+ 			}
+ 		} else if (qe.valid_digits) {
+ 			ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY",
+-				"%s|%d|%d|%ld", qe.digits, qe.pos, qe.opos, (long) time(NULL) - qe.start);
++				"%s|%d|%d|%jd", qe.digits, qe.pos, qe.opos, (intmax_t) time(NULL) - qe.start);
+ 		}
+ 	}
+ 

comms/binkd/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2011/04/07 13:18:23 is Exp $
+# $NetBSD: Makefile,v 1.32 2015/01/01 09:28:26 dholland Exp $
 #
 
 DISTNAME=		binkd098
@@ -22,7 +22,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} PREFIX=${DESTDIR:Q}${PREFIX:Q}
 
-NOT_FOR_PLATFORM=	${LP64PLATFORMS}
+BROKEN_ON_PLATFORM=	${LP64PLATFORMS}
 
 post-extract:
 	@cd ${WRKSRC}/mkfls/unix && ${CHMOD} +x configure mkinstalldirs && \

comms/bthfp/Makefile

@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2013/09/10 14:13:40 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2015/01/01 09:32:19 dholland Exp $
 
 DISTNAME=		bthfp-0.1
 PKGREVISION=		1
 CATEGORIES=		comms
-MASTER_SITES=		http://homepages.rya-online.net/plunky/
+MASTER_SITES=		http://www.NetBSD.org/~plunky/
 DISTFILES=		bthfp-0.1.tar.gz
 
-MAINTAINER=		plunky@rya-online.net
+MAINTAINER=		plunky@NetBSD.org
 COMMENT=		Bluetooth Handsfree Profile
 LICENSE=		modified-bsd
 
-ONLY_FOR_PLATFORM=	NetBSD-[4-9].*-*
+ONLY_FOR_PLATFORM=	NetBSD-*-*
+NOT_FOR_PLATFORM=	NetBSD-[0-3].*-*
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 

comms/conserver/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/01/02 02:40:18 dholland Exp $
+# $NetBSD: Makefile,v 1.27 2014/10/09 14:06:03 wiz Exp $
 #
 
 DISTNAME=	conserver-7.2.7
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.conserver.com/
 COMMENT=	Application that allows multiple users to watch serial consoles
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=	YES
 CONFLICTS+=	conserver8-[0-9]*
 

comms/conserver8/Makefile

@@ -1,24 +1,21 @@
-# $NetBSD: Makefile,v 1.13 2014/02/12 23:17:37 tron Exp $
+# $NetBSD: Makefile,v 1.16 2014/11/23 08:57:42 mef Exp $
 #
 
-PKGVER=		8.1.18
+PKGVER=		8.2.0
 DISTNAME=	conserver-${PKGVER}
 PKGNAME=	conserver8-${PKGVER}
-#PKGREVISION=	1
-PKGREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://www.conserver.com/
 
 MAINTAINER=	awrede@users.sourceforge.net
 HOMEPAGE=	http://www.conserver.com/
 COMMENT=	Application that allows multiple users to watch serial consoles
+#LICENSE=	# modified-bsd and more (see LICENSE file)
 
 CONFLICTS=	conserver-[0-9]*
 
 INSTALLATION_DIRS=	${EGDIR} ${DOCDIR}
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}

comms/conserver8/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/12/05 21:25:55 hauke Exp $
+$NetBSD: distinfo,v 1.8 2014/11/23 08:57:42 mef Exp $
 
-SHA1 (conserver-8.1.18.tar.gz) = 54336e8ce7f48a2d8d51e93f4df492b3e426a192
-RMD160 (conserver-8.1.18.tar.gz) = aad60ba5aa8d2860dd4fde505c93b6bf2c118002
-Size (conserver-8.1.18.tar.gz) = 323247 bytes
+SHA1 (conserver-8.2.0.tar.gz) = acbb7f282cea94eb044860c35ddd9f31a0299888
+RMD160 (conserver-8.2.0.tar.gz) = fde2c8626f097d2e7f6eb10850a858dfc7d77a19
+Size (conserver-8.2.0.tar.gz) = 334326 bytes
 SHA1 (patch-aa) = d0eebea0d126c611f6f60035730a0c2f97280b01
 SHA1 (patch-ab) = 7a507e428277cc6ccf14b961c44d4e6fd3abcde3

comms/deforaos-phone/Makefile

@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: Makefile,v 1.19 2015/03/25 01:17:48 khorben Exp $
 #
 
-DISTNAME=	Phone-0.3.12
-PKGNAME=	deforaos-phone-0.3.12
-PKGREVISION=	5
+DISTNAME=	Phone-0.4.2
+PKGNAME=	deforaos-phone-0.4.2
 CATEGORIES=	comms net
-MASTER_SITES=	http://www.defora.org/os/download/download/4296/
+MASTER_SITES=	http://www.defora.org/os/download/download/4348/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -27,18 +26,21 @@ AUTO_MKDIRS=	yes
 
 .if ${PKGMANDIR} != "share/man"
 post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/gprs.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/gprs.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/phone.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/phone.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/phonectl.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/phonectl.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/man1/gprs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gprs.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/phone.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phone.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/phonectl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phonectl.1
+	${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man
 .endif
 
-.include "options.mk"
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/sofia-sip/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/deforaos-locker/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

comms/deforaos-phone/PLIST

@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/15 12:56:27 khorben Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/03/25 01:17:48 khorben Exp $
+bin/gprs
 bin/phone
 bin/phonectl
 include/Desktop/Phone.h
@@ -17,53 +18,80 @@ lib/Phone/plugins/gprs.so
 lib/Phone/plugins/gps.so
 lib/Phone/plugins/locker.so
 lib/Phone/plugins/n900.so
-lib/Phone/plugins/notify.so
 lib/Phone/plugins/openmoko.so
 lib/Phone/plugins/oss.so
 lib/Phone/plugins/panel.so
 lib/Phone/plugins/password.so
 lib/Phone/plugins/profiles.so
-lib/Phone/plugins/pulseaudio.so
 lib/Phone/plugins/smscrypt.so
 lib/Phone/plugins/systray.so
 lib/Phone/plugins/ussd.so
+man/html1/gprs.html
+man/html1/phone.html
+man/html1/phonectl.html
+man/man1/gprs.1
 man/man1/phone.1
 man/man1/phonectl.1
-share/applications/phone-contacts.desktop
-share/applications/phone-dialer.desktop
-share/applications/phone-log.desktop
-share/applications/phone-messages.desktop
-share/applications/phone-settings.desktop
-share/doc/html/Phone/phone.html
-share/doc/html/Phone/phonectl.html
-share/icons/hicolor/16x16/apps/phone-dialer.png
+share/applications/deforaos-phone-contacts.desktop
+share/applications/deforaos-phone-dialer.desktop
+share/applications/deforaos-phone-log.desktop
+share/applications/deforaos-phone-messages.desktop
+share/applications/deforaos-phone-settings.desktop
+share/applications/deforaos-phone-sofia.desktop
+share/doc/Phone/gprs.conf
+share/doc/Phone/phone.conf
+share/doc/Phone/pppd-chat_gprs
+share/doc/Phone/pppd-peers_gprs
+share/doc/Phone/pppd-peers_phone
 share/icons/hicolor/16x16/apps/phone-drafts.png
+share/icons/hicolor/16x16/apps/phone-gprs.png
 share/icons/hicolor/16x16/apps/phone-inbox.png
 share/icons/hicolor/16x16/apps/phone-n900.png
 share/icons/hicolor/16x16/apps/phone-openmoko.png
 share/icons/hicolor/16x16/apps/phone-roaming.png
 share/icons/hicolor/16x16/apps/phone-sent.png
-share/icons/hicolor/22x22/apps/phone-dialer.png
+share/icons/hicolor/22x22/apps/phone-gprs.png
 share/icons/hicolor/22x22/apps/phone-signal-00.png
 share/icons/hicolor/22x22/apps/phone-signal-100.png
 share/icons/hicolor/22x22/apps/phone-signal-25.png
 share/icons/hicolor/22x22/apps/phone-signal-50.png
 share/icons/hicolor/22x22/apps/phone-signal-75.png
-share/icons/hicolor/24x24/apps/phone-dialer.png
 share/icons/hicolor/24x24/apps/phone-drafts.png
+share/icons/hicolor/24x24/apps/phone-gprs.png
 share/icons/hicolor/24x24/apps/phone-inbox.png
 share/icons/hicolor/24x24/apps/phone-n900.png
 share/icons/hicolor/24x24/apps/phone-openmoko.png
 share/icons/hicolor/24x24/apps/phone-roaming.png
 share/icons/hicolor/24x24/apps/phone-sent.png
-share/icons/hicolor/32x32/apps/phone-dialer.png
+share/icons/hicolor/32x32/apps/phone-gprs.png
 share/icons/hicolor/32x32/apps/phone-n900.png
 share/icons/hicolor/32x32/apps/phone-openmoko.png
 share/icons/hicolor/32x32/apps/phone-roaming.png
-share/icons/hicolor/48x48/apps/phone-dialer.png
+share/icons/hicolor/48x48/apps/phone-gprs.png
 share/icons/hicolor/48x48/apps/phone-inbox.png
 share/icons/hicolor/48x48/apps/phone-n900.png
 share/icons/hicolor/48x48/apps/phone-openmoko.png
 share/icons/hicolor/48x48/apps/phone-roaming.png
 share/icons/hicolor/48x48/apps/phone-sent.png
+share/locale/es/LC_MESSAGES/Phone.mo
 share/locale/fr/LC_MESSAGES/Phone.mo
+share/sounds/Phone/0.wav
+share/sounds/Phone/1.wav
+share/sounds/Phone/2.wav
+share/sounds/Phone/3.wav
+share/sounds/Phone/4.wav
+share/sounds/Phone/5.wav
+share/sounds/Phone/6.wav
+share/sounds/Phone/7.wav
+share/sounds/Phone/8.wav
+share/sounds/Phone/9.wav
+share/sounds/Phone/a.wav
+share/sounds/Phone/b.wav
+share/sounds/Phone/busy.wav
+share/sounds/Phone/c.wav
+share/sounds/Phone/d.wav
+share/sounds/Phone/hash.wav
+share/sounds/Phone/keytone.wav
+share/sounds/Phone/ringback.wav
+share/sounds/Phone/ringtone.wav
+share/sounds/Phone/star.wav

comms/deforaos-phone/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/06/15 12:56:27 khorben Exp $
+$NetBSD: distinfo,v 1.4 2015/03/25 01:17:48 khorben Exp $
 
-SHA1 (Phone-0.3.12.tar.gz) = 479a64694d190c3b4ee96c74fd596e69d5ef72c4
-RMD160 (Phone-0.3.12.tar.gz) = cc93fd0dcf8d1ea406cb72a5eb66b4f017266b00
-Size (Phone-0.3.12.tar.gz) = 175768 bytes
+SHA1 (Phone-0.4.2.tar.gz) = ecf2ff8edf578e4685f158aa20c1ff1d5ef4cc80
+RMD160 (Phone-0.4.2.tar.gz) = 1a289508d2f0fe5901b676a3cd1fc7e46b54da19
+Size (Phone-0.4.2.tar.gz) = 314119 bytes

comms/deforaos-phone/options.mk

@@ -1,10 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2012/12/17 01:16:28 khorben Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.deforaos-phone
-PKG_SUPPORTED_OPTIONS=	embedded
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+=	CPPFLAGS=-DEMBEDDED
-.endif

comms/efax-gtk/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2013/10/10 14:42:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2014/07/19 06:44:05 ryoon Exp $
 
-DISTNAME=	efax-gtk-3.2.3.src
-PKGNAME=	efax-gtk-3.2.3
-PKGREVISION=	19
+DISTNAME=	efax-gtk-3.2.13.src
+PKGNAME=	${DISTNAME:S/.src//}
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
 EXTRACT_SUFX=	.tgz
@@ -21,19 +20,19 @@ CONFIGURE_ARGS+=	--with-spooldir=${VARBASE}/spool/efax
 LDFLAGS.DragonFly=	-lX11
 LDFLAGS.SunOS+=		-lX11 -lsocket -lnsl
 
+OWN_DIRS_PERMS+=	${VARBASE}/spool/efax lp lp 755
+
 EGDIR=			${PREFIX}/share/examples
 CONF_FILES=		${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc
 
 SUBST_CLASSES+=		xopen
 SUBST_MESSAGE.xopen=	Removing _XOPEN_SOURCE=600 definition
-SUBST_STAGE.xopen=	post-patch
+SUBST_STAGE.xopen=	pre-configure
 SUBST_FILES.xopen=	src/Makefile.in src/utils/Makefile.in
-SUBST_FILES.xopen+=	src/internal/c++-gtk-utils/Makefile.in
 SUBST_SED.xopen=	-e 's,-D_XOPEN_SOURCE=600,,'
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtkmm/buildlink3.mk"
+.include "../../x11/c++-gtk-utils/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

comms/efax-gtk/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/01/07 13:46:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/07/19 06:44:05 ryoon Exp $
 bin/efax-0.9a
 bin/efax-gtk
 bin/efix-0.9a
@@ -12,6 +12,8 @@ share/locale/ca/LC_MESSAGES/efax-gtk.mo
 share/locale/de/LC_MESSAGES/efax-gtk.mo
 share/locale/el/LC_MESSAGES/efax-gtk.mo
 share/locale/en_GB/LC_MESSAGES/efax-gtk.mo
+share/locale/es/LC_MESSAGES/efax-gtk.mo
+share/locale/fr/LC_MESSAGES/efax-gtk.mo
 share/locale/he/LC_MESSAGES/efax-gtk.mo
 share/locale/hu/LC_MESSAGES/efax-gtk.mo
 share/locale/it/LC_MESSAGES/efax-gtk.mo
@@ -21,3 +23,4 @@ share/locale/sq/LC_MESSAGES/efax-gtk.mo
 share/locale/sv/LC_MESSAGES/efax-gtk.mo
 share/locale/zh_CN/LC_MESSAGES/efax-gtk.mo
 share/locale/zh_TW/LC_MESSAGES/efax-gtk.mo
+share/pixmaps/efax-gtk.png

comms/efax-gtk/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2010/06/12 00:08:54 wiz Exp $
+$NetBSD: distinfo,v 1.24 2014/07/19 06:44:05 ryoon Exp $
 
-SHA1 (efax-gtk-3.2.3.src.tgz) = 4c46b1cdbf2c7ab7fb82bccb48a2e655a76c302d
-RMD160 (efax-gtk-3.2.3.src.tgz) = 642b8a742515a8f8ed1c0ed78d59911401a1bf9d
-Size (efax-gtk-3.2.3.src.tgz) = 1280080 bytes
-SHA1 (patch-aa) = 6e45e4779af6c8fd2f729daf988049ec1c31b5ed
+SHA1 (efax-gtk-3.2.13.src.tgz) = 78ff25f2cdf4b4602fa0a7c92b26e3e8aeb14c7e
+RMD160 (efax-gtk-3.2.13.src.tgz) = 74054326b2de7f3ad54b9ec792f6e91e01c15281
+Size (efax-gtk-3.2.13.src.tgz) = 1245015 bytes
+SHA1 (patch-aa) = 6e8e744170010b07c893222fefb9c387a9400c0f
 SHA1 (patch-ab) = bb6ce03029f07ffd041fc04fb2c5196f1522b11c
 SHA1 (patch-ac) = 37437cfc0ca259cecfd25aa4652c8009cfdb8066
-SHA1 (patch-ad) = a80a536aed81ac60a5f3e9a414c944bd33281707
+SHA1 (patch-efax-gtk-faxfilter_Makefile.in) = 9b57a2afbabe172c894ea914b2fdf7542c172276

comms/efax-gtk/patches/patch-aa

@@ -1,22 +1,21 @@
-$NetBSD: patch-aa,v 1.11 2010/06/10 06:44:00 adam Exp $
+$NetBSD: patch-aa,v 1.12 2014/07/19 06:44:05 ryoon Exp $
 
---- Makefile.in.orig	2010-06-04 08:50:10.000000000 +0000
+--- Makefile.in.orig	2014-04-11 10:10:35.000000000 +0000
 +++ Makefile.in
-@@ -392,15 +392,15 @@ uninstall-desktopDATA:
- 	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/examples"
+@@ -518,7 +518,7 @@ install-sysconfDATA: $(sysconf_DATA)
  	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ 	if test -n "$$list"; then \
+ 	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
++	  $(MKDIR_P) "$(DESTDIR)$(datadir)/examples" || exit 1; \
+ 	fi; \
  	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
+@@ -526,7 +526,7 @@ install-sysconfDATA: $(sysconf_DATA)
  	done | $(am__base_list) | \
  	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
 -	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples'"; \
 +	  $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples" || exit $$?; \
  	done
  

comms/efax-gtk/patches/patch-ad

@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2010/06/10 06:44:00 adam Exp $
-
---- configure.orig	2010-06-03 20:27:33.000000000 +0000
-+++ configure
-@@ -4999,7 +4999,7 @@ $as_echo_n "checking which version of gt
- # Check whether --with-gtk-version was given.
- if test "${with_gtk_version+set}" = set; then :
-   withval=$with_gtk_version;
--    if test "x$withval" == "xgtk+2";  then
-+    if test "x$withval" = "xgtk+2";  then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+2" >&5
- $as_echo "gtk+2" >&6; }
-       CGU_GTK_VERSION=2
-@@ -5098,7 +5098,7 @@ $as_echo "no" >&6; }
-      as_fn_error "Library requirements (gtk+-2.0 >= 2.12.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-   fi
- 
--    elif test "x$withval" == "xgtk+3";  then
-+    elif test "x$withval" = "xgtk+3";  then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+3" >&5
- $as_echo "gtk+3" >&6; }
-       CGU_GTK_VERSION=3
-@@ -5197,7 +5197,7 @@ $as_echo "no" >&6; }
-      as_fn_error "Library requirements (gtk+-3.0 >= 2.90.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-   fi
- 
--    elif test "x$withval" == "xauto";  then
-+    elif test "x$withval" = "xauto";  then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5
- $as_echo "auto" >&6; }
- 

comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in

@@ -0,0 +1,15 @@
+$NetBSD: patch-efax-gtk-faxfilter_Makefile.in,v 1.1 2014/07/19 06:44:05 ryoon Exp $
+
+--- efax-gtk-faxfilter/Makefile.in.orig	2014-04-11 10:10:35.000000000 +0000
++++ efax-gtk-faxfilter/Makefile.in
+@@ -664,8 +664,8 @@ uninstall-am: uninstall-spoolPROGRAMS un
+ 
+ 
+ install-data-hook:
+-	-chown lp $(spooldir) 2> /dev/null
+-	-chgrp lp $(spooldir) 2> /dev/null
++	#-chown lp $(spooldir) 2> /dev/null
++	#-chgrp lp $(spooldir) 2> /dev/null
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

comms/fidogate/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2013/11/24 04:01:07 dholland Exp $
+# $NetBSD: Makefile,v 1.69 2014/05/29 23:35:20 wiz Exp $
 #
 
 DISTNAME=	fidogate-4.4.10
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fidogate/}
 

comms/gammu/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: Makefile,v 1.12 2014/11/23 09:45:57 mef Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=	5
 
 COMMENT=	Command line utility and library to work with mobile phones
 
@@ -24,6 +23,10 @@ CMAKE_ARGS+=	-DWITH_LibDBI:BOOL=OFF
 CMAKE_ARGS+=	-DBASH_BIN:FILEPATH=
 #CMAKE_ARGS+=	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
+# silence warning
+CMAKE_ARGS+=    -Wno-dev
+CMAKE_ARGS+=    -DINSTALL_DOC=ON
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	bash:run msgfmt
 REPLACE_BASH=	utils/gammu-config utils/jadmaker
@@ -33,6 +36,10 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 
 LDFLAGS.SunOS+=	-lintl
 
+# Remove garbage under PaxHeaders.* directory
+post-install:
+	(cd ${DESTDIR}${PREFIX}/share/doc/gammu/manual; ${RM} -r */PaxHeaders*)
+
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

comms/gammu/Makefile.common

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2010/11/13 21:08:54 shattered Exp $
+# $NetBSD: Makefile.common,v 1.9 2014/11/23 09:46:49 mef Exp $
 #
 # used by comms/gammu/Makefile
 # used by comms/py-gammu/Makefile
 
-DISTNAME=	gammu-1.26.1
+DISTNAME=	gammu-1.33.0
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com.nyud.net/gammu/releases/

comms/gammu/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/09/04 23:19:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/11/23 09:46:49 mef Exp $
 bin/gammu
 bin/gammu-config
 bin/gammu-smsd
@@ -41,63 +41,40 @@ lib/libgsmsd.so.7
 lib/libgsmsd.so.7.${PKGVERSION}
 lib/pkgconfig/gammu-smsd.pc
 lib/pkgconfig/gammu.pc
-man/cs/man1/gammu-config.1
-man/cs/man1/gammu-smsd-inject.1
-man/cs/man1/gammu-smsd-monitor.1
-man/cs/man1/gammu-smsd.1
-man/cs/man1/gammu.1
-man/cs/man1/jadmaker.1
-man/cs/man5/gammu-smsdrc.5
-man/cs/man5/gammurc.5
-man/cs/man7/gammu-smsd-dbi.7
-man/cs/man7/gammu-smsd-files.7
-man/cs/man7/gammu-smsd-mysql.7
-man/cs/man7/gammu-smsd-pgsql.7
-man/cs/man7/gammu-smsd-tables.7
 man/man1/gammu-config.1
+man/man1/gammu-detect.1
 man/man1/gammu-smsd-inject.1
 man/man1/gammu-smsd-monitor.1
 man/man1/gammu-smsd.1
 man/man1/gammu.1
 man/man1/jadmaker.1
+man/man5/gammu-backup.5
+man/man5/gammu-smsbackup.5
 man/man5/gammu-smsdrc.5
 man/man5/gammurc.5
 man/man7/gammu-smsd-dbi.7
 man/man7/gammu-smsd-files.7
 man/man7/gammu-smsd-mysql.7
+man/man7/gammu-smsd-null.7
+man/man7/gammu-smsd-odbc.7
 man/man7/gammu-smsd-pgsql.7
+man/man7/gammu-smsd-run.7
+man/man7/gammu-smsd-sql.7
 man/man7/gammu-smsd-tables.7
 share/doc/gammu/COPYING
 share/doc/gammu/ChangeLog
 share/doc/gammu/README
-share/doc/gammu/SUPPORTERS
-share/doc/gammu/devel/Gammu.htm
-share/doc/gammu/devel/PORTING
-share/doc/gammu/devel/develop.txt
-share/doc/gammu/devel/examples/Makefile
-share/doc/gammu/devel/examples/phone-info.c
-share/doc/gammu/devel/examples/sms-send.c
-share/doc/gammu/devel/gammu_hints.txt
-share/doc/gammu/devel/protocol/TDMA_5120.txt
-share/doc/gammu/devel/protocol/carkit.txt
-share/doc/gammu/devel/protocol/n6110.txt
-share/doc/gammu/devel/protocol/n6510.txt
-share/doc/gammu/devel/protocol/n7110.txt
-share/doc/gammu/devel/protocol/nokia.txt
-share/doc/gammu/devel/protocol/readme
-share/doc/gammu/devel/sms/charset.txt
-share/doc/gammu/devel/sms/convert.txt
-share/doc/gammu/devel/sms/readme
-share/doc/gammu/devel/sounds/readme
-share/doc/gammu/devel/sounds/ring2.txt
+share/doc/gammu/examples/Makefile
 share/doc/gammu/examples/config/gammurc
 share/doc/gammu/examples/config/smsdrc
+share/doc/gammu/examples/custom-config.c
+share/doc/gammu/examples/long-sms.c
 share/doc/gammu/examples/media/aliens.nlm
 share/doc/gammu/examples/media/axelf.txt
+share/doc/gammu/examples/phone-info.c
 share/doc/gammu/examples/php/class_gammu/README
-share/doc/gammu/examples/php/class_gammu/class.gammu_nix_win32_v2.php
+share/doc/gammu/examples/php/class_gammu/class.gammu.php
 share/doc/gammu/examples/php/class_gammu/class.sms.gammu.php
-share/doc/gammu/examples/php/class_gammu/example_gammu_text.php
 share/doc/gammu/examples/php/smsd-mysql-admin/admin.php
 share/doc/gammu/examples/php/smsd-mysql-intergammu/config.php
 share/doc/gammu/examples/php/smsd-mysql-intergammu/funcoes/func.gammu.php
@@ -109,19 +86,134 @@ share/doc/gammu/examples/php/smsd-mysql-intergammu/proclast.sql
 share/doc/gammu/examples/php/smsd-mysql-linked/linked.php
 share/doc/gammu/examples/php/smsd-mysql-linked/linked.sql
 share/doc/gammu/examples/php/smsd-mysql-list/sms.php
+share/doc/gammu/examples/sms-read.c
+share/doc/gammu/examples/sms-send.c
+share/doc/gammu/examples/smsd.c
 share/doc/gammu/examples/sql/mysql.sql
 share/doc/gammu/examples/sql/pgsql.sql
 share/doc/gammu/examples/sql/sqlite.sql
-share/doc/gammu/gammu.html
-share/doc/gammu/gammu.it.txt
-share/doc/gammu/readme.html
-share/doc/gammu/readme.it.txt
-share/doc/gammu/replace.txt
-share/doc/gammu/symbian/gnapplet.ini
-share/doc/gammu/symbian/gnapplet.sis
-share/doc/gammu/symbian/readme.txt
+share/doc/gammu/manual/PaxHeaders.12815/contents.rst
+share/doc/gammu/manual/PaxHeaders.12815/glossary.rst
+share/doc/gammu/manual/PaxHeaders.12815/index.rst
+share/doc/gammu/manual/c/api.rst
+share/doc/gammu/manual/c/backup.rst
+share/doc/gammu/manual/c/bitmap.rst
+share/doc/gammu/manual/c/calendar.rst
+share/doc/gammu/manual/c/call.rst
+share/doc/gammu/manual/c/callback.rst
+share/doc/gammu/manual/c/category.rst
+share/doc/gammu/manual/c/datetime.rst
+share/doc/gammu/manual/c/debug.rst
+share/doc/gammu/manual/c/error.rst
+share/doc/gammu/manual/c/examples.rst
+share/doc/gammu/manual/c/file.rst
+share/doc/gammu/manual/c/hints.rst
+share/doc/gammu/manual/c/index.rst
+share/doc/gammu/manual/c/info.rst
+share/doc/gammu/manual/c/inifile.rst
+share/doc/gammu/manual/c/keys.rst
+share/doc/gammu/manual/c/limits.rst
+share/doc/gammu/manual/c/memory.rst
+share/doc/gammu/manual/c/message.rst
+share/doc/gammu/manual/c/misc.rst
+share/doc/gammu/manual/c/nokia.rst
+share/doc/gammu/manual/c/porting.rst
+share/doc/gammu/manual/c/ringtone.rst
+share/doc/gammu/manual/c/security.rst
+share/doc/gammu/manual/c/settings.rst
+share/doc/gammu/manual/c/smsd.rst
+share/doc/gammu/manual/c/statemachine.rst
+share/doc/gammu/manual/c/types.rst
+share/doc/gammu/manual/c/unicode.rst
+share/doc/gammu/manual/c/wap.rst
+share/doc/gammu/manual/config/index.rst
+share/doc/gammu/manual/contents.rst
+share/doc/gammu/manual/faq/config.rst
+share/doc/gammu/manual/faq/general.rst
+share/doc/gammu/manual/faq/index.rst
+share/doc/gammu/manual/faq/phone.rst
+share/doc/gammu/manual/faq/python.rst
+share/doc/gammu/manual/faq/smsd.rst
+share/doc/gammu/manual/formats/backup.rst
+share/doc/gammu/manual/formats/index.rst
+share/doc/gammu/manual/formats/ini.rst
+share/doc/gammu/manual/formats/smsbackup.rst
+share/doc/gammu/manual/gammu/index.rst
+share/doc/gammu/manual/glossary.rst
+share/doc/gammu/manual/index.rst
+share/doc/gammu/manual/internal/index.rst
+share/doc/gammu/manual/internal/new-phone.rst
+share/doc/gammu/manual/internal/reply.rst
+share/doc/gammu/manual/internal/state-machine.rst
+share/doc/gammu/manual/project/about.rst
+share/doc/gammu/manual/project/coding-style.rst
+share/doc/gammu/manual/project/contributing.rst
+share/doc/gammu/manual/project/directories.rst
+share/doc/gammu/manual/project/documentation.rst
+share/doc/gammu/manual/project/index.rst
+share/doc/gammu/manual/project/install.rst
+share/doc/gammu/manual/project/localization.rst
+share/doc/gammu/manual/project/motivation.rst
+share/doc/gammu/manual/project/roadmap.rst
+share/doc/gammu/manual/project/testing.rst
+share/doc/gammu/manual/project/versioning.rst
+share/doc/gammu/manual/protocol/carkit.rst
+share/doc/gammu/manual/protocol/discovering.rst
+share/doc/gammu/manual/protocol/gnapplet.rst
+share/doc/gammu/manual/protocol/index.rst
+share/doc/gammu/manual/protocol/m-obex.rst
+share/doc/gammu/manual/protocol/mtk.rst
+share/doc/gammu/manual/protocol/n6110.rst
+share/doc/gammu/manual/protocol/n6510.rst
+share/doc/gammu/manual/protocol/n7110.rst
+share/doc/gammu/manual/protocol/nokia-s40-sms.rst
+share/doc/gammu/manual/protocol/nokia.rst
+share/doc/gammu/manual/protocol/s60.rst
+share/doc/gammu/manual/protocol/samsung-gt.rst
+share/doc/gammu/manual/protocol/samsung.rst
+share/doc/gammu/manual/protocol/sonim.rst
+share/doc/gammu/manual/protocol/tdma_5120.rst
+share/doc/gammu/manual/python/data.rst
+share/doc/gammu/manual/python/examples.rst
+share/doc/gammu/manual/python/exceptions.rst
+share/doc/gammu/manual/python/gammu.rst
+share/doc/gammu/manual/python/index.rst
+share/doc/gammu/manual/python/objects.rst
+share/doc/gammu/manual/python/smsd.rst
+share/doc/gammu/manual/python/worker.rst
+share/doc/gammu/manual/smsd/backends.rst
+share/doc/gammu/manual/smsd/code.rst
+share/doc/gammu/manual/smsd/config.rst
+share/doc/gammu/manual/smsd/dbi.rst
+share/doc/gammu/manual/smsd/files.rst
+share/doc/gammu/manual/smsd/index.rst
+share/doc/gammu/manual/smsd/inject.rst
+share/doc/gammu/manual/smsd/manual.rst
+share/doc/gammu/manual/smsd/monitor.rst
+share/doc/gammu/manual/smsd/mysql.rst
+share/doc/gammu/manual/smsd/null.rst
+share/doc/gammu/manual/smsd/odbc.rst
+share/doc/gammu/manual/smsd/overview.rst
+share/doc/gammu/manual/smsd/pgsql.rst
+share/doc/gammu/manual/smsd/run.rst
+share/doc/gammu/manual/smsd/smsd.rst
+share/doc/gammu/manual/smsd/sql.rst
+share/doc/gammu/manual/smsd/tables.rst
+share/doc/gammu/manual/smsd/usage.rst
+share/doc/gammu/manual/testing/dummy-driver.rst
+share/doc/gammu/manual/testing/index.rst
+share/doc/gammu/manual/testing/testsuite.rst
+share/doc/gammu/manual/utils/gammu-config.rst
+share/doc/gammu/manual/utils/gammu-detect.rst
+share/doc/gammu/manual/utils/index.rst
+share/doc/gammu/manual/utils/jadmaker.rst
+share/gammu/gammu-s60-remote.sis
+share/gammu/gnapplet.ini
+share/gammu/gnapplet.sis
 share/locale/af/LC_MESSAGES/gammu.mo
 share/locale/af/LC_MESSAGES/libgammu.mo
+share/locale/ar/LC_MESSAGES/gammu.mo
+share/locale/ar/LC_MESSAGES/libgammu.mo
 share/locale/bg/LC_MESSAGES/gammu.mo
 share/locale/bg/LC_MESSAGES/libgammu.mo
 share/locale/ca/LC_MESSAGES/gammu.mo
@@ -134,6 +226,8 @@ share/locale/de/LC_MESSAGES/gammu.mo
 share/locale/de/LC_MESSAGES/libgammu.mo
 share/locale/el/LC_MESSAGES/gammu.mo
 share/locale/el/LC_MESSAGES/libgammu.mo
+share/locale/en_GB/LC_MESSAGES/gammu.mo
+share/locale/en_GB/LC_MESSAGES/libgammu.mo
 share/locale/es/LC_MESSAGES/gammu.mo
 share/locale/es/LC_MESSAGES/libgammu.mo
 share/locale/et/LC_MESSAGES/gammu.mo
@@ -160,6 +254,8 @@ share/locale/pl/LC_MESSAGES/gammu.mo
 share/locale/pl/LC_MESSAGES/libgammu.mo
 share/locale/pt_BR/LC_MESSAGES/gammu.mo
 share/locale/pt_BR/LC_MESSAGES/libgammu.mo
+share/locale/ro/LC_MESSAGES/gammu.mo
+share/locale/ro/LC_MESSAGES/libgammu.mo
 share/locale/ru/LC_MESSAGES/gammu.mo
 share/locale/ru/LC_MESSAGES/libgammu.mo
 share/locale/sk/LC_MESSAGES/gammu.mo
@@ -168,6 +264,10 @@ share/locale/sv/LC_MESSAGES/gammu.mo
 share/locale/sv/LC_MESSAGES/libgammu.mo
 share/locale/sw/LC_MESSAGES/gammu.mo
 share/locale/sw/LC_MESSAGES/libgammu.mo
+share/locale/tr/LC_MESSAGES/gammu.mo
+share/locale/tr/LC_MESSAGES/libgammu.mo
+share/locale/uk/LC_MESSAGES/gammu.mo
+share/locale/uk/LC_MESSAGES/libgammu.mo
 share/locale/zh_CN/LC_MESSAGES/gammu.mo
 share/locale/zh_CN/LC_MESSAGES/libgammu.mo
 share/locale/zh_TW/LC_MESSAGES/gammu.mo

comms/gammu/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2012/07/09 19:17:51 joerg Exp $
+$NetBSD: distinfo,v 1.9 2014/11/23 09:46:49 mef Exp $
 
-SHA1 (gammu-1.26.1.tar.bz2) = 122886f29c566f72020e91da119e1e04f7bfbec6
-RMD160 (gammu-1.26.1.tar.bz2) = a913ac6c999f81ab4fda7c1656232484033ac540
-Size (gammu-1.26.1.tar.bz2) = 2113622 bytes
-SHA1 (patch-contrib_smscgi_sms__cgi.c) = c7f40671374294ce90f17541b15529ee4ee649aa
-SHA1 (patch-libgammu_phone_at_at-sms.c) = 0ffef60f4f8ab1677d807ef50f766a5141870e0f
+SHA1 (gammu-1.33.0.tar.bz2) = b7ee28e7398ea578290588d94d69c295491ff86a
+RMD160 (gammu-1.33.0.tar.bz2) = c84ac1acdc9d019576447e14414de99366794942
+Size (gammu-1.33.0.tar.bz2) = 6535262 bytes
+SHA1 (patch-contrib_smscgi_sms__cgi.c) = 32316e2c4e8cfcbb850c1f2551c424a8922494e6
+SHA1 (patch-libgammu_phone_at_at-sms.c) = 05e834b5da6cebeb16d867df7059b7c715b5b676

comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c

@@ -1,4 +1,6 @@
-$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.1 2012/02/16 17:13:03 hans Exp $
+$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.2 2014/11/23 09:46:49 mef Exp $
+
+Fix build on SunOS.
 
 --- contrib/smscgi/sms_cgi.c.orig	2009-09-08 09:57:12.000000000 +0200
 +++ contrib/smscgi/sms_cgi.c	2012-01-25 19:47:48.177845692 +0100

comms/gammu/patches/patch-libgammu_phone_at_at-sms.c

@@ -1,15 +1,17 @@
-$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.1 2012/07/09 19:17:52 joerg Exp $
+$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.2 2014/11/23 09:46:50 mef Exp $
 
---- libgammu/phone/at/at-sms.c.orig	2012-07-06 11:57:04.000000000 +0000
-+++ libgammu/phone/at/at-sms.c
-@@ -83,7 +83,9 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_
- 		}
+Don't use strcharnul from the helper library, it doesn't end up as PIC
+when compiled with Clang.
+
+--- libgammu/phone/at/at-sms.c~	2014-11-23 18:13:31.000000000 +0900
++++ libgammu/phone/at/at-sms.c	2014-11-23 18:15:42.000000000 +0900
+@@ -112,6 +112,9 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_
  		if (pos_start != NULL) {
  			/* Detect which memories we can use for saving */
--			pos_end = strchrnul(pos_start + 1, ')');
+ 			pos_end = strchrnul(pos_start + 1, ')');
 +			pos_end = strchr(pos_start + 1, ')');
 +			if (pos_end == NULL)
 +				pos_end = pos_start + strlen(pos_start);
  			pos_tmp = strstr(pos_start, "\"SM\"");
+ 
  			if (pos_tmp != NULL && pos_tmp < pos_end) {
- 				s->Phone.Data.Priv.ATGEN.SIMSaveSMS = AT_AVAILABLE;

comms/gkermit/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/03 11:24:40 asau Exp $
+# $NetBSD: Makefile,v 1.28 2014/10/09 14:06:03 wiz Exp $
 #
 
 DISTNAME=	gku100
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.columbia.edu/kermit/gkermit.html
 COMMENT=	Minimal implementation of the ``kermit'' protocol (GPL'd)
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=		${WRKDIR}
 BUILD_TARGET=	posix
 MAKE_FILE=	makefile

comms/gnome-pilot/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: Makefile,v 1.94 2014/10/07 16:47:10 adam Exp $
 #
 
 DISTNAME=		gnome-pilot-2.0.17
-PKGREVISION=		41
+PKGREVISION=		45
 CATEGORIES=		comms gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pilot/2.0/}
 

comms/gnome-pilot/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.63 2014/10/07 16:47:10 adam Exp $
 
 BUILDLINK_TREE+=	gnome-pilot
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-pilot
 GNOME_PILOT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-pilot+=		gnome-pilot>=2.0.12nb2
-BUILDLINK_ABI_DEPENDS.gnome-pilot+=	gnome-pilot>=2.0.17nb41
+BUILDLINK_ABI_DEPENDS.gnome-pilot+=	gnome-pilot>=2.0.17nb45
 BUILDLINK_PKGSRCDIR.gnome-pilot?=	../../comms/gnome-pilot
 
 .include "../../devel/gettext-lib/buildlink3.mk"

comms/hylafax/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2014/03/14 15:59:29 adam Exp $
+# $NetBSD: Makefile,v 1.71 2015/03/12 15:23:39 tnn Exp $
 
 DISTNAME=	hylafax-6.0.6
 CATEGORIES=	comms
@@ -22,6 +22,7 @@ CONFIGURE_ARGS+=	--with-INSTALL="" --nointeractive
 CONFIGURE_ARGS+=	--with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
 CONFIGURE_ARGS+=	--with-SYSVINIT=no
+CONFIGURE_ARGS+=	--with-DIR_MAN=${PREFIX:Q}/${PKGMANDIR:Q}
 CONFIGURE_ENV+=		FAXUID=${FAXUSER:Q}
 CONFIGURE_ENV+=		FAXGID=${FAXGROUP:Q}
 CONFIGURE_ENV+=		OPTIMIZER=${CFLAGS:Q}

comms/jpilot-syncmal/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2013/10/10 14:42:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2014/05/05 00:47:41 ryoon Exp $
 
 DISTNAME=		jpilot-syncmal-0.80
-PKGREVISION=		20
+PKGREVISION=		21
 CATEGORIES=		comms
 MASTER_SITES=		http://www.jlogday.com/code/syncmal/archive/
 

comms/jpilot/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: Makefile,v 1.99 2014/11/22 20:49:59 bsiegert Exp $
 #
 
 DISTNAME=		jpilot-1.8.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		comms
 MASTER_SITES=		http://www.jpilot.org/
 
@@ -23,10 +23,7 @@ CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk2}"
 CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
 BUILDLINK_ABI_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.12.5
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "SunOS"
-LDFLAGS+=		-export-dynamic
-.endif
+LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
 DOCDIR=			${PREFIX}/share/doc/jpilot
 INCDIR=			${PREFIX}/include/jpilot

comms/jpilot/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2013/10/10 14:41:51 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2014/05/05 00:47:41 ryoon Exp $
 
 BUILDLINK_TREE+=	jpilot
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	jpilot
 JPILOT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.jpilot+=	jpilot>=1.6.0
-BUILDLINK_ABI_DEPENDS.jpilot+=	jpilot>=1.8.1nb1
+BUILDLINK_ABI_DEPENDS.jpilot+=	jpilot>=1.8.1nb4
 BUILDLINK_PKGSRCDIR.jpilot?=	../../comms/jpilot
 
 .include "../../comms/pilot-link-libs/buildlink3.mk"

comms/kermit/Makefile

@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.84 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: Makefile,v 1.87 2015/01/17 15:30:03 bsiegert Exp $
 
 DISTNAME=	cku302
 PKGNAME=	kermit-9.0.302
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.kermitproject.org/kermit/archives/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.kermitproject.org
+HOMEPAGE=	http://www.kermitproject.org/
 COMMENT=	Network and serial communication, file transfer, and scripting utility
-LICENSE=	kermit-license
+
+# UNIX C-Kermit 9.0 has been released with the Revised 3-Clause BSD License.
+# http://www.columbia.edu/kermit/licensing.html
+LICENSE= modified-bsd
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -33,8 +36,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wermit ${DESTDIR}${PREFIX}/bin/kermit
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/kermit
 	${INSTALL_MAN} ${WRKSRC}/ckuker.nr \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kermit.1; \
-
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kermit.1
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"

comms/kermit/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2012/05/17 20:29:13 christos Exp $
+$NetBSD: distinfo,v 1.22 2014/06/23 22:24:24 christos Exp $
 
 SHA1 (kermit-9.0.302/cku302.tar.gz) = d04c8b5600bc0bb0f163d294881f7a5a0d4395b5
 RMD160 (kermit-9.0.302/cku302.tar.gz) = ef3a71b5a42868c80408ac09662d00b71da0b0c8
 Size (kermit-9.0.302/cku302.tar.gz) = 3122219 bytes
 SHA1 (patch-aa) = fd3a613ce3cd3755a2e3b8baf33df33593713024
-SHA1 (patch-ab) = d27c998f44a1d2b53cb2e893d9ef9e8c14292d3f
+SHA1 (patch-ab) = 2dd97608d57d7b46630bcff7ec234449e8abe472
 SHA1 (patch-ac) = 62cc9e92f2413a42312d9f6d168ee85664b6aab9
 SHA1 (patch-ad) = 414f61c19185e4a82a8326121c2d9dacfba48077
 SHA1 (patch-ae) = 53384e9cbfe13559d69ab95215a4575f726dc325
@@ -14,5 +14,5 @@ SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037
 SHA1 (patch-ai) = 975a18c41b7fc031515bda5c4a9c284e80c9d1a4
 SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
 SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b
-SHA1 (patch-al) = 48438352380a74e19951fe669cb176d3c62d537d
+SHA1 (patch-al) = 616ad10e65b24a04d24ff2556d6362ef3cc64b78
 SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9

comms/kermit/files/Makefile

@@ -0,0 +1,45 @@
+# $NetBSD: Makefile,v 1.1 2014/06/23 22:25:39 christos Exp $
+
+.include <bsd.own.mk>
+
+WARNS=0
+
+CPPFLAGS+= -DBSD44 -DCK_CURSES -DCK_DTRCD -DCK_DTRCTS -DCK_PAM -DFNFLOAT
+CPPFLAGS+= -DHAVE_OPENPTY -DHERALD=\"NetBSD\" -DTCPSOCKET -DTPUTSARGTYPE=int
+CPPFLAGS+= -DUSE_STRERROR -DZLIB -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CPPFLAGS+= -DNO_DCL_INET_ATON
+
+.if ${MKCRYPTO} == "yes"
+CPPFLAGS+= -DCK_AUTHENTICATION -DCK_CAST -DCK_DES -DCK_ENCRYPTION
+CPPFLAGS+= -DCK_KERBEROS -DCK_SSL -DKRB5 -DLIBDES -DOPENSSL_100 -DHEIMDAL
+CPPFLAGS+= -DKTARGET='" netbsd+krb5+openssl+zlib"'
+CPPFLAGS+= -I/usr/include/krb5
+
+LDADD+= -lcrypt -lcrypto -ldes -lgssapi -lkrb5 -lssl
+DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBDES} ${LIBGSSAPI} ${LIBKRB5} ${LIBSSL}
+
+COPTS.ckuath.c= -Wno-error=deprecated-declarations
+
+.else
+CPPFLAGS+= -DKTARGET='" netbsd+zlib"'
+.endif
+
+LDADD+=-lpam -lutil -lcurses -lz -lm
+DPADD+=${LIBPAM} ${LIBUTIL} ${LIBCURSES} ${LIBZ} ${LIBM}
+CPPFLAGS+=-std=c89
+
+.PATH: ${.CURDIR}/../dist
+
+PROG=	kermit
+SRCS+=	ck_crp.c ck_ssl.c ckcfn2.c ckcfn3.c ckcfns.c ckcftp.c ckclib.c \
+	ckcmai.c ckcnet.c ckcpro.c ckctel.c ckcuni.c ckuath.c ckucmd.c \
+	ckucns.c ckudia.c ckufio.c ckupty.c ckuscr.c ckusig.c ckutio.c \
+	ckuus2.c ckuus3.c ckuus4.c ckuus5.c ckuus6.c ckuus7.c ckuusr.c \
+	ckuusx.c ckuusy.c ckuxla.c
+
+CLEANFILES+=kermit.1
+
+.include <bsd.prog.mk>
+
+kermit.1: ${.CURDIR}/../dist/ckuker.nr
+	@cp ${.ALLSRC} ${.TARGET}

comms/kermit/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2011/08/25 14:54:06 hans Exp $
+# $NetBSD: options.mk,v 1.5 2015/01/17 15:30:03 bsiegert Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.kermit
 PKG_SUPPORTED_OPTIONS=		kermit-suid-uucp ssl kerberos
@@ -22,9 +22,9 @@ SPECIAL_PERMS+=		bin/kermit ${UUCP_USER} ${UUCP_GROUP} 4555
 ### SOCKS firewall support.
 ###
 .if !empty(PKG_OPTIONS:Msocks4)
-KFLAGS+=	-DSOCKS
-LIBS+=		-L${BUILDLINK_PREFIX.socks4}/lib -lsocks4
-.include "../../net/socks4/buildlink3.mk"
+KFLAGS+=	-DSOCKS -DCK_SOCKS
+LIBS+=		-L${BUILDLINK_PREFIX.dante}/lib -lsocks
+.include "../../net/dante/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Msocks5)
 KFLAGS+=	-DSOCKS -DCK_SOCKS5
 LIBS+=		-L${BUILDLINK_PREFIX.socks5}/lib -lsocks5

comms/kermit/patches/patch-ab

@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2011/08/25 14:54:06 hans Exp $
+$NetBSD: patch-ab,v 1.7 2014/06/23 22:24:24 christos Exp $
 
---- ck_ssl.c.orig	2011-07-06 15:03:32.000000000 +0200
-+++ ck_ssl.c	2011-08-23 10:29:50.031163553 +0200
-@@ -2877,6 +2877,7 @@ show_hostname_warning(char *s1, char *s2
+--- ck_ssl.c.orig	2011-07-06 09:03:32.000000000 -0400
++++ ck_ssl.c	2014-06-23 18:21:25.000000000 -0400
+@@ -1072,7 +1072,7 @@
+ #endif /* CK_ANSIC */
+ {
+     X509 *peer;
+-    SSL_CIPHER * cipher;
++    const SSL_CIPHER * cipher;
+     const char *cipher_list;
+     char buf[512]="";
+ 
+@@ -2877,6 +2877,7 @@
  #ifndef OpenBSD
  #ifndef FREEBSD4
  #ifndef NETBSD15
@@ -10,7 +19,7 @@ $NetBSD: patch-ab,v 1.6 2011/08/25 14:54:06 hans Exp $
  #ifndef LINUX
  #ifndef AIX41
  #ifndef UW7
-@@ -2919,6 +2920,7 @@ inet_aton(char * ipaddress, struct in_ad
+@@ -2919,6 +2920,7 @@
  #endif /* UW7 */
  #endif /* AIX41 */
  #endif /* LINUX */
@@ -18,3 +27,21 @@ $NetBSD: patch-ab,v 1.6 2011/08/25 14:54:06 hans Exp $
  #endif /* NETBSD15 */
  #endif /* FREEBSD4 */
  #endif /* OpenBSD */
+@@ -3057,7 +3059,7 @@
+ tls_is_anon(int x)
+ {
+     char buf[128];
+-    SSL_CIPHER * cipher;
++    const SSL_CIPHER * cipher;
+     SSL * ssl = NULL;
+ 
+     switch ( x ) {
+@@ -3101,7 +3103,7 @@
+ tls_is_krb5(int x)
+ {
+     char buf[128];
+-    SSL_CIPHER * cipher;
++    const SSL_CIPHER * cipher;
+     SSL * ssl = NULL;
+ 
+     switch ( x ) {

comms/kermit/patches/patch-al

@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2011/08/25 14:54:06 hans Exp $
+$NetBSD: patch-al,v 1.3 2014/06/23 22:24:24 christos Exp $
 
---- ckuath.c.orig	2011-06-13 19:26:54.000000000 +0200
-+++ ckuath.c	2011-08-23 10:36:18.019522988 +0200
-@@ -117,19 +117,6 @@ int accept_complete = 0;
+--- ckuath.c.orig	2011-06-13 13:26:54.000000000 -0400
++++ ckuath.c	2014-06-23 18:20:26.000000000 -0400
+@@ -117,19 +117,6 @@
  #include <time.h>
  #include <fcntl.h>
  #include <errno.h>
@@ -22,3 +22,370 @@ $NetBSD: patch-al,v 1.2 2011/08/25 14:54:06 hans Exp $
  #ifdef OS2
  #include <io.h>
  #endif /* OS2 */
+@@ -149,7 +136,9 @@
+ #endif /* saveprintf */
+ #else /* HEIMDAL */
+ #include "krb5.h"
++#ifdef BETATEST
+ #include "profile.h"
++#endif
+ #include "com_err.h"
+ #ifdef KRB5_GET_INIT_CREDS_OPT_TKT_LIFE
+ #define KRB5_HAVE_GET_INIT_CREDS
+@@ -417,7 +406,6 @@
+ char des_outpkt[2*RLOG_BUFSIZ+4];    /* needs to be > largest write size */
+ #ifdef KRB5
+ krb5_data desinbuf,desoutbuf;
+-krb5_encrypt_block eblock;             /* eblock for encrypt/decrypt */
+ static krb5_data encivec_i[2], encivec_o[2];
+ 
+ enum krb5_kcmd_proto {
+@@ -3145,8 +3133,13 @@
+             data.data = k4_session_key;
+             data.length = 8;
+ 
+-            code = krb5_c_decrypt(k5_context, &k4_krbkey, 0, 0,
+-                                   &encdata, &data);
++            code = krb5_c_decrypt(k5_context,
++#ifdef HEIMDAL
++				  k4_krbkey,
++#else
++				  &k4_krbkey,
++#endif
++				  0, 0, &encdata, &data);
+ 
+             krb5_free_keyblock_contents(k5_context, &random_key);
+ 
+@@ -3162,8 +3155,13 @@
+             data.data = k4_challenge;
+             data.length = 8;
+ 
+-            code = krb5_c_decrypt(k5_context, &k4_krbkey, 0, 0,
+-                                   &encdata, &data);
++            code = krb5_c_decrypt(k5_context,
++#ifdef HEIMDAL
++				  k4_krbkey,
++#else
++				  &k4_krbkey,
++#endif
++				  0, 0, &encdata, &data);
+ #else /* MIT_CURRENT */
+             memset(k4_sched,0,sizeof(Schedule));
+             ckhexdump("auth_send",cred.session,8);
+@@ -3295,7 +3293,7 @@
+     case AUTHTYPE_KERBEROS_V5:
+         debug(F111,"auth_send KRB5","k5_auth.length",k5_auth.length);
+         for ( i=0 ; i<k5_auth.length ; i++ ) {
+-            if ( (char *)k5_auth.data[i] == IAC )
++            if ( ((char *)k5_auth.data)[i] == IAC )
+                 iaccnt++;
+         }
+         if ( k5_auth.length + iaccnt + 10 < sizeof(buf) ) {
+@@ -4250,8 +4248,13 @@
+         kdata.data = k4_challenge;
+         kdata.length = 8;
+ 
+-        if (code = krb5_c_decrypt(k5_context, &k4_krbkey, 0, 0,
+-                                   &encdata, &kdata)) {
++        if (code = krb5_c_decrypt(k5_context,
++#ifdef HEIMDAL
++				  k4_krbkey,
++#else
++				  &k4_krbkey,
++#endif
++				  0, 0, &encdata, &kdata)) {
+             com_err("k4_auth_is", code, "while decrypting challenge");
+             auth_finished(AUTH_REJECT);
+             return AUTH_FAILURE;
+@@ -4752,9 +4755,11 @@
+         ap_opts |= AP_OPTS_MUTUAL_REQUIRED;
+ 
+ #ifdef HEIMDAL
++#ifdef notdef
+     r = krb5_auth_setkeytype(k5_context, auth_context, KEYTYPE_DES);
+     if (r)
+         com_err(NULL, r, "while setting auth keytype");
++#endif
+     r = krb5_auth_con_setaddrs_from_fd(k5_context,auth_context, &ttyfd);
+     if (r)
+         com_err(NULL, r, "while setting auth addrs");
+@@ -4924,7 +4929,6 @@
+                     skey.data = k5_session_key->contents;
+ #endif /* HEIMDAL */
+                 } else {
+-#ifdef HEIMDAL
+                     switch ( k5_session_key->keytype ) {
+                     case ETYPE_DES_CBC_CRC:
+                     case ETYPE_DES_CBC_MD5:
+@@ -4934,24 +4938,17 @@
+                         break;
+                     default:
+                         skey.type = SK_GENERIC;
++#ifdef HEIMDAL
++                        skey.length = k5_session_key->keyvalue.length;
++#else /* HEIMDAL */
+                         skey.length = k5_session_key->length;
++#endif /* HEIMDAL */
+                         encrypt_dont_support(ENCTYPE_DES_CFB64);
+                         encrypt_dont_support(ENCTYPE_DES_OFB64);
+                     }
++#ifdef HEIMDAL
+                     skey.data = k5_session_key->keyvalue.data;
+ #else /* HEIMDAL */
+-                    switch ( k5_session_key->enctype ) {
+-                    case ENCTYPE_DES_CBC_CRC:
+-                    case ENCTYPE_DES_CBC_MD5:
+-                    case ENCTYPE_DES_CBC_MD4:
+-                        skey.type = SK_DES;
+-                        skey.length = 8;
+-                    default:
+-                        skey.type = SK_GENERIC;
+-                        skey.length = k5_session_key->length;
+-                        encrypt_dont_support(ENCTYPE_DES_CFB64);
+-                        encrypt_dont_support(ENCTYPE_DES_OFB64);
+-                    }
+                     skey.data = k5_session_key->contents;
+ #endif /* HEIMDAL */
+                 }
+@@ -5038,7 +5035,6 @@
+                     skey.data = k5_session_key->contents;
+ #endif /* HEIMDAL */
+                 } else {
+-#ifdef HEIMDAL
+                     switch ( k5_session_key->keytype ) {
+                     case ETYPE_DES_CBC_CRC:
+                     case ETYPE_DES_CBC_MD5:
+@@ -5047,21 +5043,15 @@
+                         skey.length = 8;
+                     default:
+                         skey.type = SK_GENERIC;
++#ifdef HEIMDAL
++                        skey.length = k5_session_key->keyvalue.length;
++#else /* HEIMDAL */
+                         skey.length = k5_session_key->length;
++#endif /* HEIMDAL */
+                     }
++#ifdef HEIMDAL
+                     skey.data = k5_session_key->keyvalue.data;
+ #else /* HEIMDAL */
+-                    switch ( k5_session_key->enctype ) {
+-                    case ENCTYPE_DES_CBC_CRC:
+-                    case ENCTYPE_DES_CBC_MD5:
+-                    case ENCTYPE_DES_CBC_MD4:
+-                        skey.type = SK_DES;
+-                        skey.length = 8;
+-                        break;
+-                    default:
+-                        skey.type = SK_GENERIC;
+-                        skey.length = k5_session_key->length;
+-                    }
+                     skey.data = k5_session_key->contents;
+ #endif /* HEIMDAL */
+                 }
+@@ -5138,7 +5128,11 @@
+             }
+             if ( msg.length == 24 && !memcmp(msg.data,tls_verify,24) )
+                  krb5_tls_verified = 1;
++#ifdef HEIMDAL
++            krb5_data_free(&msg);
++#else /* HEIMDAL */
+             krb5_free_data_contents(k5_context,&msg);
++#endif /* HEIMDAL */
+             if (krb5_tls_verified)
+                 return(AUTH_SUCCESS);
+         }
+@@ -5166,7 +5160,7 @@
+     krb5_context context;
+     krb5_auth_context auth_context;
+     krb5_data *inbuf;
+-    krb5_const_principal client;
++    krb5_principal client;
+ {
+     krb5_creds ** creds=NULL;
+     krb5_error_code retval;
+@@ -5197,7 +5191,7 @@
+     if ((retval = krb5_cc_initialize(context, ccache, client)))
+         return(retval);
+ 
+-    if ((retval = krb5_rd_cred(context, auth_context, ccache, inbuf)))
++    if ((retval = krb5_rd_cred2(context, auth_context, ccache, inbuf)))
+         return(retval);
+ #else /* HEIMDAL */
+     if ((retval = krb5_rd_cred(context, auth_context, inbuf, &creds, NULL)))
+@@ -5472,17 +5466,17 @@
+                 goto errout;
+             }
+             SendK5AuthSB(KRB5_TLS_VERIFY, msg.data, msg.length);
++#ifdef HEIMDAL
++            krb5_data_free(&msg);
++#else
+             krb5_free_data_contents(k5_context,&msg);
++#endif
+         }
+ #endif /* CK_SSL */
+         if ((how & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
+             /* do ap_rep stuff here */
+             if ((r = krb5_mk_rep(k5_context,
+-#ifdef HEIMDAL
+-                                  &auth_context,
+-#else /* HEIMDAL */
+                                   auth_context,
+-#endif /* HEIMDAL */
+                                   &outbuf))) {
+                 debug(F111,"k5_auth_is","krb5_mk_rep",r);
+                 (void) ckstrncpy(errbuf, "Make reply failed: ",sizeof(errbuf));
+@@ -5503,7 +5497,7 @@
+             {
+                 szUserNameAuthenticated[0] = '\0';
+             } else {
+-                ckstrncpy(szUserNameAuthenticated,UIDBUFLEN,name);
++                ckstrncpy(szUserNameAuthenticated,name,UIDBUFLEN);
+                 free(name);
+             }
+         }
+@@ -9687,6 +9681,7 @@
+     return(-1);
+ }
+ 
++int
+ #ifdef CK_ANSIC
+ ck_krb4_destroy(struct krb_op_data * op)
+ #else
+@@ -11228,7 +11223,12 @@
+ 
+     use_ivecs = 1;
+ 
+-    if (status = krb5_c_block_size(k5_context, k5_session_key->enctype,
++    if (status = krb5_c_block_size(k5_context,
++#ifdef HEIMDAL
++    k5_session_key->keytype,
++#else
++    k5_session_key->enctype,
++#endif
+                                    &blocksize)) {
+         /* XXX what do I do? */
+         printf("fatal kerberos 5 crypto library error\n");
+@@ -11309,8 +11309,7 @@
+         krb5_ap_rep_enc_part *rep_ret = NULL;
+         krb5_data outbuf;
+         int rc;
+-        krb5_int32 seqno=0;
+-        krb5_int32 server_seqno=0;
++        int server_seqno=0;
+         char ** realmlist=NULL;
+         int buflen;
+         char tgt[256];
+@@ -11388,7 +11387,11 @@
+         }
+ 
+         if (krb5_rlog_ver == KCMD_OLD_PROTOCOL)
++#ifdef HEIMDAL
++            get_cred->session.keytype=ETYPE_DES_CBC_CRC;
++#else
+             get_cred->keyblock.enctype=ENCTYPE_DES_CBC_CRC;
++#endif
+ 
+         /* Get ticket from credentials cache or kdc */
+         status = krb5_get_credentials(k5_context,
+@@ -11429,10 +11432,11 @@
+             krb5_boolean is_des;
+ 
+             if (status = krb5_c_enctype_compare( k5_context,
+-                                                 ENCTYPE_DES_CBC_CRC,
+ #ifdef HEIMDAL
++						 ETYPE_DES_CBC_CRC,
+                                                  ret_cred->session.keytype,
+ #else /* HEIMDAL */
++                                                 ENCTYPE_DES_CBC_CRC,
+                                                  ret_cred->keyblock.enctype,
+ #endif /* HEIMDAL */
+                                                  &is_des)) {
+@@ -11482,7 +11486,11 @@
+                                &rep_ret,
+                                NULL
+                                );
++#ifdef HEIMDAL
++        krb5_data_free(&cksumdat);
++#else
+         krb5_free_data_contents(k5_context,&cksumdat);
++#endif
+ 
+         if (status) {
+             if ( !quiet )
+@@ -11490,12 +11498,17 @@
+                         error_message(status));
+             if (error) {
+                 if ( !quiet ) {
+-                    printf("Server returned error code %d (%s)\r\n",
+-                        error->error,
+-                        error_message(ERROR_TABLE_BASE_krb5 + error->error));
+-                    if (error->text.length) {
+-                        printf("Error text sent from server: %s\r\n",
+-                                error->text.data);
++#ifdef HEIMDAL
++		    int xerror = error->error_code;
++		    char *xtext = *error->e_text;
++#else
++		    int xerror = error->error;
++		    char *xtext = error->text.length ? error->text.data : NULL;
++#endif
++                    printf("Server returned error code %d (%s)\r\n", xerror,
++                        error_message(ERROR_TABLE_BASE_krb5 + xerror));
++                    if (xtext) {
++                        printf("Error text sent from server: %s\r\n", xtext);
+                     }
+                 }
+                 krb5_free_error(k5_context, error);
+@@ -11505,7 +11518,11 @@
+         }
+ 
+         if (rep_ret) {
++#ifdef HEIMDAL
++            server_seqno = *rep_ret->seq_number;
++#else
+             server_seqno = rep_ret->seq_number;
++#endif
+             krb5_free_ap_rep_enc_part(k5_context, rep_ret);
+         }
+ 
+@@ -11834,7 +11851,11 @@
+     rd_len = (rd_len << 8) | c;
+ 
+     if (status = krb5_c_encrypt_length(k5_context, 
++#ifdef HEIMDAL
++                                    k5_session_key->keytype,
++#else
+                                     k5_session_key->enctype,
++#endif
+                                     use_ivecs ? rd_len + 4 : rd_len,
+ 				    (size_t *)&net_len)) {
+         errno = status;
+@@ -11865,9 +11886,15 @@
+     plain.length = sizeof(storage);
+     plain.data = storage;
+ 
+-    if ( status = krb5_c_decrypt(k5_context, k5_session_key, KCMD_KEYUSAGE,
++    if ( status = krb5_c_decrypt(k5_context,
++#ifdef HEIMDAL
++				 *k5_session_key,
++#else
++				 k5_session_key,
++#endif
++				 KCMD_KEYUSAGE,
+                                  use_ivecs ? encivec_i + secondary : 0,
+-                                  &cipher,&plain) ) {
++                                 &cipher,&plain) ) {
+         /* probably out of sync */
+         printf("Cannot decrypt data from network: %s\r\n",
+                  error_message(status));
+@@ -12759,8 +12786,8 @@
+ 
+ static int
+ binaryEqual (a, b, len)
+-register char   *a, *b;
+-register int    len;
++char   *a, *b;
++int    len;
+ {
+     while (len--)
+         if (*a++ != *b++)

comms/libopensync-plugin-evolution2/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2014/01/01 11:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/10/07 16:47:19 adam Exp $
 #
 
 DISTNAME=	libopensync-plugin-evolution2-0.22
-PKGREVISION=	17
+PKGREVISION=	19
 CATEGORIES=	comms
 MASTER_SITES=	http://www.opensync.org/download/releases/0.22/
 EXTRACT_SUFX=	.tar.bz2

comms/libopensync-plugin-file/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/10/19 09:07:01 adam Exp $
+# $NetBSD: Makefile,v 1.16 2014/10/07 16:47:19 adam Exp $
 #
 
 DISTNAME=	libopensync-plugin-file-0.22
-PKGREVISION=	10
+PKGREVISION=	12
 CATEGORIES=	comms
 MASTER_SITES=	http://www.opensync.org/download/releases/0.22/
 EXTRACT_SUFX=	.tar.bz2

comms/libopensync-plugin-kdepim/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: Makefile,v 1.38 2014/10/07 16:47:19 adam Exp $
 #
 
 DISTNAME=	libopensync-plugin-kdepim-0.22
-PKGREVISION=	30
+PKGREVISION=	34
 CATEGORIES=	comms
 MASTER_SITES=	http://www.opensync.org/download/releases/0.22/
 EXTRACT_SUFX=	.tar.bz2

comms/libopensync-plugin-syncml/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2013/10/19 09:07:01 adam Exp $
+# $NetBSD: Makefile,v 1.17 2014/10/07 16:47:19 adam Exp $
 #
 
 DISTNAME=	libopensync-plugin-syncml-0.22
-PKGREVISION=	11
+PKGREVISION=	13
 CATEGORIES=	comms
 MASTER_SITES=	http://www.opensync.org/download/releases/0.22/
 EXTRACT_SUFX=	.tar.bz2

comms/libopensync/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/10/19 09:06:56 adam Exp $
+# $NetBSD: Makefile,v 1.20 2014/10/07 16:47:10 adam Exp $
 #
 
 DISTNAME=	libopensync-0.22
-PKGREVISION=	11
+PKGREVISION=	13
 CATEGORIES=	comms
 MASTER_SITES=	http://www.opensync.org/download/releases/0.22/
 EXTRACT_SUFX=	.tar.bz2

comms/libopensync/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2013/10/19 09:06:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2014/10/07 16:47:10 adam Exp $
 
 BUILDLINK_TREE+=	libopensync
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libopensync
 LIBOPENSYNC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libopensync+=	libopensync>=0.22
-BUILDLINK_ABI_DEPENDS.libopensync+=	libopensync>=0.22nb11
+BUILDLINK_ABI_DEPENDS.libopensync+=	libopensync>=0.22nb13
 BUILDLINK_PKGSRCDIR.libopensync?=	../../comms/libopensync
 
 .include "../../databases/sqlite3/buildlink3.mk"

comms/lirc/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/12/25 11:41:25 cheusov Exp $
+# $NetBSD: Makefile,v 1.4 2015/01/01 09:35:17 dholland Exp $
 #
 
 DISTNAME=	lirc-0.9.0
@@ -38,7 +38,7 @@ post-install:
 
 .include "available.mk"
 .if ${LIRC_AVAILABLE} == no
-PKG_FAIL_REASON=	"lirc is not available for this platform"
+PKG_SKIP_REASON=	"lirc is not available for this platform"
 .endif
 
 .include "options.mk"

comms/lrzsz/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/03 11:24:41 asau Exp $
+# $NetBSD: Makefile,v 1.31 2014/10/09 14:06:03 wiz Exp $
 
 DISTNAME=	lrzsz-0.12.20
 PKGREVISION=	1
@@ -9,15 +9,13 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ohse.de/uwe/software/lrzsz.html
 COMMENT=	Receive/Send files via X/Y/ZMODEM protocol.  (unrestrictive)
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" \
-	|| ${OPSYS} == "Linux")
+	|| ${OPSYS} == "Linux" || ${OPSYS} == "Haiku")
 BROKEN_GETTEXT_DETECTION=yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
 LOCALE_SUFFIX=		mo

comms/mgetty+sendfax/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2013/07/12 10:44:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.91 2014/09/08 21:24:44 wiz Exp $
 
 DISTNAME=	mgetty1.1.37-Jun05
 PKGNAME=	mgetty-1.1.37
-PKGREVISION=	9
+PKGREVISION=	12
 CATEGORIES=	comms
 MASTER_SITES=	ftp://alpha.greenie.net/pub/mgetty/source/1.1/
 
@@ -11,6 +11,8 @@ HOMEPAGE=	http://mgetty.greenie.net/
 COMMENT=	Handle external logins, send and receive faxes
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
+
 MAKE_JOBS_SAFE=		no
 
 BUILD_DEPENDS+=	texi2roff-[0-9]*:../../textproc/texi2roff
@@ -87,8 +89,6 @@ SUBST_SED.prefix+=	-e 's|/var/log|${VARBASE}/log|'
 SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fixing hardcoded installation prefix.
 
-.include "../../graphics/netpbm/buildlink3.mk"
-
 post-extract:
 	cd ${WRKSRC} && cp policy.h-dist policy.h
 

comms/minicom/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2013/10/09 10:53:24 adam Exp $
+# $NetBSD: Makefile,v 1.65 2014/10/09 14:06:03 wiz Exp $
 
 DISTNAME=	minicom-2.6.2
 CATEGORIES=	comms
@@ -12,7 +12,6 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	gkermit-[0-9]*:../../comms/gkermit
 DEPENDS+=	lrzsz-[0-9]*:../../comms/lrzsz
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
 INSTALLATION_DIRS=	share/examples/minicom
 
 USE_PKGLOCALEDIR=	yes

comms/msynctool/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/10/19 09:07:01 adam Exp $
+# $NetBSD: Makefile,v 1.16 2014/10/07 16:47:19 adam Exp $
 #
 
 DISTNAME=	msynctool-0.22
-PKGREVISION=	10
+PKGREVISION=	12
 CATEGORIES=	comms
 MASTER_SITES=	http://www.opensync.org/download/releases/0.22/
 EXTRACT_SUFX=	.tar.bz2

comms/multisync-gui/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2014/01/25 10:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2014/10/07 16:47:19 adam Exp $
 
 DISTNAME=	multisync-gui-0.91.0
-PKGREVISION=	27
+PKGREVISION=	30
 CATEGORIES=	comms
 MASTER_SITES=	http://www.opensync.org/raw-attachment/wiki/releases/0.2x/download/
 
@@ -13,9 +13,10 @@ USE_TOOLS+=	pkg-config
 HAS_CONFIGURE=	yes
 
 REPLACE_PYTHON= waf
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.91.0
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.91.0
 
 LDFLAGS.DragonFly=	-lgthread-2.0
+LDFLAGS.SunOS+=		-lgthread-2.0
 
 .include "../../lang/python/application.mk"
 .include "../../devel/glib2/buildlink3.mk"

comms/obexapp/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2014/12/30 08:11:14 plunky Exp $
 #
 
 DISTNAME=	obexapp-1.4.15
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://people.freebsd.org/~emax/obexapp/
 
-MAINTAINER=	plunky@rya-online.net
+MAINTAINER=	plunky@NetBSD.org
 HOMEPAGE=	http://people.freebsd.org/~emax/obexapp/
 COMMENT=	Obex application to transfer objects to mobile equipment
 LICENSE=	modified-bsd

comms/op_panel/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/05/31 12:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/29 23:35:20 wiz Exp $
 #
 
 DISTNAME=	op_panel-0.29
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	http://www.asternic.org/files/
 

comms/openobex/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2014/01/05 20:01:42 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2015/02/02 02:47:02 mef Exp $
 
-DISTNAME=	openobex-1.7-Source
-PKGNAME=	openobex-1.7
+DISTNAME=	openobex-1.7.1-Source
+PKGNAME=	${DISTNAME:C/-Source//}
 PKGREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openobex/}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://gitorious.org/openobex
 COMMENT=	Implementation of the Object Exchange (OBEX) protocol
 LICENSE=	gnu-lgpl-v2
 
-BUILD_DEPENDS+=	doxygen>=1.8.6:../../devel/doxygen
+BUILD_DEPENDS+=	doxygen>=1.8.9.1:../../devel/doxygen
 
 USE_CMAKE=	yes
 USE_TOOLS+=	cmake pkg-config

comms/openobex/PLIST

@@ -1,17 +1,19 @@
-@comment $NetBSD: PLIST,v 1.7 2014/01/05 20:01:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/02/02 02:47:02 mef Exp $
 include/openobex/obex.h
 include/openobex/obex_const.h
 include/openobex/version.h
-lib/cmake/OpenObex-1.7/openobex-config-version.cmake
-lib/cmake/OpenObex-1.7/openobex-config.cmake
-lib/cmake/OpenObex-1.7/openobex-target-release.cmake
-lib/cmake/OpenObex-1.7/openobex-target.cmake
+lib/cmake/OpenObex-${PKGVERSION}/openobex-config-version.cmake
+lib/cmake/OpenObex-${PKGVERSION}/openobex-config.cmake
+lib/cmake/OpenObex-${PKGVERSION}/openobex-target-release.cmake
+lib/cmake/OpenObex-${PKGVERSION}/openobex-target.cmake
 lib/libopenobex.so
-lib/libopenobex.so.1.7
+lib/libopenobex.so.${PKGVERSION}
 lib/libopenobex.so.2
 lib/pkgconfig/openobex.pc
 share/doc/openobex/html/annotated.html
 share/doc/openobex/html/api_8c.html
+share/doc/openobex/html/arrowdown.png
+share/doc/openobex/html/arrowright.png
 share/doc/openobex/html/bc_s.png
 share/doc/openobex/html/bdwn.png
 share/doc/openobex/html/classes.html
@@ -19,37 +21,24 @@ share/doc/openobex/html/closed.png
 share/doc/openobex/html/dir_000000.html
 share/doc/openobex/html/dir_000001.html
 share/doc/openobex/html/dir_000002.html
+share/doc/openobex/html/doc.png
 share/doc/openobex/html/doxygen.css
 share/doc/openobex/html/doxygen.png
 share/doc/openobex/html/dynsections.js
 share/doc/openobex/html/files.html
-share/doc/openobex/html/ftv2blank.png
-share/doc/openobex/html/ftv2cl.png
-share/doc/openobex/html/ftv2doc.png
-share/doc/openobex/html/ftv2folderclosed.png
-share/doc/openobex/html/ftv2folderopen.png
-share/doc/openobex/html/ftv2lastnode.png
-share/doc/openobex/html/ftv2link.png
-share/doc/openobex/html/ftv2mlastnode.png
-share/doc/openobex/html/ftv2mnode.png
-share/doc/openobex/html/ftv2mo.png
-share/doc/openobex/html/ftv2node.png
-share/doc/openobex/html/ftv2ns.png
-share/doc/openobex/html/ftv2plastnode.png
-share/doc/openobex/html/ftv2pnode.png
-share/doc/openobex/html/ftv2splitbar.png
-share/doc/openobex/html/ftv2vertline.png
+share/doc/openobex/html/folderclosed.png
+share/doc/openobex/html/folderopen.png
 share/doc/openobex/html/functions.html
 share/doc/openobex/html/functions_vars.html
 share/doc/openobex/html/globals.html
-share/doc/openobex/html/globals_f.html
-share/doc/openobex/html/globals_i.html
-share/doc/openobex/html/globals_o.html
-share/doc/openobex/html/globals_t.html
 share/doc/openobex/html/globals_defs.html
 share/doc/openobex/html/globals_enum.html
 share/doc/openobex/html/globals_eval.html
+share/doc/openobex/html/globals_f.html
 share/doc/openobex/html/globals_func.html
+share/doc/openobex/html/globals_i.html
+share/doc/openobex/html/globals_o.html
+share/doc/openobex/html/globals_t.html
 share/doc/openobex/html/globals_type.html
 share/doc/openobex/html/index.html
 share/doc/openobex/html/jquery.js
@@ -60,6 +49,7 @@ share/doc/openobex/html/obex_8h.html
 share/doc/openobex/html/obex__const_8h.html
 share/doc/openobex/html/open.png
 share/doc/openobex/html/openobex_8coverpage.html
+share/doc/openobex/html/splitbar.png
 share/doc/openobex/html/structobex__ctrans__t.html
 share/doc/openobex/html/structobex__irda__intf__t.html
 share/doc/openobex/html/structobex__usb__intf__service__t.html

comms/openobex/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2013/03/21 06:49:12 sbd Exp $
+$NetBSD: distinfo,v 1.9 2014/11/23 11:33:33 mef Exp $
 
-SHA1 (openobex-1.7-Source.tar.gz) = 9fb8de31b551fd116991641f296d64be98f84b27
-RMD160 (openobex-1.7-Source.tar.gz) = f4b80ac9533953312c0482e83ec5445550100eb6
-Size (openobex-1.7-Source.tar.gz) = 130372 bytes
+SHA1 (openobex-1.7.1-Source.tar.gz) = b70e10ac21737fd1280cfb4d7408f623118ed355
+RMD160 (openobex-1.7.1-Source.tar.gz) = fd06ffd6fd4fd8457c81c300b4e7c790def49f52
+Size (openobex-1.7.1-Source.tar.gz) = 131091 bytes
 SHA1 (patch-lib_api.c) = 4ea3f2b8179a52a4d1266395a4f20b572582903f

comms/p5-Asterisk/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2013/05/31 12:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/10/09 14:06:03 wiz Exp $
 #
 
 DISTNAME=		asterisk-perl-1.03
 PKGNAME=		p5-Asterisk-1.03
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		comms perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JA/JAMESGOL/}
 MASTER_SITES+=		http://asterisk.gnuinter.net/files/
@@ -13,8 +13,6 @@ HOMEPAGE=		http://asterisk.gnuinter.net/
 COMMENT=		Collection of perl modules to be used with Asterisk
 LICENSE=		artistic
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 PERL5_PACKLIST=		auto/asterisk-perl/.packlist
 EXAMPLES_DIR=		${PREFIX}/share/examples/p5-Asterisk
 

comms/p5-Data-AMF/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/05/31 12:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/05/29 23:35:20 wiz Exp $
 #
 
 DISTNAME=	Data-AMF-0.09
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	http://search.cpan.org/CPAN/authors/id/T/TY/TYPESTER/
 

comms/p5-Device-Gsm/Makefile

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2013/05/31 12:39:43 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2014/10/09 13:44:33 wiz Exp $
 #
 
 DISTNAME=	Device-Gsm-1.60
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
-SVR4_PKGNAME=	p5dgs
+PKGREVISION=	3
 CATEGORIES=	comms perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Device/}
 

comms/p5-Device-Modem/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2014/02/06 12:28:26 abs Exp $
+# $NetBSD: Makefile,v 1.27 2014/10/09 13:44:33 wiz Exp $
 
 DISTNAME=	Device-Modem-1.57
 PKGNAME=	p5-${DISTNAME}
-SVR4_PKGNAME=	p5dmd
+PKGREVISION=	1
 CATEGORIES=	comms perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Device/}
 

comms/p5-Device-SerialPort/Makefile

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2013/05/31 12:39:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/10/09 13:44:33 wiz Exp $
 #
 
 DISTNAME=	Device-SerialPort-1.04
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	5
-SVR4_PKGNAME=	p5dse
+PKGREVISION=	6
 CATEGORIES=	comms perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Device/}
 

comms/p5-Device-XBee-API/Makefile

@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2013/05/31 12:39:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/15 06:22:55 dsainty Exp $
 #
 
-DISTNAME=	Device-XBee-API-0.4
+DISTNAME=	Device-XBee-API-0.7
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://search.cpan.org/CPAN/authors/id/J/JE/JEAGLE/
 

comms/p5-Device-XBee-API/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/09/01 02:29:38 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2014/06/15 06:22:55 dsainty Exp $
 
-SHA1 (Device-XBee-API-0.4.tar.gz) = 8d962316d8971e9efa9ccc1c375e774ed3a65762
-RMD160 (Device-XBee-API-0.4.tar.gz) = 2ce76d1f36145e6a9371a67186a59f067ff6c7dc
-Size (Device-XBee-API-0.4.tar.gz) = 11437 bytes
+SHA1 (Device-XBee-API-0.7.tar.gz) = fb74c4ea196b5f761357e8cbafc5420b048a069f
+RMD160 (Device-XBee-API-0.7.tar.gz) = 29c130d98e3fd2016f815df3594694fe0ff5fc99
+Size (Device-XBee-API-0.7.tar.gz) = 14479 bytes

comms/p5-SMS-Send/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/12/09 14:17:41 obache Exp $
+# $NetBSD: Makefile,v 1.10 2014/05/31 12:56:54 wiz Exp $
 
 DISTNAME=	SMS-Send-1.06
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	5
 CATEGORIES=	comms perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SMS/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://search.cpan.org/dist/SMS-Send/
 COMMENT=	Driver-based API for sending SMS messages
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	{perl>=5.10.1,p5-Module-Pluggable>=3.7}:../../devel/p5-Module-Pluggable
+DEPENDS+=	p5-Module-Pluggable>=3.7:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-Params-Util>=1.00:../../devel/p5-Params-Util
 DEPENDS+=	p5-Class-Adapter>=1.05:../../devel/p5-Class-Adapter
 

comms/p5-pilot-link/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.53 2013/10/16 08:57:40 roy Exp $
+# $NetBSD: Makefile,v 1.54 2014/05/29 23:35:20 wiz Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
 
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		8
+PKGREVISION=		9
 
 COMMENT=		Perl bindings for pilot-link
 

comms/pilot-link/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2013/10/16 08:55:01 roy Exp $
+# $NetBSD: Makefile,v 1.61 2014/05/29 23:35:20 wiz Exp $
 
 .include "../../comms/pilot-link/Makefile.common"
 
-PKGREVISION=		7
+PKGREVISION=		8
 COMMENT=		Tools to talk to the 3Com Pilot PDA
 
 BUILDLINK_API_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}

comms/pilotmgr/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/12/09 14:17:41 obache Exp $
+# $NetBSD: Makefile,v 1.51 2014/05/29 23:35:21 wiz Exp $
 
 DISTNAME=	pilotmgr-1.109
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pilotmanager/}
 EXTRACT_SUFX=	.tgz

comms/py-colorama/DESCR

@@ -0,0 +1,13 @@
+Makes ANSI escape character sequences for producing colored terminal text and
+cursor positioning work under MS Windows.
+
+ANSI escape character sequences have long been used to produce colored terminal
+text and cursor positioning on Unix and Macs. Colorama makes this work on
+Windows, too, by wrapping stdout, stripping ANSI sequences it finds (which
+otherwise show up as gobbledygook in your output), and converting them into the
+appropriate win32 calls to modify the state of the terminal. On other platforms,
+Colorama does nothing.
+
+Colorama also provides some shortcuts to help generate ANSI sequences but works
+fine in conjunction with any other ANSI sequence generation library, such as
+Termcolor.

comms/py-colorama/Makefile

@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2014/12/05 14:52:52 rodent Exp $
+
+DISTNAME=	colorama-0.3.2
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	comms python
+MASTER_SITES=	https://pypi.python.org/packages/source/c/colorama/
+
+MAINTAINER=	kamelderouiche@yahoo.com
+HOMEPAGE=	https://pypi.python.org/pypi/colorama
+COMMENT=	Cross-platform coloured terminal text
+LICENSE=	modified-bsd
+
+USE_LANGUAGES=	# none
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"

comms/py-colorama/PLIST

@@ -0,0 +1,23 @@
+@comment $NetBSD: PLIST,v 1.1 2014/12/05 14:52:52 rodent Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/colorama/__init__.py
+${PYSITELIB}/colorama/__init__.pyc
+${PYSITELIB}/colorama/__init__.pyo
+${PYSITELIB}/colorama/ansi.py
+${PYSITELIB}/colorama/ansi.pyc
+${PYSITELIB}/colorama/ansi.pyo
+${PYSITELIB}/colorama/ansitowin32.py
+${PYSITELIB}/colorama/ansitowin32.pyc
+${PYSITELIB}/colorama/ansitowin32.pyo
+${PYSITELIB}/colorama/initialise.py
+${PYSITELIB}/colorama/initialise.pyc
+${PYSITELIB}/colorama/initialise.pyo
+${PYSITELIB}/colorama/win32.py
+${PYSITELIB}/colorama/win32.pyc
+${PYSITELIB}/colorama/win32.pyo
+${PYSITELIB}/colorama/winterm.py
+${PYSITELIB}/colorama/winterm.pyc
+${PYSITELIB}/colorama/winterm.pyo

comms/py-colorama/distinfo

@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2014/12/05 14:52:52 rodent Exp $
+
+SHA1 (colorama-0.3.2.tar.gz) = f2da891543421eeb423c469dff13faf1e70187e5
+RMD160 (colorama-0.3.2.tar.gz) = 47d181b0a4fb8fbac3af937d2aa2270456919e35
+Size (colorama-0.3.2.tar.gz) = 18343 bytes

comms/py-gammu/Makefile

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/01/25 10:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/11/23 10:06:41 mef Exp $
 #
 
 .include "../../comms/gammu/Makefile.common"
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 COMMENT=	Python bindings for gammu
 
 DISTINFO_FILE=	${.CURDIR}/../../comms/gammu/distinfo
@@ -18,7 +17,7 @@ PYSETUPBUILDTARGET=	build_ext
 PYSETUPBUILDARGS=	--gammu-incs=${BUILDLINK_PREFIX.gammu}/include/gammu
 PYSETUPBUILDARGS+=	--gammu-libs=${BUILDLINK_PREFIX.gammu}/lib
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.26.1
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.26.1
 
 EGG_NAME=	python_${DISTNAME}
 

comms/py-gammu/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/04/08 20:21:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/11/23 10:06:41 mef Exp $
 ${PYSITELIB}/gammu/Data.py
 ${PYSITELIB}/gammu/Data.pyc
 ${PYSITELIB}/gammu/Data.pyo
@@ -9,4 +9,16 @@ ${PYSITELIB}/gammu/__init__.py
 ${PYSITELIB}/gammu/__init__.pyc
 ${PYSITELIB}/gammu/__init__.pyo
 ${PYSITELIB}/gammu/_gammu.so
+${PYSITELIB}/gammu/data.py
+${PYSITELIB}/gammu/data.pyc
+${PYSITELIB}/gammu/data.pyo
+${PYSITELIB}/gammu/exception.py
+${PYSITELIB}/gammu/exception.pyc
+${PYSITELIB}/gammu/exception.pyo
+${PYSITELIB}/gammu/smsd.py
+${PYSITELIB}/gammu/smsd.pyc
+${PYSITELIB}/gammu/smsd.pyo
+${PYSITELIB}/gammu/worker.py
+${PYSITELIB}/gammu/worker.pyc
+${PYSITELIB}/gammu/worker.pyo
 ${PYSITELIB}/${EGG_FILE}

comms/py-python-termstyle/DESCR

@@ -0,0 +1,3 @@
+termstyle is a simple python library for adding coloured output to terminal
+(console) programs. The definitions come from ECMA-048, the "Control Functions
+for Coded Character Sets" standard.

comms/py-python-termstyle/Makefile

@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.2 2014/12/31 13:57:25 wiz Exp $
+
+DISTNAME=	python-termstyle-0.1.10
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	comms
+MASTER_SITES=	https://pypi.python.org/packages/source/p/python-termstyle/
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://gfxmonk.net/dist/0install/python-termstyle.xml
+COMMENT=	Console colouring for python
+LICENSE=	modified-bsd
+
+USE_LANGUAGES=	# none
+
+REPLACE_PYTHON=	termstyle.py
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"

comms/py-python-termstyle/PLIST

@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2014/12/06 03:19:01 rodent Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/termstyle.py
+${PYSITELIB}/termstyle.pyc
+${PYSITELIB}/termstyle.pyo

comms/py-python-termstyle/distinfo

@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2014/12/06 03:19:01 rodent Exp $
+
+SHA1 (python-termstyle-0.1.10.tar.gz) = 04427e30a01cfec3b07e410f25776b55432f603f
+RMD160 (python-termstyle-0.1.10.tar.gz) = 6a136e3328094b3c8a39d037ac2555b3fd58b0e5
+Size (python-termstyle-0.1.10.tar.gz) = 4131 bytes

comms/py-serial/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/19 09:49:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/09 07:36:56 wiz Exp $
 
 DISTNAME=		pyserial-2.7
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,7 +10,7 @@ HOMEPAGE=		http://pyserial.sourceforge.net/
 COMMENT=		Python Serial Port Extension
 LICENSE=		python-software-foundation
 
-#PYTHON_VERSIONS_INCOMPATIBLE=	33
+#PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
 CONFLICTS+=		${PYPKGPREFIX}-pyserial-[0-9]*
 

comms/ruby-termios/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/03/13 18:10:52 taca Exp $
+# $NetBSD: Makefile,v 1.28 2015/01/16 09:18:47 taca Exp $
 
 DISTNAME=	ruby-termios-0.9.6
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v2 OR ruby-license
 
 GEM_CLEANBUILD=	Makefile *.o *.time termios.${RUBY_DLEXT} mkmf.log \
 		.RUBYARCHDIR.time
-GEM_CLEANBUOLD_EXTENSIONS=	termios.rb
+GEM_CLEANBUILD_EXTENSIONS=	termios.rb
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

comms/ruby-termios/PLIST

@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2014/03/13 18:10:52 taca Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/03/08 15:17:17 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_EXTSDIR}/gem.build_complete
 ${GEM_EXTSDIR}/termios.${RUBY_DLEXT}
 ${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/README

comms/tilp2/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2013/10/10 14:42:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2014/05/05 00:47:41 ryoon Exp $
 #
 
 DISTNAME=	tilp2-1.16
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tilp/}
 EXTRACT_SUFX=	.tar.bz2

comms/tn3270/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2011/12/26 03:11:10 joerg Exp $
+$NetBSD: distinfo,v 1.4 2015/01/09 14:28:42 joerg Exp $
 
 SHA1 (tn3270-0.20100116.tar.gz) = b550f2c240aa3b185b935c11ed36e75c8c574503
 RMD160 (tn3270-0.20100116.tar.gz) = 59ca2fcaa8f44258eb9cb0069cf17e560754f2c9
 Size (tn3270-0.20100116.tar.gz) = 156352 bytes
 SHA1 (patch-aa) = dfec3563624578dc775f4ec7d0ce813eb9431dce
+SHA1 (patch-tools_mkmake_mkmake.y) = e72636ac31a99247b871024665c055db0706b005

comms/tn3270/patches/patch-tools_mkmake_mkmake.y

@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_mkmake_mkmake.y,v 1.1 2015/01/09 14:28:42 joerg Exp $
+
+--- tools/mkmake/mkmake.y.orig	2015-01-09 12:31:43.000000000 +0000
++++ tools/mkmake/mkmake.y
+@@ -40,6 +40,7 @@ __RCSID("$NetBSD: mkmake.y,v 1.1.1.1 201
+ #endif
+ #endif /* not lint */
+ #endif
++#include <stdlib.h>
+ 
+ typedef struct string {
+     int