diff options
-rw-r--r-- | comms/asterisk/Makefile | 69 | ||||
-rw-r--r-- | comms/asterisk/distinfo | 4 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-aa | 70 |
3 files changed, 73 insertions, 70 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 80404984d3a..6b25b914585 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2006/01/25 17:48:43 riz Exp $ +# $NetBSD: Makefile,v 1.18 2006/01/29 01:21:45 rillig Exp $ DISTNAME= asterisk-1.2.3 +PKGREVISION= 1 CATEGORIES= comms net audio MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases @@ -9,7 +10,8 @@ MAINTAINER= riz@NetBSD.org HOMEPAGE= http://www.asterisk.org/ COMMENT= The Asterisk Software PBX -USE_TOOLS+= bison gmake +USE_TOOLS+= bison gmake perl:run +REPLACE_PERL+= agi/agi-test.agi # MANCOMPRESSED= yes @@ -23,37 +25,37 @@ INSTALL_TARGET= install samples # Various path settings for Asterisk PKG_SYSCONFSUBDIR?= asterisk -ASTLIBDIR?=${PREFIX}/lib/asterisk -ASTVARLIBDIR?=${PREFIX}/libdata/asterisk -ASTETCDIR?=${PKG_SYSCONFDIR} -ASTSPOOLDIR?=${VARBASE}/spool/asterisk -ASTLOGDIR?=${VARBASE}/log/asterisk -ASTHEADERDIR?=${PREFIX}/include/asterisk -ASTCONFPATH?=${ASTETCDIR}/asterisk.conf -ASTBINDIR?=${PREFIX}/bin -ASTSBINDIR?=${PREFIX}/sbin -ASTVARRUNDIR?=${VARBASE}/run -ASTMANDIR?=${PREFIX}/man -ASTEXAMPLEDIR?=${PREFIX}/share/examples/asterisk +ASTLIBDIR?= ${PREFIX}/lib/asterisk +ASTVARLIBDIR?= ${PREFIX}/libdata/asterisk +ASTETCDIR?= ${PKG_SYSCONFDIR} +ASTSPOOLDIR?= ${VARBASE}/spool/asterisk +ASTLOGDIR?= ${VARBASE}/log/asterisk +ASTHEADERDIR?= ${PREFIX}/include/asterisk +ASTCONFPATH?= ${ASTETCDIR}/asterisk.conf +ASTBINDIR?= ${PREFIX}/bin +ASTSBINDIR?= ${PREFIX}/sbin +ASTVARRUNDIR?= ${VARBASE}/run +ASTMANDIR?= ${PREFIX}/man +ASTEXAMPLEDIR?= ${PREFIX}/share/examples/asterisk # Override default paths in Makefile SUBST_CLASSES+= asterisk SUBST_STAGE.asterisk= pre-configure SUBST_FILES.asterisk= Makefile configs/musiconhold.conf.sample SUBST_SED.asterisk= \ - -e "s|/var/lib/asterisk|${ASTVARLIBDIR}|" \ - -e "s|^ *\(ASTLIBDIR\)=.*|\1 = ${ASTLIBDIR}|" \ - -e "s|^ *\(ASTVARLIBDIR\)=.*|\1 = ${ASTVARLIBDIR}|" \ - -e "s|^ *\(ASTETCDIR\)=.*|\1 = ${ASTETCDIR}|" \ - -e "s|^ *\(ASTSPOOLDIR\)=.*|\1 = ${ASTSPOOLDIR}|" \ - -e "s|^ *\(ASTLOGDIR\)=.*|\1 = ${ASTLOGDIR}|" \ - -e "s|^ *\(ASTHEADERDIR\)=.*|\1 = ${ASTHEADERDIR}|" \ - -e "s|^ *\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH}|" \ - -e "s|^ *\(ASTBINDIR\)=.*|\1 = ${ASTBINDIR}|" \ - -e "s|^ *\(ASTSBINDIR\)=.*|\1 = ${ASTSBINDIR}|" \ - -e "s|^ *\(ASTVARRUNDIR\)=.*|\1 = ${ASTVARRUNDIR}|" \ - -e "s|^ *\(ASTMANDIR\)=.*|\1 = ${ASTMANDIR}|" \ - -e "s|^ *\(ASTEXAMPLEDIR\)=.*|\1 = ${ASTEXAMPLEDIR}|" + -e 's|/var/lib/asterisk|${ASTVARLIBDIR}|' \ + -e 's|^ *\(ASTLIBDIR\)=.*|\1 = ${ASTLIBDIR}|' \ + -e 's|^ *\(ASTVARLIBDIR\)=.*|\1 = ${ASTVARLIBDIR}|' \ + -e 's|^ *\(ASTETCDIR\)=.*|\1 = ${ASTETCDIR}|' \ + -e 's|^ *\(ASTSPOOLDIR\)=.*|\1 = ${ASTSPOOLDIR}|' \ + -e 's|^ *\(ASTLOGDIR\)=.*|\1 = ${ASTLOGDIR}|' \ + -e 's|^ *\(ASTHEADERDIR\)=.*|\1 = ${ASTHEADERDIR}|' \ + -e 's|^ *\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH}|' \ + -e 's|^ *\(ASTBINDIR\)=.*|\1 = ${ASTBINDIR}|' \ + -e 's|^ *\(ASTSBINDIR\)=.*|\1 = ${ASTSBINDIR}|' \ + -e 's|^ *\(ASTVARRUNDIR\)=.*|\1 = ${ASTVARRUNDIR}|' \ + -e 's|^ *\(ASTMANDIR\)=.*|\1 = ${ASTMANDIR}|' \ + -e 's|^ *\(ASTEXAMPLEDIR\)=.*|\1 = ${ASTEXAMPLEDIR}|' .include "options.mk" @@ -63,14 +65,15 @@ OWN_DIRS+= ${ASTSPOOLDIR} ${ASTLOGDIR} ${ASTVARRUNDIR} OWN_DIRS+= ${ASTLOGDIR}/cdr-csv CONF_FILES= # empty -.for _file_ in asterisk.conf extensions.conf -CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_} +.for f in asterisk.conf extensions.conf +CONF_FILES+= ${ASTEXAMPLEDIR:Q}/${f:Q} ${ASTETCDIR:Q}/${f:Q} .endfor -MAKE_FLAGS+= INSTALL_PREFIX=${PREFIX} - +MAKE_ENV+= VARBASE=${VARBASE:Q} +MAKE_FLAGS+= INSTALL_PREFIX=${PREFIX:Q} + # if we put all the files in $CONF_FILES, the message is _way_ too long. -.for _file_ in adsi.conf adtranvofr.conf agents.conf alarmreceiver.conf \ +.for f in adsi.conf adtranvofr.conf agents.conf alarmreceiver.conf \ alsa.conf cdr_manager.conf cdr_odbc.conf \ cdr_pgsql.conf cdr_tds.conf enum.conf extconfig.conf \ features.conf festival.conf iax.conf \ @@ -80,7 +83,7 @@ MAKE_FLAGS+= INSTALL_PREFIX=${PREFIX} res_odbc.conf rpt.conf rtp.conf sip.conf \ skinny.conf voicemail.conf vpb.conf zapata.conf asterisk.adsi \ telcordia-1.adsi -CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_} +CONF_FILES+= ${ASTEXAMPLEDIR:Q}/${f:Q} ${ASTETCDIR:Q}/${f:Q} .endfor PTHREAD_OPTS+= require native diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo index d431fccb8c6..3ba108fa6c6 100644 --- a/comms/asterisk/distinfo +++ b/comms/asterisk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2006/01/25 17:48:43 riz Exp $ +$NetBSD: distinfo,v 1.10 2006/01/29 01:21:45 rillig Exp $ SHA1 (asterisk-1.2.3.tar.gz) = 5e154de58fcf93a878294584fbacdac389f77f79 RMD160 (asterisk-1.2.3.tar.gz) = 9f576428a811a978ce587010fced1ff373a639a7 Size (asterisk-1.2.3.tar.gz) = 10533725 bytes -SHA1 (patch-aa) = b5b6dc32051bcf5c0a894e74f2989c9a7923d8e8 +SHA1 (patch-aa) = 8951b74a18d83863d728f2a6f0884087d24d6697 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127 SHA1 (patch-ad) = bfc898732884063c6c300b15674e462793588601 diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa index 8098de0486d..9910e59ab13 100644 --- a/comms/asterisk/patches/patch-aa +++ b/comms/asterisk/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2006/01/13 20:32:38 riz Exp $ +$NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $ --- Makefile.orig 2005-12-05 06:47:51.000000000 +0000 +++ Makefile @@ -17,17 +17,17 @@ $NetBSD: patch-aa,v 1.6 2006/01/13 20:32:38 riz Exp $ - ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run - ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ASTLIBDIR = /usr/pkg/lib/asterisk -+ASTVARLIBDIR = /usr/pkg/libdata/asterisk -+ASTETCDIR = /usr/pkg/etc/asterisk -+ASTSPOOLDIR = /var/spool/asterisk -+ASTLOGDIR = /var/log/asterisk -+ASTHEADERDIR = /usr/pkg/include/asterisk -+ASTCONFPATH = /usr/pkg/etc/asterisk/asterisk.conf -+ASTBINDIR = /usr/pkg/bin -+ASTSBINDIR = /usr/pkg/sbin -+ASTVARRUNDIR = /var/run -+ASTMANDIR = /usr/pkg/man ++ASTLIBDIR = ${PREFIX}/lib/asterisk ++ASTVARLIBDIR = ${PREFIX}/libdata/asterisk ++ASTETCDIR = ${PREFIX}/etc/asterisk ++ASTSPOOLDIR = ${VARBASE}/spool/asterisk ++ASTLOGDIR = ${VARBASE}/log/asterisk ++ASTHEADERDIR = ${PREFIX}/include/asterisk ++ASTCONFPATH = ${PREFIX}/etc/asterisk/asterisk.conf ++ASTBINDIR = ${PREFIX}/bin ++ASTSBINDIR = ${PREFIX}/sbin ++ASTVARRUNDIR = ${VARBASE}/run ++ASTMANDIR = ${PREFIX}/man + ASTEXAMPLEDIR?=${PREFIX}/share/examples/asterisk MODULES_DIR=$(ASTLIBDIR)/modules AGI_DIR=$(ASTVARLIBDIR)/agi-bin @@ -43,17 +43,17 @@ $NetBSD: patch-aa,v 1.6 2006/01/13 20:32:38 riz Exp $ - ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run - ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man -+ASTLIBDIR = /usr/pkg/lib/asterisk -+ASTVARLIBDIR = /usr/pkg/libdata/asterisk -+ASTETCDIR = /usr/pkg/etc/asterisk -+ASTSPOOLDIR = /var/spool/asterisk -+ASTLOGDIR = /var/log/asterisk -+ASTHEADERDIR = /usr/pkg/include/asterisk -+ASTCONFPATH = /usr/pkg/etc/asterisk/asterisk.conf -+ASTBINDIR = /usr/pkg/bin -+ASTSBINDIR = /usr/pkg/sbin -+ASTVARRUNDIR = /var/run -+ASTMANDIR = /usr/pkg/man ++ASTLIBDIR = ${PREFIX}/lib/asterisk ++ASTVARLIBDIR = ${PREFIX}/libdata/asterisk ++ASTETCDIR = ${PREFIX}/etc/asterisk ++ASTSPOOLDIR = ${VARBASE}/spool/asterisk ++ASTLOGDIR = ${VARBASE}/log/asterisk ++ASTHEADERDIR = ${PREFIX}/include/asterisk ++ASTCONFPATH = ${PREFIX}/etc/asterisk/asterisk.conf ++ASTBINDIR = ${PREFIX}/bin ++ASTSBINDIR = ${PREFIX}/sbin ++ASTVARRUNDIR = ${VARBASE}/run ++ASTMANDIR = ${PREFIX}/man MODULES_DIR=$(ASTLIBDIR)/modules AGI_DIR=$(ASTVARLIBDIR)/agi-bin endif @@ -81,17 +81,17 @@ $NetBSD: patch-aa,v 1.6 2006/01/13 20:32:38 riz Exp $ - ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run - ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -+ASTLIBDIR = /usr/pkg/lib/asterisk -+ASTVARLIBDIR = /usr/pkg/libdata/asterisk -+ASTETCDIR = /usr/pkg/etc/asterisk -+ASTSPOOLDIR = /var/spool/asterisk -+ASTLOGDIR = /var/log/asterisk -+ASTHEADERDIR = /usr/pkg/include/asterisk -+ASTCONFPATH = /usr/pkg/etc/asterisk/asterisk.conf -+ASTBINDIR = /usr/pkg/bin -+ASTSBINDIR = /usr/pkg/sbin -+ASTVARRUNDIR = /var/run -+ASTMANDIR = /usr/pkg/man ++ASTLIBDIR = ${PREFIX}/lib/asterisk ++ASTVARLIBDIR = ${PREFIX}/libdata/asterisk ++ASTETCDIR = ${PREFIX}/etc/asterisk ++ASTSPOOLDIR = ${VARBASE}/spool/asterisk ++ASTLOGDIR = ${VARBASE}/log/asterisk ++ASTHEADERDIR = ${PREFIX}/include/asterisk ++ASTCONFPATH = ${PREFIX}/etc/asterisk/asterisk.conf ++ASTBINDIR = ${PREFIX}/bin ++ASTSBINDIR = ${PREFIX}/sbin ++ASTVARRUNDIR = ${VARBASE}/run ++ASTMANDIR = ${PREFIX}/man # XXX end FreeBSD paths endif # FreeBSD @@ -108,7 +108,7 @@ $NetBSD: patch-aa,v 1.6 2006/01/13 20:32:38 riz Exp $ ASTLINK= LIBS+=-lpthread -lncurses -lm -lresolv - ASTSBINDIR=$(MODULES_DIR) -+ASTSBINDIR = /usr/pkg/sbin ++ASTSBINDIR = ${PREFIX}/sbin PROC=$(shell uname -m) endif |