head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.12 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.10 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.8 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.6 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.4 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.2 pkgsrc-2024Q4-base:1.1; locks; strict; comment @# @; 1.1 date 2024.10.21.05.12.44; author jnemeth; state Exp; branches; next ; commitid cZ96k12iK0kpjuuF; desc @@ 1.1 log @comms/asterisk22: import asterisk-22.0.0 Asterisk is a complete PBX in software. It provides all of the features you would expect from a PBX and more. Asterisk does voice over IP in three protocols, and can interoperate with almost all standards-based telephony equipment using relatively inexpensive hardware. Asterisk provides Voicemail services with Directory, Call Conferencing, Interactive Voice Response, Call Queuing. It has support for three-way calling, caller ID services, ADSI, SIP and H.323 (as both client and gateway). This is a Long Term Support version. It is scheduled to go to security fixes only on October 16th, 2028, and EOL on October 16th, 2029. See here for more information about Asterisk versions: https://docs.asterisk.org/About-the-Project/Asterisk-Versions/ @ text @$NetBSD: patch-Makefile,v 1.1 2024/04/08 03:20:07 jnemeth Exp $ --- Makefile.orig 2021-11-02 08:53:05.000000000 +0000 +++ Makefile @@@@ -143,7 +143,7 @@@@ DEBUG=-g3 # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +ASTCONFPATH=$(ASTEXAMPLEDIR)/asterisk.conf AGI_DIR=$(ASTDATADIR)/agi-bin # If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file @@@@ -215,12 +215,6 @@@@ ifeq ($(AST_DEVMODE),yes) endif endif -ifeq ($(OSARCH),NetBSD) - _ASTCFLAGS+=-isystem /usr/pkg/include -else ifneq ($(findstring BSD,$(OSARCH)),) - _ASTCFLAGS+=-isystem /usr/local/include -endif - ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) @@@@ -435,7 +429,6 @@@@ dist-clean: distclean distclean: $(SUBDIRS_DIST_CLEAN) _clean @@$(MAKE) -C menuselect dist-clean - @@$(MAKE) -C sounds dist-clean rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps rm -f config.log config.status config.cache rm -rf autom4te.cache @@@@ -563,7 +556,7 @@@@ update: NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h)) OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) -INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \ +INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTEXAMPLEDIR)" "$(ASTVARRUNDIR)" \ "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \ "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \ "$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \ @@@@ -769,7 +762,7 @@@@ upgrade: bininstall # (2) the extension to strip off define INSTALL_CONFIGS @@for x in $(1)/*$(2); do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \ + dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x $(2)`"; \ if [ -f "$${dst}" ]; then \ if [ "$(OVERWRITE)" = "y" ]; then \ if cmp -s "$${dst}" "$$x" ; then \ @@@@ -799,9 +792,9 @@@@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ - "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ - rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ + "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \ + $(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \ + rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \ fi endef @@@@ -826,15 +819,15 @@@@ install-configs: # XXX why *.adsi is installed first ? adsi: @@echo Installing adsi config files... - $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)" + $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)" @@for x in configs/samples/*.adsi; do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ + dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \ if [ -f "$${dst}" ] ; then \ echo "Overwriting $$x" ; \ else \ echo "Installing $$x" ; \ fi ; \ - $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ + $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \ done samples: adsi @@@@ -867,7 +860,7 @@@@ basic-pbx: webvmail: @@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) @@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi" + $(INSTALL) contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail" $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk" for x in images/*.gif; do \ $(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \ @@@@ -917,11 +910,11 @@@@ endif endif install-logrotate: - if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \ - $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ; \ + if [ ! -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ]; then \ + $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ; \ fi sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp - $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTETCDIR)/../logrotate.d/asterisk" + $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d/asterisk" rm -f contrib/scripts/asterisk.logrotate.tmp config: @@@@ -1048,7 +1041,7 @@@@ uninstall-all: _uninstall uninstall-head rm -rf "$(DESTDIR)$(ASTVARLIBDIR)" rm -rf "$(DESTDIR)$(ASTDATADIR)" rm -rf "$(DESTDIR)$(ASTSPOOLDIR)" - rm -rf "$(DESTDIR)$(ASTETCDIR)" + rm -rf "$(DESTDIR)$(ASTEXAMPLEDIR)" rm -rf "$(DESTDIR)$(ASTLOGDIR)" rm -rf "$(DESTDIR)$(ASTCACHEDIR)" @@@@ -1139,6 +1132,7 @@@@ check-alembic: makeopts .PHONY: install-configs .PHONY: install-headers .PHONY: menuselect +.PHONY: menuselect.makeopts .PHONY: main .PHONY: sounds .PHONY: clean @