Date: Fri, 26 Oct 2007 06:30:03 GMT From: Mayo Jordanov <mayo@oyam.ca> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/117475: [maintainer update] updated net/asterisk-app-notify that works with Asterisk 1.4 Message-ID: <200710260630.l9Q6U3I6000716@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/117475; it has been noted by GNATS. From: Mayo Jordanov <mayo@oyam.ca> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/117475: [maintainer update] updated net/asterisk-app-notify that works with Asterisk 1.4 Date: Thu, 25 Oct 2007 23:20:48 -0700 --Apple-Mail-11-324083654 Content-Type: multipart/mixed; boundary=Apple-Mail-10-324083543 --Apple-Mail-10-324083543 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed I'm really sorry about this ... this is really the last one. This patch is identical to the previous patch, but without the unnecessary stuff (package file, work dir, etc) thanks, mayo --Apple-Mail-10-324083543 Content-Transfer-Encoding: 7bit Content-Type: text/plain; x-unix-mode=0644; name=asterisk-app-notify.txt Content-Disposition: attachment; filename=asterisk-app-notify.txt diff -ruN asterisk-app-notify.orig/Makefile asterisk-app-notify/Makefile --- asterisk-app-notify.orig/Makefile Wed Apr 11 20:09:24 2007 +++ asterisk-app-notify/Makefile Thu Oct 25 22:26:02 2007 @@ -2,12 +2,11 @@ # Date created: 23 March 2007 # Whom: mayo # -# $FreeBSD: ports/net/asterisk-app-notify/Makefile,v 1.2 2007/04/12 03:09:24 sobomax Exp $ +# $FreeBSD$ # PORTNAME= app_notify -PORTVERSION= 1.0 -PORTREVISION= 1 +DISTVERSION= 2.0rc1 CATEGORIES= net MASTER_SITES= http://www.mezzo.net/asterisk/ \ http://static.oyam.ca/freebsd/ports/ @@ -16,20 +15,15 @@ MAINTAINER= mayo@oyam.ca COMMENT= Notify application module for the Asterisk PBX -BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk12 -RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk12 +BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk +RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk USE_GMAKE= yes -ASTETCDIR= ${PREFIX}/etc/asterisk - -pre-install: - ${MKDIR} ${ASTETCDIR} +#pre-install: +# ${MKDIR} ${ASTETCDIR} post-install: - @if [ ! -f ${ASTETCDIR}/dialer_extensions.conf ]; then \ - ${CP} -p ${ASTETCDIR}/dialer_extensions.conf.sample ${ASTETCDIR}/dialer_extensions.conf ; \ - fi @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN asterisk-app-notify.orig/distinfo asterisk-app-notify/distinfo --- asterisk-app-notify.orig/distinfo Sun Mar 25 13:48:09 2007 +++ asterisk-app-notify/distinfo Wed Oct 24 23:39:33 2007 @@ -1,3 +1,3 @@ -MD5 (app_notify-1.0.tgz) = a2f4bf2b6f306c0a60086e98265571a3 -SHA256 (app_notify-1.0.tgz) = 84d219c9ad2eed6c19a35e491f631428bd367cce4e736d973c762380378c29c0 -SIZE (app_notify-1.0.tgz) = 3839 +MD5 (app_notify-2.0rc1.tgz) = 0522cc76705bd11e943f309ae5c4a03f +SHA256 (app_notify-2.0rc1.tgz) = b3eb3a7b1f567c9bb0d44406d3425de3062194411d0559f2c9c547926e3ad0cf +SIZE (app_notify-2.0rc1.tgz) = 4053 diff -ruN asterisk-app-notify.orig/files/patch-Makefile asterisk-app-notify/files/patch-Makefile --- asterisk-app-notify.orig/files/patch-Makefile Sun Mar 25 13:48:09 2007 +++ asterisk-app-notify/files/patch-Makefile Thu Oct 25 00:05:23 2007 @@ -1,33 +1,27 @@ ---- Makefile.orig Fri Mar 23 21:14:57 2007 -+++ Makefile Sat Mar 24 00:09:09 2007 -@@ -9,7 +9,7 @@ - NAME=app_notify - CONF=dialer_extensions.conf +--- Makefile.orig Thu Feb 1 04:08:39 2007 ++++ Makefile Thu Oct 25 00:05:18 2007 +@@ -7,6 +7,7 @@ + # --CFLAGS=-g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC -+CFLAGS+= -g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC -I$(LOCALBASE)/include - LIBS= - RES=$(NAME).so + NAME=app_notify ++CONF=extensions_dialer.conf -@@ -19,7 +19,7 @@ - SOLINK=-shared -Xlinker -x + CC=gcc + CFLAGS=$(shell ./cflags.sh) +@@ -21,7 +22,7 @@ + CC=gcc -arch ppc -arch i386 + else + SOLINK=-shared -Xlinker -x +- MODULES_DIR=/usr/lib/asterisk/modules ++ MODULES_DIR=$(LOCALBASE)/lib/asterisk/modules endif --MODULES_DIR=/usr/lib/asterisk/modules -+MODULES_DIR=$(PREFIX)/lib/asterisk/modules - - app_notify.so : app_notify.o - $(CC) $(SOLINK) -o $@ $< -@@ -30,10 +30,9 @@ + RES=$(NAME).so +@@ -35,6 +36,7 @@ rm -f $(NAME).o $(NAME).so notifyClient.o notifyClient sampleClient install: all -- if ! [ -f /etc/asterisk/$(CONF) ]; then \ -- install -m 644 $(CONF).sample /etc/asterisk/$(CONF) ; \ -- fi -+ install -m 644 $(CONF).sample $(PREFIX)/etc/asterisk/$(CONF).sample ; \ ++ install -m 644 $(CONF).sample $(LOCALBASE)/etc/asterisk/$(CONF).sample ; \ if [ -f $(NAME).so ]; then \ -+ mkdir -p $(MODULES_DIR) ; \ install -m 755 $(NAME).so $(MODULES_DIR) ; \ fi - diff -ruN asterisk-app-notify.orig/files/patch-cflags.sh asterisk-app-notify/files/patch-cflags.sh --- asterisk-app-notify.orig/files/patch-cflags.sh Wed Dec 31 16:00:00 1969 +++ asterisk-app-notify/files/patch-cflags.sh Wed Oct 24 23:38:54 2007 @@ -0,0 +1,12 @@ +--- cflags.sh.orig Wed Oct 24 23:37:00 2007 ++++ cflags.sh Wed Oct 24 23:31:46 2007 +@@ -8,7 +8,8 @@ + INCDIR=/Library/Asterisk/include + CFLAGS="${CFLAGS} -I/Library/Asterisk/include" + else +- INCDIR=/usr/include ++ INCDIR=${LOCALBASE}/include ++ CFLAGS="${CFLAGS} -I${INCDIR}" + fi + + CHANNEL_H=${INCDIR}/asterisk/channel.h diff -ruN asterisk-app-notify.orig/pkg-message asterisk-app-notify/pkg-message --- asterisk-app-notify.orig/pkg-message Sun Mar 25 13:48:09 2007 +++ asterisk-app-notify/pkg-message Thu Oct 25 00:45:07 2007 @@ -3,12 +3,12 @@ a) If this is a new install, restart Asterisk or activate the module by running: - # asterisk -rx "load app_notify" + # asterisk -rx "module load app_notify" b) If this is an upgrade, you can restart Asterisk or reload the module by running: - # asterisk -rx "unload app_notify" - # asterisk -rx "load app_notify" + # asterisk -rx "module unload app_notify" + # asterisk -rx "module load app_notify" ***************************************************************************** diff -ruN asterisk-app-notify.orig/pkg-plist asterisk-app-notify/pkg-plist --- asterisk-app-notify.orig/pkg-plist Sun Mar 25 13:48:09 2007 +++ asterisk-app-notify/pkg-plist Thu Oct 25 22:35:17 2007 @@ -1,7 +1,2 @@ -@unexec if cmp -s %D/etc/asterisk/dialer_extensions.conf.sample %D/etc/asterisk/dialer_extensions.conf; then rm -f %D/etc/asterisk/dialer_extensions.conf; fi -etc/asterisk/dialer_extensions.conf.sample -@exec if [ ! -f %D/etc/asterisk/dialer_extensions.conf ] ; then cp -p %D/%F %B/dialer_extensions.conf; fi +etc/asterisk/extensions_dialer.conf.sample lib/asterisk/modules/app_notify.so -@dirrmtry lib/asterisk/modules -@dirrmtry lib/asterisk -@dirrmtry etc/asterisk --Apple-Mail-10-324083543 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed On Oct 25, 07, at 23:02 , Mayo Jordanov wrote: > last update, I promise. I've triple checked the port Makfile and > pkg-* files and they look good now. portlint is happy too. > > - fixed incorrectly set PORTREVISION > - fixed invalid PORTVERSION by defining DISTVERSION > - remove unused variable ASTETCDIR > - don't create directories this port is not responsible for > - don't clean up directories this port is not responsible for > > thanks, > mayo > > --Apple-Mail-10-324083543-- --Apple-Mail-11-324083654 content-type: application/pgp-signature; x-mac-type=70674453; name=PGP.sig content-description: This is a digitally signed message part content-disposition: inline; filename=PGP.sig content-transfer-encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (Darwin) iEYEARECAAYFAkchh0QACgkQ3IqYlN3K/uYKZQCfanye8PCTCFWkWh/kO7eJsJ/y DfgAoPyhuxSABzQbDCIzxfRnrx2oBQbX =+tED -----END PGP SIGNATURE----- --Apple-Mail-11-324083654--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710260630.l9Q6U3I6000716>