- Update to 1.3.0.1

PR:		ports/117201
Submitted by:	Balwinder S Dheeman <bdheeman@gmail.com> (maintainer)

8 files changed, 150 insertions, 65 deletions

diff --git a/net/yate-devel/Makefile b/net/yate-devel/Makefile
index 4710e5e76459..282cad438d67 100644
--- a/net/yate-devel/Makefile
+++ b/net/yate-devel/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for:	yate
 # Date created:		2006-12-11
-# Whom:			Balwinder S "bsd" Dheeman <bdheeman@hotmail.com>
+# Whom:			Balwinder S "bsd" Dheeman <bdheeman@gmail.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	yate
-DISTVERSION=	1.2.0.p4
-PORTREVISION=	1
+PORTVERSION=	1.3.0.p2
+DISTVERSION=	${PORTVERSION:S/.p/-/}
 CATEGORIES=	net comms
 MASTER_SITES=	http://cto.homelinux.net/pub/FreeBSD/ports/distfiles/ \
-		http://yate.null.ro/tarballs/yate1/
+		${MASTER_SITE_LOCAL}
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${DISTVERSION:S/.p/-/}
 
-MAINTAINER=	bdheeman@hotmail.com
+MAINTAINER=	bdheeman@gmail.com
 COMMENT=	Yet Another Telephony Engine
 
 LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
@@ -50,9 +49,10 @@ OPTIONS=	X11 "Build GUI client; yate-gtk2" on \
 DOCSDIR=	${LOCALBASE}/share/doc/yate
 PORTDOCS=	${DOCSDIR}/*
 PLIST_SUB=	BRISTUFF="@comment "
+PLIST_SUB+=	VERSION=${PORTVERSION:S/.p2//}
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	yate.sh
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.2.0
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.p2//}
 
 .include <bsd.port.pre.mk>
 
@@ -134,11 +134,12 @@ pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/yate
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/yate
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/yate
-	${INSTALL_DATA} ${FILESDIR}/README.too ${PREFIX}/share/doc/yate
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} files/README.too ${DOCSDIR}
+	@cd ${PREFIX}/etc/${PORTNAME}; for cfg in *.sample; do test -f $${cfg%%.sample} || cp -p $${cfg} $${cfg%%.sample}; done
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/yate-devel/distinfo b/net/yate-devel/distinfo
index 092a514c2c10..27327f8973e0 100644
--- a/net/yate-devel/distinfo
+++ b/net/yate-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (yate-1.2.0-4.tar.bz2) = 7200c892f0d49f80e7f16c191538cd98
-SHA256 (yate-1.2.0-4.tar.bz2) = 151394baaa7cbf12f336bcbeafe40dd7083f879698cbcd10a817c9fb4a1a1c0a
-SIZE (yate-1.2.0-4.tar.bz2) = 1255053
+MD5 (yate-1.3.0-2.tar.bz2) = de8e3ebd9010755db96b531f5b7bcdfc
+SHA256 (yate-1.3.0-2.tar.bz2) = 1eefadd895a2d7c5488ad754311424f182f8c45a36ce7da1f81181b7ed21472f
+SIZE (yate-1.3.0-2.tar.bz2) = 1259636
diff --git a/net/yate-devel/files/README.too b/net/yate-devel/files/README.too
index ae066f288a25..a4aae3c2e380 100644
--- a/net/yate-devel/files/README.too
+++ b/net/yate-devel/files/README.too
@@ -29,7 +29,7 @@ The Zaptel module can be installed using one of the following methods:
 	svn co --username svn --password svn https://svn.bluezbox.com/repos/zaptel-bsd
 
 The Asterisk application can be installed from ports collection:
-	# cd asterisk
+	# cd /usr/ports/net/asterisk
 	# make install
 
 
diff --git a/net/yate-devel/files/patch-conf.d_Makefile.in b/net/yate-devel/files/patch-conf.d_Makefile.in
new file mode 100644
index 000000000000..2082c5c89b27
--- /dev/null
+++ b/net/yate-devel/files/patch-conf.d_Makefile.in
@@ -0,0 +1,20 @@
+diff -Nur conf.d/Makefile.in.orig conf.d/Makefile.in
+--- conf.d/Makefile.in.orig	2007-01-17 17:19:15.000000000 +0000
++++ conf.d/Makefile.in	2007-10-13 14:45:19.000000000 +0000
+@@ -20,14 +20,14 @@
+ 	lst="`ls -1 @srcdir@/*.conf @srcdir@/*.sample @srcdir@/*.default @srcdir@/*.sql | sed 's/\.sample//g; s/\.default//g; s/[^ ]*\*\.[^ ]*//g' | sort | uniq`" ; \
+ 	for s in $$lst; do \
+ 	    d="$(DESTDIR)$(confdir)/`echo $$s | sed 's,.*/,,'`" ; \
+-	    if [ -f "$$d" ]; then \
++	    if [ -f "$$d".sample ]; then \
+ 		echo "Not overwriting existing $$d" ; \
+ 	    else \
+ 		if [ ! -f "$$s" ]; then \
+ 		    test -f "$$s.default" && s="$$s.default" ; \
+ 		    test -f "$$s.sample" && s="$$s.sample" ; \
+ 		fi ; \
+-		install -m 0644 "$$s" "$$d" ; \
++		install -m 0644 "$$s" "$$d".sample ; \
+ 	    fi ; \
+ 	done
+ 
diff --git a/net/yate-devel/files/patch-modules_Makefile_in b/net/yate-devel/files/patch-modules_Makefile_in
index f97657f60dc7..1d0a4b450a4d 100644
--- a/net/yate-devel/files/patch-modules_Makefile_in
+++ b/net/yate-devel/files/patch-modules_Makefile_in
@@ -1,5 +1,6 @@
---- modules/Makefile.in.orig	Tue Jul 24 07:13:54 2007
-+++ modules/Makefile.in	Sun Sep 23 22:16:11 2007
+diff -Naur modules/Makefile.in.orig modules/Makefile.in
+--- modules/Makefile.in.orig	2007-07-23 21:13:54.000000000 +0000
++++ modules/Makefile.in	2007-08-12 14:25:19.000000000 +0000
 @@ -11,7 +11,7 @@
  CXX := @CXX@ -Wall
  SED := sed
@@ -36,7 +37,7 @@
  ysigchan.yate wpcard.yate zapcard.yate: LOCALLIBS = -lyatess7
  
 -h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@
-+h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@ -L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib
++h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@ -L%%LOCALBASE%%/lib
  h323chan.yate: LOCALLIBS = @H323_LIB@
  
 -pgsqldb.yate: LOCALFLAGS = @PGSQL_INC@
@@ -48,7 +49,7 @@
  mysqldb.yate: LOCALLIBS = @MYSQL_LIB@
  
 -enumroute.yate: LOCALLIBS = -lresolv
-+enumroute.yate: LOCALLIBS = -L%%LOCALBASE%%/lib
++enumroute.yate: LOCALLIBS = -lc
  
  alsachan.yate: LOCALLIBS = -lasound
  
diff --git a/net/yate-devel/files/pkg-message.in b/net/yate-devel/files/pkg-message.in
index 2d8e89f9e663..6a0ce011d0a1 100644
--- a/net/yate-devel/files/pkg-message.in
+++ b/net/yate-devel/files/pkg-message.in
@@ -1,8 +1,11 @@
--------------------------------------------------------------------------------
+=========================================================================
 IMPORTANT! MAKE SURE TO READ THE FOLLOWING!
 
-To enable yate_enable="YES" in your /etc/rc.conf file.  It'll also start
-the yate sever automatically when the system is started.
+To start the YATE sever automatically when the system is started, append
+the following in your /etc/rc.conf file:
+
+yate_enable="YES"		# YATE iPBX/Softswitch server
+zaptel_enable="YES"		# If you're using Zaptel cards 
 
 To manually start the yate server run (as root):
 
@@ -13,9 +16,9 @@ To manually stop it:
 # %%PREFIX%%/etc/rc.d/yate stop
 
 Please note that it is still a "work in progress", so your bug reports
-are welcome and will help to improve quality of this software.
+are welcome and will help us improve quality of this software.
 
 NOTE: Please read %%PREFIX%%/shere/doc/yate/README.too on a version of
 Sangoma driver for FreeBSD OS that supports Asterisk/Zaptel interface
 (AFT-A101/A102/A104 cards Only)
--------------------------------------------------------------------------------
+=========================================================================
diff --git a/net/yate-devel/pkg-descr b/net/yate-devel/pkg-descr
index e14c66099dd3..3dc96a40be95 100644
--- a/net/yate-devel/pkg-descr
+++ b/net/yate-devel/pkg-descr
@@ -1,5 +1,6 @@
-Yate is a telephony engine aimed at creating a telephony server that 
-performs well enough to deal with PBX requirements and also flexible 
-enough for complex Gateway and IVR solutions. 
+The Yate is a telephony engine or softswitch aimed at creating a
+telephony server that performs well enough to deal with your PBX
+requirements and also flexible enough for complex Gateway and, or
+IVR solutions. 
 
 WWW: http://YATE.null.ro/
diff --git a/net/yate-devel/pkg-plist b/net/yate-devel/pkg-plist
index fbd9b6012e53..2d568f9886a1 100644
--- a/net/yate-devel/pkg-plist
+++ b/net/yate-devel/pkg-plist
@@ -1,34 +1,92 @@
+@comment $FreeBSD$
 %%WITH_X11%%bin/yate-gtk2
-etc/yate/accfile.conf
-etc/yate/callgen.conf
-etc/yate/cdrbuild.conf
-etc/yate/cdrfile.conf
-etc/yate/dbpbx.conf
-etc/yate/dsoundchan.conf
-etc/yate/enumroute.conf
-etc/yate/extmodule.conf
-etc/yate/gtk2client.conf
-etc/yate/h323chan.conf
-etc/yate/moh.conf
-etc/yate/mysqldb.conf
-etc/yate/pbxassist.conf
-etc/yate/pgsqldb.conf
-etc/yate/providers.conf
-etc/yate/regexroute.conf
-etc/yate/regfile.conf
-etc/yate/register.conf
-etc/yate/rmanager.conf
-etc/yate/sipfeatures.conf
-etc/yate/wpchan.conf
-etc/yate/yate-gtk2.conf
-etc/yate/yate.conf
-etc/yate/yiaxchan.conf
-etc/yate/yjinglechan.conf
-etc/yate/yradius.conf
-etc/yate/yrtpchan.conf
-etc/yate/ysipchan.conf
-etc/yate/ystunchan.conf
-etc/yate/zapchan.conf
+@unexec if cmp -s %D/etc/yate/accfile.conf.sample %D/etc/yate/accfile.conf; then rm -f %D/etc/yate/accfile.conf; fi
+etc/yate/accfile.conf.sample
+@exec if [ ! -f %D/etc/yate/accfile.conf ]; then cp -p %D/%F %B/accfile.conf; fi
+@unexec if cmp -s %D/etc/yate/callgen.conf.sample %D/etc/yate/callgen.conf; then rm -f %D/etc/yate/callgen.conf; fi
+etc/yate/callgen.conf.sample
+@exec if [ ! -f %D/etc/yate/callgen.conf ]; then cp -p %D/%F %B/callgen.conf; fi
+@unexec if cmp -s %D/etc/yate/cdrbuild.conf.sample %D/etc/yate/cdrbuild.conf; then rm -f %D/etc/yate/cdrbuild.conf; fi
+etc/yate/cdrbuild.conf.sample
+@exec if [ ! -f %D/etc/yate/cdrbuild.conf ]; then cp -p %D/%F %B/cdrbuild.conf; fi
+@unexec if cmp -s %D/etc/yate/cdrfile.conf.sample %D/etc/yate/cdrfile.conf; then rm -f %D/etc/yate/cdrfile.conf; fi
+etc/yate/cdrfile.conf.sample
+@exec if [ ! -f %D/etc/yate/cdrfile.conf ]; then cp -p %D/%F %B/cdrfile.conf; fi
+@unexec if cmp -s %D/etc/yate/dbpbx.conf.sample %D/etc/yate/dbpbx.conf; then rm -f %D/etc/yate/dbpbx.conf; fi
+etc/yate/dbpbx.conf.sample
+@exec if [ ! -f %D/etc/yate/dbpbx.conf ]; then cp -p %D/%F %B/dbpbx.conf; fi
+@unexec if cmp -s %D/etc/yate/dsoundchan.conf.sample %D/etc/yate/dsoundchan.conf; then rm -f %D/etc/yate/dsoundchan.conf; fi
+etc/yate/dsoundchan.conf.sample
+@exec if [ ! -f %D/etc/yate/dsoundchan.conf ]; then cp -p %D/%F %B/dsoundchan.conf; fi
+@unexec if cmp -s %D/etc/yate/enumroute.conf.sample %D/etc/yate/enumroute.conf; then rm -f %D/etc/yate/enumroute.conf; fi
+etc/yate/enumroute.conf.sample
+@exec if [ ! -f %D/etc/yate/enumroute.conf ]; then cp -p %D/%F %B/enumroute.conf; fi
+@unexec if cmp -s %D/etc/yate/extmodule.conf.sample %D/etc/yate/extmodule.conf; then rm -f %D/etc/yate/extmodule.conf; fi
+etc/yate/extmodule.conf.sample
+@exec if [ ! -f %D/etc/yate/extmodule.conf ]; then cp -p %D/%F %B/extmodule.conf; fi
+@unexec if cmp -s %D/etc/yate/h323chan.conf.sample %D/etc/yate/h323chan.conf; then rm -f %D/etc/yate/h323chan.conf; fi
+etc/yate/h323chan.conf.sample
+@exec if [ ! -f %D/etc/yate/h323chan.conf ]; then cp -p %D/%F %B/h323chan.conf; fi
+@unexec if cmp -s %D/etc/yate/moh.conf.sample %D/etc/yate/moh.conf; then rm -f %D/etc/yate/moh.conf; fi
+etc/yate/moh.conf.sample
+@exec if [ ! -f %D/etc/yate/moh.conf ]; then cp -p %D/%F %B/moh.conf; fi
+@unexec if cmp -s %D/etc/yate/mysqldb.conf.sample %D/etc/yate/mysqldb.conf; then rm -f %D/etc/yate/mysqldb.conf; fi
+etc/yate/mysqldb.conf.sample
+@exec if [ ! -f %D/etc/yate/mysqldb.conf ]; then cp -p %D/%F %B/mysqldb.conf; fi
+@unexec if cmp -s %D/etc/yate/pbxassist.conf.sample %D/etc/yate/pbxassist.conf; then rm -f %D/etc/yate/pbxassist.conf; fi
+etc/yate/pbxassist.conf.sample
+@exec if [ ! -f %D/etc/yate/pbxassist.conf ]; then cp -p %D/%F %B/pbxassist.conf; fi
+@unexec if cmp -s %D/etc/yate/pgsqldb.conf.sample %D/etc/yate/pgsqldb.conf; then rm -f %D/etc/yate/pgsqldb.conf; fi
+etc/yate/pgsqldb.conf.sample
+@exec if [ ! -f %D/etc/yate/pgsqldb.conf ]; then cp -p %D/%F %B/pgsqldb.conf; fi
+@unexec if cmp -s %D/etc/yate/providers.conf.sample %D/etc/yate/providers.conf; then rm -f %D/etc/yate/providers.conf; fi
+etc/yate/providers.conf.sample
+@exec if [ ! -f %D/etc/yate/providers.conf ]; then cp -p %D/%F %B/providers.conf; fi
+@unexec if cmp -s %D/etc/yate/regexroute.conf.sample %D/etc/yate/regexroute.conf; then rm -f %D/etc/yate/regexroute.conf; fi
+etc/yate/regexroute.conf.sample
+@exec if [ ! -f %D/etc/yate/regexroute.conf ]; then cp -p %D/%F %B/regexroute.conf; fi
+@unexec if cmp -s %D/etc/yate/regfile.conf.sample %D/etc/yate/regfile.conf; then rm -f %D/etc/yate/regfile.conf; fi
+etc/yate/regfile.conf.sample
+@exec if [ ! -f %D/etc/yate/regfile.conf ]; then cp -p %D/%F %B/regfile.conf; fi
+@unexec if cmp -s %D/etc/yate/register.conf.sample %D/etc/yate/register.conf; then rm -f %D/etc/yate/register.conf; fi
+etc/yate/register.conf.sample
+@exec if [ ! -f %D/etc/yate/register.conf ]; then cp -p %D/%F %B/register.conf; fi
+@unexec if cmp -s %D/etc/yate/rmanager.conf.sample %D/etc/yate/rmanager.conf; then rm -f %D/etc/yate/rmanager.conf; fi
+etc/yate/rmanager.conf.sample
+@exec if [ ! -f %D/etc/yate/rmanager.conf ]; then cp -p %D/%F %B/rmanager.conf; fi
+@unexec if cmp -s %D/etc/yate/sipfeatures.conf.sample %D/etc/yate/sipfeatures.conf; then rm -f %D/etc/yate/sipfeatures.conf; fi
+etc/yate/sipfeatures.conf.sample
+@exec if [ ! -f %D/etc/yate/sipfeatures.conf ]; then cp -p %D/%F %B/sipfeatures.conf; fi
+@unexec if cmp -s %D/etc/yate/wpchan.conf.sample %D/etc/yate/wpchan.conf; then rm -f %D/etc/yate/wpchan.conf; fi
+etc/yate/wpchan.conf.sample
+@exec if [ ! -f %D/etc/yate/wpchan.conf ]; then cp -p %D/%F %B/wpchan.conf; fi
+@unexec if cmp -s %D/etc/yate/yate-gtk2.conf.sample %D/etc/yate/yate-gtk2.conf; then rm -f %D/etc/yate/yate-gtk2.conf; fi
+etc/yate/yate-gtk2.conf.sample
+@exec if [ ! -f %D/etc/yate/yate-gtk2.conf ]; then cp -p %D/%F %B/yate-gtk2.conf; fi
+@unexec if cmp -s %D/etc/yate/yate.conf.sample %D/etc/yate/yate.conf; then rm -f %D/etc/yate/yate.conf; fi
+etc/yate/yate.conf.sample
+@exec if [ ! -f %D/etc/yate/yate.conf ]; then cp -p %D/%F %B/yate.conf; fi
+@unexec if cmp -s %D/etc/yate/yiaxchan.conf.sample %D/etc/yate/yiaxchan.conf; then rm -f %D/etc/yate/yiaxchan.conf; fi
+etc/yate/yiaxchan.conf.sample
+@exec if [ ! -f %D/etc/yate/yiaxchan.conf ]; then cp -p %D/%F %B/yiaxchan.conf; fi
+@unexec if cmp -s %D/etc/yate/yjinglechan.conf.sample %D/etc/yate/yjinglechan.conf; then rm -f %D/etc/yate/yjinglechan.conf; fi
+etc/yate/yjinglechan.conf.sample
+@exec if [ ! -f %D/etc/yate/yjinglechan.conf ]; then cp -p %D/%F %B/yjinglechan.conf; fi
+@unexec if cmp -s %D/etc/yate/yradius.conf.sample %D/etc/yate/yradius.conf; then rm -f %D/etc/yate/yradius.conf; fi
+etc/yate/yradius.conf.sample
+@exec if [ ! -f %D/etc/yate/yradius.conf ]; then cp -p %D/%F %B/yradius.conf; fi
+@unexec if cmp -s %D/etc/yate/yrtpchan.conf.sample %D/etc/yate/yrtpchan.conf; then rm -f %D/etc/yate/yrtpchan.conf; fi
+etc/yate/yrtpchan.conf.sample
+@exec if [ ! -f %D/etc/yate/yrtpchan.conf ]; then cp -p %D/%F %B/yrtpchan.conf; fi
+@unexec if cmp -s %D/etc/yate/ysipchan.conf.sample %D/etc/yate/ysipchan.conf; then rm -f %D/etc/yate/ysipchan.conf; fi
+etc/yate/ysipchan.conf.sample
+@exec if [ ! -f %D/etc/yate/ysipchan.conf ]; then cp -p %D/%F %B/ysipchan.conf; fi
+@unexec if cmp -s %D/etc/yate/ystunchan.conf.sample %D/etc/yate/ystunchan.conf; then rm -f %D/etc/yate/ystunchan.conf; fi
+etc/yate/ystunchan.conf.sample
+@exec if [ ! -f %D/etc/yate/ystunchan.conf ]; then cp -p %D/%F %B/ystunchan.conf; fi
+@unexec if cmp -s %D/etc/yate/zapchan.conf.sample %D/etc/yate/zapchan.conf; then rm -f %D/etc/yate/zapchan.conf; fi
+etc/yate/zapchan.conf.sample
+@exec if [ ! -f %D/etc/yate/zapchan.conf ]; then cp -p %D/%F %B/zapchan.conf; fi
 include/yate/yatecbase.h
 include/yate/yateclass.h
 include/yate/yatemime.h
@@ -36,9 +94,8 @@ include/yate/yatengine.h
 include/yate/yatephone.h
 include/yate/yateversn.h
 lib/libyate.so
-lib/libyate.so.1.2.0
+lib/libyate.so.%%VERSION%%
 %%WITH_X11%%lib/menu/yate-gtk2.menu
-libdata/pkgconfig/yate.pc
 lib/yate/modules/help/0.yhlp
 lib/yate/modules/help/1.yhlp
 lib/yate/modules/help/2.yhlp
@@ -111,6 +168,7 @@ lib/yate/scripts/libyate.py
 lib/yate/scripts/libyatechan.php
 lib/yate/scripts/route.php
 lib/yate/scripts/voicemail.php
+libdata/pkgconfig/yate.pc
 sbin/yate
 sbin/yate-config
 %%WITH_X11%%share/applications/yate-gtk2.desktop
@@ -118,8 +176,9 @@ share/doc/yate/COPYING
 share/doc/yate/ChangeLog
 share/doc/yate/README
 share/doc/yate/README.too
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX
+@dirrmtry etc/yate
+@dirrm include/yate
+%%WITH_X11%%@dirrmtry lib/menu
 @dirrm lib/yate/scripts
 @dirrm lib/yate/modules/skin/tabbed
 @dirrm lib/yate/modules/skin/default
@@ -127,6 +186,6 @@ share/doc/yate/README.too
 @dirrm lib/yate/modules/help
 @dirrm lib/yate/modules
 @dirrm lib/yate
-%%WITH_X11%%@dirrm lib/menu
-@dirrm include/yate
-@dirrm etc/yate
+%%WITH_X11%%@dirrmtry share/applications
+@dirrmtry share/nls/en_US.US-ASCII
+@dirrmtry share/nls/POSIX