Attachment #82094 for bug #117475




# Date created:				23 March 2007
# Whom:					mayo
#
# $FreeBSD$
#

PORTNAME=	app_notify
DISTVERSION=	2.0rc1
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://www.mezzo.net/asterisk/ \
		http://static.oyam.ca/freebsd/ports/

MAINTAINER=	mayo@oyam.ca
COMMENT=	Notify application module for the Asterisk PBX

BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk

USE_GMAKE=	yes

#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>

Lines 1-3 Link Here

(-)asterisk-app-notify/distinfo (-3 / +3 lines)
1	MD5 (app_notify-1.0.tgz) = a2f4bf2b6f306c0a60086e98265571a3	1	MD5 (app_notify-2.0rc1.tgz) = 0522cc76705bd11e943f309ae5c4a03f
2	SHA256 (app_notify-1.0.tgz) = 84d219c9ad2eed6c19a35e491f631428bd367cce4e736d973c762380378c29c0	2	SHA256 (app_notify-2.0rc1.tgz) = b3eb3a7b1f567c9bb0d44406d3425de3062194411d0559f2c9c547926e3ad0cf
3	SIZE (app_notify-1.0.tgz) = 3839	3	SIZE (app_notify-2.0rc1.tgz) = 4053




--- Makefile.orig	Thu Feb  1 04:08:39 2007
+++ Makefile	Thu Oct 25 00:05:18 2007
@@ -7,6 +7,7 @@
 #
 CONF=dialer_extensions.conf
 
 NAME=app_notify
+CONF=extensions_dialer.conf
 LIBS=
 RES=$(NAME).so
 
 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
 
 RES=$(NAME).so
@@ -35,6 +36,7 @@
 
 app_notify.so : app_notify.o
 	$(CC) $(SOLINK) -o $@ $<
@@ -30,10 +30,9 @@
 	rm -f $(NAME).o $(NAME).so notifyClient.o notifyClient sampleClient
 
 install: all
+	install -m 644 $(CONF).sample $(LOCALBASE)/etc/asterisk/$(CONF).sample ; \
-		install -m 644 $(CONF).sample /etc/asterisk/$(CONF) ; \
-	fi
+	install -m 644 $(CONF).sample $(PREFIX)/etc/asterisk/$(CONF).sample ; \
 	if [ -f $(NAME).so ]; then \
+		mkdir -p $(MODULES_DIR) ; \
 		install -m 755 $(NAME).so $(MODULES_DIR) ; \
 	fi
 




--- 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




a) If this is a new install, restart Asterisk or activate the module by
   running:

   # asterisk -rx "module load app_notify"

b) If this is an upgrade, you can restart Asterisk or reload the module by
   running:

   # asterisk -rx "module unload app_notify"
   # asterisk -rx "module load app_notify"

*****************************************************************************

Lines 1-7 Link Here

(-)asterisk-app-notify/pkg-plist (-6 / +1 lines)
1	@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	1	etc/asterisk/extensions_dialer.conf.sample
2	etc/asterisk/dialer_extensions.conf.sample
3	@exec if [ ! -f %D/etc/asterisk/dialer_extensions.conf ] ; then cp -p %D/%F %B/dialer_extensions.conf; fi
4	lib/asterisk/modules/app_notify.so	2	lib/asterisk/modules/app_notify.so
5	@dirrmtry lib/asterisk/modules
6	@dirrmtry lib/asterisk
7	@dirrmtry etc/asterisk

Return to bug 117475

Lines 2-13 Link Here

(-)asterisk-app-notify/Makefile (-12 / +6 lines)
2	# Date created: 23 March 2007	2	# Date created: 23 March 2007
3	# Whom: mayo	3	# Whom: mayo
4	#	4	#
5	# $FreeBSD: ports/net/asterisk-app-notify/Makefile,v 1.2 2007/04/12 03:09:24 sobomax Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= app_notify	8	PORTNAME= app_notify
9	PORTVERSION= 1.0	9	DISTVERSION= 2.0rc1
10	PORTREVISION= 1
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= http://www.mezzo.net/asterisk/ \	11	MASTER_SITES= http://www.mezzo.net/asterisk/ \
13	http://static.oyam.ca/freebsd/ports/	12	http://static.oyam.ca/freebsd/ports/
Lines 16-35 Link Here
16	MAINTAINER= mayo@oyam.ca	15	MAINTAINER= mayo@oyam.ca
17	COMMENT= Notify application module for the Asterisk PBX	16	COMMENT= Notify application module for the Asterisk PBX
18		17
19	BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk12	18	BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
20	RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk12	19	RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
21		20
22	USE_GMAKE= yes	21	USE_GMAKE= yes
23		22
24	ASTETCDIR= ${PREFIX}/etc/asterisk	23	#pre-install:
25		24	# ${MKDIR} ${ASTETCDIR}
26	pre-install:
27	${MKDIR} ${ASTETCDIR}
28		25
29	post-install:	26	post-install:
30	@if [ ! -f ${ASTETCDIR}/dialer_extensions.conf ]; then \
31	${CP} -p ${ASTETCDIR}/dialer_extensions.conf.sample ${ASTETCDIR}/dialer_extensions.conf ; \
32	fi
33	@${CAT} ${PKGMESSAGE}	27	@${CAT} ${PKGMESSAGE}
34		28
35	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 1-33 Link Here

(-)asterisk-app-notify/files/patch-Makefile (-23 / +17 lines)
1	--- Makefile.orig Fri Mar 23 21:14:57 2007	1	--- Makefile.orig Thu Feb 1 04:08:39 2007
2	+++ Makefile Sat Mar 24 00:09:09 2007	2	+++ Makefile Thu Oct 25 00:05:18 2007
3	@@ -9,7 +9,7 @@	3	@@ -7,6 +7,7 @@
4	NAME=app_notify	4	#
5	CONF=dialer_extensions.conf
6		5
7	-CFLAGS=-g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC	6	NAME=app_notify
8	+CFLAGS+= -g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC -I$(LOCALBASE)/include	7	+CONF=extensions_dialer.conf
9	LIBS=
10	RES=$(NAME).so
11		8
12	@@ -19,7 +19,7 @@	9	CC=gcc
13	SOLINK=-shared -Xlinker -x	10	CFLAGS=$(shell ./cflags.sh)
		11	@@ -21,7 +22,7 @@
		12	CC=gcc -arch ppc -arch i386
		13	else
		14	SOLINK=-shared -Xlinker -x
		15	- MODULES_DIR=/usr/lib/asterisk/modules
		16	+ MODULES_DIR=$(LOCALBASE)/lib/asterisk/modules
14	endif	17	endif
15		18
16	-MODULES_DIR=/usr/lib/asterisk/modules	19	RES=$(NAME).so
17	+MODULES_DIR=$(PREFIX)/lib/asterisk/modules	20	@@ -35,6 +36,7 @@
18
19	app_notify.so : app_notify.o
20	$(CC) $(SOLINK) -o $@ $<
21	@@ -30,10 +30,9 @@
22	rm -f $(NAME).o $(NAME).so notifyClient.o notifyClient sampleClient	21	rm -f $(NAME).o $(NAME).so notifyClient.o notifyClient sampleClient
23		22
24	install: all	23	install: all
25	- if ! [ -f /etc/asterisk/$(CONF) ]; then \	24	+ install -m 644 $(CONF).sample $(LOCALBASE)/etc/asterisk/$(CONF).sample ; \
26	- install -m 644 $(CONF).sample /etc/asterisk/$(CONF) ; \
27	- fi
28	+ install -m 644 $(CONF).sample $(PREFIX)/etc/asterisk/$(CONF).sample ; \
29	if [ -f $(NAME).so ]; then \	25	if [ -f $(NAME).so ]; then \
30	+ mkdir -p $(MODULES_DIR) ; \
31	install -m 755 $(NAME).so $(MODULES_DIR) ; \	26	install -m 755 $(NAME).so $(MODULES_DIR) ; \
32	fi	27	fi
33

Line 0 Link Here

(-)asterisk-app-notify/files/patch-cflags.sh (+12 lines)
	1	--- cflags.sh.orig Wed Oct 24 23:37:00 2007
	2	+++ cflags.sh Wed Oct 24 23:31:46 2007
	3	@@ -8,7 +8,8 @@
	4	INCDIR=/Library/Asterisk/include
	5	CFLAGS="${CFLAGS} -I/Library/Asterisk/include"
	6	else
	7	- INCDIR=/usr/include
	8	+ INCDIR=${LOCALBASE}/include
	9	+ CFLAGS="${CFLAGS} -I${INCDIR}"
	10	fi
	11
	12	CHANNEL_H=${INCDIR}/asterisk/channel.h

Lines 3-14 Link Here

(-)asterisk-app-notify/pkg-message (-3 / +3 lines)
3	a) If this is a new install, restart Asterisk or activate the module by	3	a) If this is a new install, restart Asterisk or activate the module by
4	running:	4	running:
5		5
6	# asterisk -rx "load app_notify"	6	# asterisk -rx "module load app_notify"
7		7
8	b) If this is an upgrade, you can restart Asterisk or reload the module by	8	b) If this is an upgrade, you can restart Asterisk or reload the module by
9	running:	9	running:
10		10
11	# asterisk -rx "unload app_notify"	11	# asterisk -rx "module unload app_notify"
12	# asterisk -rx "load app_notify"	12	# asterisk -rx "module load app_notify"
13		13
14	*****************************************************************************	14	*****************************************************************************