Attachment 114578 Details for Bug 156248 – yate4.diff

[patch] yate4.diff

yate4.diff (text/plain; x-mac-type="0"; x-mac-creator="0"), 9.42 KB, created by Florian Smeets on 2011-04-10 19:56:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Smeets

Created: 2011-04-10 19:56:40 UTC

Size: 9.42 KB

patch

obsolete

>diff -ruN /usr/ports/net/yate/Makefile ../yate/Makefile
>--- /usr/ports/net/yate/Makefile	2011-04-09 13:41:11.050065049 +0200
>+++ ../yate/Makefile	2011-04-10 19:13:32.000000000 +0200
>@@ -14,8 +14,7 @@
> COMMENT=	Yet Another Telephony Engine
> 
> LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
>-		speex.1:${PORTSDIR}/audio/speex \
>-		ssl.7:${PORTSDIR}/security/openssl
>+		speex.1:${PORTSDIR}/audio/speex
> 
> ONLY_FOR_ARCHS=	i386 amd64 sparc64
> 
>@@ -29,8 +28,6 @@
> WRKSRC=		${WRKDIR}/yate
> 
> CONFIGURE_ARGS=	--without-fdsize \
>-		--mandir=${LOCALBASE}/man \
>-		--with-openssl \
> 		--with-zlib=/usr
> 
> CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
>@@ -44,21 +41,18 @@
> 
> MAN8=		yate-config.8 yate.8
> 
>-OPTIONS=	\
>-		MYSQL "MySQL Database support" off \
>+OPTIONS=	MYSQL "MySQL Database support" off \
> 		PGSQL "PostgreSQL Database support" off \
> 		SPANDSP "Enable Spandsp faxing support" off \
> 		DAHDI "Dahdi driver" off \
>-		H323 "H323 software channel/protocol support" off
>+		H323 "H323 software channel/protocol support" off \
>+		SSL "Enable SSL support" off
> 
>-DOCSDIR=	${LOCALBASE}/share/doc/yate
>-PLIST_SUB=	BRISTUFF="@comment "
>-PLIST_SUB+=	VERSION=${PORTVERSION:S/.p2//}
> SUB_FILES=	pkg-message
> USE_RC_SUBR=	yate.sh
> 
>-#USERS= yate
>-#GROUPS= yate
>+USERS=	yate
>+GROUPS=	yate
> 
> .include <bsd.port.pre.mk>
> 
>@@ -110,14 +104,22 @@
> PLIST_SUB+=	WITH_H323="@comment "
> .endif
> 
>-pre-install:
>-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>+.if !defined(WITHOUT_SSL)
>+CONFIGURE_ARGS+=	--with-openssl
>+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
>+LIB_DEPENDS+=	ssl.7:${PORTSDIR}/security/openssl
>+MAKE_ENV+=	WITH_SSL=1
>+PLIST_SUB+=	WITH_SSL=""
>+.else
>+CONFIGURE_ARGS+=	--without-openssl
>+PLIST_SUB+=	WITH_SSL="@comment "
>+.endif
>+
>+.if defined(NOPORTDOCS)
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-noportdocs
>+.endif
> 
> post-install:
>-	@${MKDIR} ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
> 	@cd ${PREFIX}/etc/${PORTNAME}; \
> 	    for cfg in *.sample; do \
> 		test -f $${cfg%%.sample} || ${CP} -p $${cfg} $${cfg%%.sample}; \
>diff -ruN /usr/ports/net/yate/files/extra-patch-noportdocs ../yate/files/extra-patch-noportdocs
>--- /usr/ports/net/yate/files/extra-patch-noportdocs	1970-01-01 01:00:00.000000000 +0100
>+++ ../yate/files/extra-patch-noportdocs	2011-04-10 18:49:23.000000000 +0200
>@@ -0,0 +1,13 @@
>+--- Makefile.in.orig	2011-03-18 20:46:29.000000000 +0100
>++++ Makefile.in	2011-04-10 18:48:55.000000000 +0200
>+@@ -228,10 +228,6 @@
>+ 	done
>+ 	@for i in $(GENS) ; do \
>+ 	    install -m 0644 $$i "$(DESTDIR)$(incdir)/" ; \
>+-	done
>+-	@mkdir -p "$(DESTDIR)$(docdir)/api/" && \
>+-	for i in $(DOCS) ; do \
>+-	    install -m 0644 @srcdir@/$$i "$(DESTDIR)$(docdir)/" ; \
>+ 	done ;
>+ 
>+ install-api: $(APIDOCS)
>diff -ruN /usr/ports/net/yate/files/patch-Makefile.in ../yate/files/patch-Makefile.in
>--- /usr/ports/net/yate/files/patch-Makefile.in	2011-04-09 13:41:10.988717602 +0200
>+++ ../yate/files/patch-Makefile.in	2011-04-10 11:44:18.000000000 +0200
>@@ -1,5 +1,5 @@
>---- ./Makefile.in.orig	2011-03-18 22:46:29.000000000 +0300
>-+++ ./Makefile.in	2011-04-07 12:45:40.000000000 +0400
>+--- Makefile.in.orig	2011-03-18 20:46:29.000000000 +0100
>++++ Makefile.in	2011-04-10 11:43:47.000000000 +0200
> @@ -20,7 +20,7 @@
>  MKDEPS := ./config.status
>  PROGS:= yate
>@@ -9,6 +9,15 @@
>  	libyatesig.so.@PACKAGE_VERSION@ libyatesig.so \
>  	libyatemgcp.so.@PACKAGE_VERSION@ libyatemgcp.so \
>  	libyatejabber.so.@PACKAGE_VERSION@ libyatejabber.so
>+@@ -47,7 +47,7 @@
>+ libdir = @libdir@
>+ incdir = @includedir@/yate
>+ mandir = @mandir@
>+-docdir = @datadir@/doc/yate-@PACKAGE_VERSION@
>++docdir = @datadir@/doc/yate
>+ vardir = @localstatedir@/lib/yate
>+ moddir = @libdir@/yate
>+ shrdir = $(datadir)/yate
> @@ -221,7 +221,7 @@
>  	    install -m 0644 @srcdir@/docs/man/$$i "$(DESTDIR)$(mandir)/man8/" ; \
>  	done
>diff -ruN /usr/ports/net/yate/files/yate.sh.in ../yate/files/yate.sh.in
>--- /usr/ports/net/yate/files/yate.sh.in	2011-04-09 13:41:11.039817520 +0200
>+++ ../yate/files/yate.sh.in	2011-04-10 13:23:42.000000000 +0200
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD: ports/net/yate-devel/files/yate.sh.in,v 1.2 2010/03/27 00:14:13 dougb Exp $
>+# $FreeBSD$
> #
> # PROVIDE: yate
> # REQUIRE: DAEMON
>@@ -16,7 +16,7 @@
> name=yate
> rcvar=`set_rcvar`
> 
>-command="%%PREFIX%%/sbin/yate"
>+command="%%PREFIX%%/bin/yate"
> pidfile="/var/run/${name}.pid"
> logfile="/var/log/yate/messages"
> cdrfile=`awk -F= '/^file=.+/ {print $2}' %%PREFIX%%/etc/yate/cdrfile.conf`
>@@ -29,6 +29,7 @@
>     mkdir -p $(dirname $pidfile)
>     chown yate:yate $(dirname $pidfile)
>     mkdir -p $(dirname $cdrfile)
>+    mkdir -p $(dirname $logfile)
>     chown yate:yate $(dirname $cdrfile)
>     chown yate:yate $(dirname $logfile)
> }
>diff -ruN /usr/ports/net/yate/pkg-descr ../yate/pkg-descr
>--- /usr/ports/net/yate/pkg-descr	2011-04-09 13:41:11.102716818 +0200
>+++ ../yate/pkg-descr	2011-04-09 13:48:03.000000000 +0200
>@@ -7,36 +7,6 @@
> maximizing communications efficiency and minimizing infrastructure
> costs for businesses.
> 
>-Yate can be used as a:
>-* VoIP server
>-* VoIP client
>-* Conference server - with up to 200 channels in a single conference
>-* VoIP to PSTN gateway
>-* PC2Phone and Phone2PC gateway
>-* IP Telephony server and/or client
>-    H.323 gatekeeper
>-    H.323 multiple endpoint server
>-    H.323<->SIP Proxy
>-    SIP session border controller
>-    SIP router
>-    SIP registration server
>-    IAX server and/or client
>-    Jingle client or server
>-    MGCP server (Call Agent)
>-* ISDN passive and active recorder
>-* ISDN, RBS, analog passive recorder
>-* SS7 switch
>-* Call center server
>-* IVR engine
>-* Prepaid and/or postpaid cards system
>-
>-The software is written in C++ and it supports scripting in various
>-programming languages (such as those supported by the currently
>-implemented PHP, Python and Perl libraries) and even any Unix shell.
>-The PHP, Python and Perl libraries have been developed and made
>-available in order to ease development of external functionalities
>-for Yate.
>-
> Yate is production-ready software and is easily extensible.
> Yate is licensed under the GPL.
> 
>diff -ruN /usr/ports/net/yate/pkg-install ../yate/pkg-install
>--- /usr/ports/net/yate/pkg-install	2011-04-09 13:41:11.092538850 +0200
>+++ ../yate/pkg-install	1970-01-01 01:00:00.000000000 +0100
>@@ -1,34 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD$
>-
>-if [ "$2" != "PRE-INSTALL" ]; then
>-	exit 0
>-fi
>-
>-YATE_USER=yate
>-YATE_GROUP=${YATE_USER}
>-YATE_UID=204
>-YATE_GID=${YATE_UID}
>-
>-if ! pw groupshow "${YATE_GROUP}" 2>/dev/null 1>&2; then
>-	if pw groupadd ${YATE_GROUP} -g ${YATE_GID}; then
>-		echo "Added group \"${YATE_GROUP}\"."
>-	else
>-		echo "Adding group \"${YATE_GROUP}\" failed..."
>-		exit 1
>-	fi
>-fi
>-
>-if ! pw usershow "${YATE_USER}" 2>/dev/null 1>&2; then
>-	if pw useradd ${YATE_USER} -u ${YATE_UID} -g ${YATE_GROUP} -h - \
>-		-s "/sbin/nologin" -d "/nonexistent" \
>-		-c "Yate Telephoney Server"; \
>-	then
>-		echo "Added user \"${YATE_USER}\"."
>-	else
>-		echo "Adding user \"${YATE_USER}\" failed..."
>-		exit 1
>-	fi
>-fi
>-
>-exit 0
>diff -ruN /usr/ports/net/yate/pkg-plist ../yate/pkg-plist
>--- /usr/ports/net/yate/pkg-plist	2011-04-09 13:41:11.079722316 +0200
>+++ ../yate/pkg-plist	2011-04-10 18:42:51.000000000 +0200
>@@ -213,7 +213,7 @@
> lib/yate/moh.yate
> lib/yate/msgsniff.yate
> lib/yate/mux.yate
>-lib/yate/openssl.yate
>+%%WITH_SSL%%lib/yate/openssl.yate
> lib/yate/pbx.yate
> lib/yate/regexroute.yate
> lib/yate/rmanager.yate
>@@ -264,13 +264,13 @@
> lib/yate/ystunchan.yate
> lib/yate/zlibcompress.yate
> libdata/pkgconfig/yate.pc
>-%%PORTDOCS%%%%DOCSDIR%%-3.3.0/COPYING
>-%%PORTDOCS%%%%DOCSDIR%%-3.3.0/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%-3.3.0/README
>-%%PORTDOCS%%%%DOCSDIR%%-3.3.0/dataflow.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.3.0/extmodule.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.3.0/index.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.3.0/messages.html
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/dataflow.html
>+%%PORTDOCS%%%%DOCSDIR%%/extmodule.html
>+%%PORTDOCS%%%%DOCSDIR%%/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/messages.html
> %%DATADIR%%/data/NULL-TEAM-MIB.txt
> %%DATADIR%%/data/YATE-MIB.txt
> %%DATADIR%%/data/snmp_mib.conf
>@@ -454,8 +454,8 @@
> @dirrm %%DATADIR%%/help
> @dirrm %%DATADIR%%/data
> @dirrm %%DATADIR%%
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.3.0/api
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.3.0
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm lib/yate/sip
> @dirrm lib/yate/server
> @dirrm lib/yate/qt4
>@@ -465,6 +465,6 @@
> @dirrm lib/pkgconfig
> @dirrm include/yate
> @dirrm %%ETCDIR%%
>-%%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%-3.3.0/api
>+%%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%/api
> @exec mkdir -p %D/lib/yate/qt4
> @exec mkdir -p %D/lib/pkgconfig
>Index: UIDs
>===================================================================
>RCS file: /home/flo/dev/cvs/ports/UIDs,v
>retrieving revision 1.146
>diff -u -r1.146 UIDs
>--- UIDs	3 Apr 2011 11:22:59 -0000	1.146
>+++ UIDs	10 Apr 2011 17:19:57 -0000
>@@ -200,3 +200,4 @@
> vdr:*:938:938::0:0:vdr user:/nonexistent:/usr/sbin/nologin
> noip:*:939:939::0:0:noip user:/nonexistent:/usr/sbin/nologin
> _tcpproxy:*:940:940::0:0:tcpproxy user:/nonexistent:/usr/sbin/nologin
>+yate:*:941:941::0:0:yate user:/nonexistent:/usr/sbin/nologin
>Index: GIDs
>===================================================================
>RCS file: /home/flo/dev/cvs/ports/GIDs,v
>retrieving revision 1.132
>diff -u -r1.132 GIDs
>--- GIDs	3 Apr 2011 11:22:59 -0000	1.132
>+++ GIDs	10 Apr 2011 17:19:40 -0000
>@@ -192,3 +192,4 @@
> vdr:*:938:
> noip:*:939:
> _tcpproxy:*:940:
>+yate:*:941:

Actions: View | Diff

Attachments on bug 156248: 114575 | 114576 | 114577 | 114578 | 114579 | 114580