Tue May 10 11:49:04 2022 UTC ()
asterisk*: Check for NetBSD properly. Use OPSYS_VERSION.


(nia)
diff -r1.88 -r1.89 pkgsrc/comms/asterisk16/Makefile
diff -r1.139 -r1.140 pkgsrc/comms/asterisk18/Makefile
diff -r1.6 -r1.7 pkgsrc/comms/asterisk19/Makefile
cvs diff -r1.88 -r1.89 pkgsrc/comms/asterisk16/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk16/Makefile 2022/05/05 08:20:09 1.88
+++ pkgsrc/comms/asterisk16/Makefile 2022/05/10 11:49:03 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.88 2022/05/05 08:20:09 nia Exp $ 1# $NetBSD: Makefile,v 1.89 2022/05/10 11:49:03 nia Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile 4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
5# to find out the current sound file versions 5# to find out the current sound file versions
6 6
7DISTNAME= asterisk-16.24.0 7DISTNAME= asterisk-16.24.0
8PKGREVISION= 1 8PKGREVISION= 1
9CATEGORIES= comms net audio 9CATEGORIES= comms net audio
10MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ 10MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
11MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ 11MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/ 12MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
13DIST_SUBDIR= ${PKGNAME_NOREV} 13DIST_SUBDIR= ${PKGNAME_NOREV}
14DISTFILES= ${DEFAULT_DISTFILES} 14DISTFILES= ${DEFAULT_DISTFILES}
@@ -136,27 +136,28 @@ PLIST.mgcp= yes @@ -136,27 +136,28 @@ PLIST.mgcp= yes
136.endfor 136.endfor
137 137
138.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 138.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
139PLIST.mgcp= yes 139PLIST.mgcp= yes
140.endif 140.endif
141 141
142PLIST_VARS+= timerfd 142PLIST_VARS+= timerfd
143.if defined(OPSYS_HAS_TIMERFD) 143.if defined(OPSYS_HAS_TIMERFD)
144PLIST.timerfd= yes 144PLIST.timerfd= yes
145.endif 145.endif
146 146
147PLIST_VARS+= unbound 147PLIST_VARS+= unbound
148# unbound 1.5 or later is required.` 148# unbound 1.5 or later is required.`
149.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M9.*) 149.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
 150 exists(/usr/include/unbound.h)
150PLIST.unbound= yes 151PLIST.unbound= yes
151.else 152.else
152CONFIGURE_ARGS+= --without-unbound 153CONFIGURE_ARGS+= --without-unbound
153.endif 154.endif
154 155
155.include "options.mk" 156.include "options.mk"
156 157
157# check sounds/Makefile for current version when upgrading package 158# check sounds/Makefile for current version when upgrading package
158DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz 159DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
159 160
160# pjproject 161# pjproject
161PJPROJ_VERSION= 2.10 162PJPROJ_VERSION= 2.10
162SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \ 163SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \
cvs diff -r1.139 -r1.140 pkgsrc/comms/asterisk18/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/Makefile 2022/05/05 08:20:09 1.139
+++ pkgsrc/comms/asterisk18/Makefile 2022/05/10 11:49:03 1.140
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.139 2022/05/05 08:20:09 nia Exp $ 1# $NetBSD: Makefile,v 1.140 2022/05/10 11:49:03 nia Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile 4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
5# to find out the current sound file versions 5# to find out the current sound file versions
6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject 6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject
7 7
8DISTNAME= asterisk-18.9.0 8DISTNAME= asterisk-18.9.0
9#PKGREVISION= 24 9#PKGREVISION= 24
10PKGREVISION= 1 10PKGREVISION= 1
11CATEGORIES= comms net audio 11CATEGORIES= comms net audio
12MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ 12MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ 13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
14MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/ 14MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
@@ -136,30 +136,31 @@ PLIST.mgcp= yes @@ -136,30 +136,31 @@ PLIST.mgcp= yes
136.endfor 136.endfor
137 137
138.if ${OPSYS} == "SunOS" 138.if ${OPSYS} == "SunOS"
139PLIST.mgcp= yes 139PLIST.mgcp= yes
140.endif 140.endif
141 141
142PLIST_VARS+= timerfd 142PLIST_VARS+= timerfd
143.if defined(OPSYS_HAS_TIMERFD) 143.if defined(OPSYS_HAS_TIMERFD)
144PLIST.timerfd= yes 144PLIST.timerfd= yes
145.endif 145.endif
146 146
147PLIST_VARS+= unbound 147PLIST_VARS+= unbound
148# unbound 1.5 or later is required.` 148# unbound 1.5 or later is required.`
149.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M8.*) 149.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
150CONFIGURE_ARGS+= --without-unbound 150 exists(/usr/include/unbound.h)
151.else 
152PLIST.unbound= yes 151PLIST.unbound= yes
 152.else
 153CONFIGURE_ARGS+= --without-unbound
153.endif 154.endif
154 155
155.include "options.mk" 156.include "options.mk"
156 157
157# check sounds/Makefile for current version when upgrading package 158# check sounds/Makefile for current version when upgrading package
158DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz 159DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
159 160
160# pjproject 161# pjproject
161PJPROJ_VERSION= 2.10 162PJPROJ_VERSION= 2.10
162SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \ 163SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \
163 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2 164 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
164SITES.pjproject-${PJPROJ_VERSION}.md5= \ 165SITES.pjproject-${PJPROJ_VERSION}.md5= \
165 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT 166 -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT
cvs diff -r1.6 -r1.7 pkgsrc/comms/asterisk19/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk19/Makefile 2022/05/05 08:20:09 1.6
+++ pkgsrc/comms/asterisk19/Makefile 2022/05/10 11:49:04 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2022/05/05 08:20:09 nia Exp $ 1# $NetBSD: Makefile,v 1.7 2022/05/10 11:49:04 nia Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile 4# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
5# to find out the current sound file versions 5# to find out the current sound file versions
6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject 6# Also look in ${WRKSRC}/third-party/versions.mak for pjproject
7 7
8DISTNAME= asterisk-19.1.0 8DISTNAME= asterisk-19.1.0
9#PKGREVISION= 24 9#PKGREVISION= 24
10PKGREVISION= 1 10PKGREVISION= 1
11CATEGORIES= comms net audio 11CATEGORIES= comms net audio
12MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ 12MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ 13MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
14MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/ 14MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
@@ -136,27 +136,28 @@ PLIST.mgcp= yes @@ -136,27 +136,28 @@ PLIST.mgcp= yes
136.endfor 136.endfor
137 137
138.if ${OPSYS} == "SunOS" 138.if ${OPSYS} == "SunOS"
139PLIST.mgcp= yes 139PLIST.mgcp= yes
140.endif 140.endif
141 141
142PLIST_VARS+= timerfd 142PLIST_VARS+= timerfd
143.if defined(OPSYS_HAS_TIMERFD) 143.if defined(OPSYS_HAS_TIMERFD)
144PLIST.timerfd= yes 144PLIST.timerfd= yes
145.endif 145.endif
146 146
147PLIST_VARS+= unbound 147PLIST_VARS+= unbound
148# unbound 1.5 or later is required.` 148# unbound 1.5 or later is required.`
149.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M8.*) 149.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
 150 exists(/usr/include/unbound.h)
150CONFIGURE_ARGS+= --without-unbound 151CONFIGURE_ARGS+= --without-unbound
151.else 152.else
152PLIST.unbound= yes 153PLIST.unbound= yes
153.endif 154.endif
154 155
155.include "options.mk" 156.include "options.mk"
156 157
157# check sounds/Makefile for current version when upgrading package 158# check sounds/Makefile for current version when upgrading package
158DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz 159DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
159 160
160# pjproject 161# pjproject
161PJPROJ_VERSION= 2.10 162PJPROJ_VERSION= 2.10
162SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \ 163SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \