Attachment #71860 for bug #104567

View | Details | Raw Unified | Return to bug 104567
Collapse All | Expand All




#

PORTNAME=	asterisk
PORTVERSION=	1.2.13
CATEGORIES=	net
MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
		http://ftp.digium.com/pub/asterisk/old-releases/

PATCHFILES=	asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz
PATCH_SITES=	http://unofficial.portaone.com/~bamby/public/

#		${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff
#		${MASTER_SITE_LOCAL:S,$,:bristuff,}
#PATCH_SITE_SUBDIR=	fjoe/:bristuff
#BRIVER=		bristuff-0.3.0-PRE-1l

MAINTAINER=	sobomax@FreeBSD.org
COMMENT=	An Open Source PBX and telephony toolkit

Lines 1-6 Link Here

(-)/usr/ports/net/asterisk/distinfo (-3 / +3 lines)
1	MD5 (asterisk-1.2.12.1.tar.gz) = 9c0d427f96c740163a22f5e0dbcb101d	1	MD5 (asterisk-1.2.13.tar.gz) = ad8fbe2198568f55c254045ecb3b7926
2	SHA256 (asterisk-1.2.12.1.tar.gz) = e54fc05f30764ad6678337ae386918481dd99347cfaa2d85fed3d0dc3a548d56	2	SHA256 (asterisk-1.2.13.tar.gz) = 8d197b118d9ee25bc8793b37d1daa6b54fd6074e6738f462368361e5698d98f8
3	SIZE (asterisk-1.2.12.1.tar.gz) = 10576676	3	SIZE (asterisk-1.2.13.tar.gz) = 10584113
4	MD5 (asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz) = b4db85eaa78fd3e716cd9d074233e8ae	4	MD5 (asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz) = b4db85eaa78fd3e716cd9d074233e8ae
5	SHA256 (asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz) = d438f741e83c64590c149c64482cb9ef93669b1d5cb3b43577405be25d1e818e	5	SHA256 (asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz) = d438f741e83c64590c149c64482cb9ef93669b1d5cb3b43577405be25d1e818e
6	SIZE (asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz) = 32857	6	SIZE (asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz) = 32857




--- cdr/Makefile.orig	Thu Sep 21 17:18:19 2006
+++ cdr/Makefile	Thu Oct 19 10:52:51 2006

--- cdr/Makefile.orig	Tue Nov 29 20:24:39 2005
+++ cdr/Makefile	Thu Jan 12 17:56:23 2006
@@ -21,8 +21,8 @@
 endif
 

 endif
 
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
@@ -38,21 +38,21 @@
 #
 # unixODBC stuff...
 #

 # FreeTDS stuff...
 #
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
-  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1)
     CFLAGS += -DFREETDS_0_64
   else
-    ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
+    ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
     CFLAGS += -DFREETDS_0_63
     else
-	  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
+	  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
         CFLAGS += -DFREETDS_0_62
       else
         CFLAGS += -DFREETDS_PRE_0_62
@@ -65,7 +65,7 @@
 #
 # PGSQL stuff...  Autoconf anyone??
 #

   MODS+=cdr_pgsql.so
 endif
 
@@ -86,9 +86,9 @@
   MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql
 endif
 

 endif
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
@@ -114,7 +114,7 @@
 all: depend $(MODS)
 
 install: all

Return to bug 104567

Lines 6-23 Link Here

(-)/usr/ports/net/asterisk/Makefile (-6 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= asterisk	8	PORTNAME= asterisk
9	PORTVERSION= 1.2.12.1	9	PORTVERSION= 1.2.13
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \	11	MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
12	http://ftp.digium.com/pub/asterisk/old-releases/	12	http://ftp.digium.com/pub/asterisk/old-releases/
13		13
14	PATCHFILES= asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz	14	PATCHFILES= asterisk-1.2.12.1-codec-negotiation-20060926.diff.gz
15	PATCH_SITES= http://unofficial.portaone.com/~bamby/public/	15	PATCH_SITES= http://unofficial.portaone.com/~bamby/public/
16
17	# ${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff
18	# ${MASTER_SITE_LOCAL:S,$,:bristuff,}
19	#PATCH_SITE_SUBDIR= fjoe/:bristuff
20	#BRIVER= bristuff-0.3.0-PRE-1l
21		16
22	MAINTAINER= sobomax@FreeBSD.org	17	MAINTAINER= sobomax@FreeBSD.org
23	COMMENT= An Open Source PBX and telephony toolkit	18	COMMENT= An Open Source PBX and telephony toolkit

Lines 1-8 Link Here

(-)/usr/ports/net/asterisk/files/patch-cdr::Makefile (-16 / +17 lines)
1		1	--- cdr/Makefile.orig Thu Sep 21 17:18:19 2006
2	$FreeBSD: ports/net/asterisk/files/patch-cdr::Makefile,v 1.7 2006/04/26 11:31:03 fjoe Exp $	2	+++ cdr/Makefile Thu Oct 19 10:52:51 2006
3
4	--- cdr/Makefile.orig Tue Nov 29 20:24:39 2005
5	+++ cdr/Makefile Thu Jan 12 17:56:23 2006
6	@@ -21,8 +21,8 @@	3	@@ -21,8 +21,8 @@
7	endif	4	endif
8		5
Lines 14-20 Link Here
14	endif	11	endif
15		12
16	#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.	13	#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
17	@@ -38,18 +38,18 @@	14	@@ -38,21 +38,21 @@
18	#	15	#
19	# unixODBC stuff...	16	# unixODBC stuff...
20	#	17	#
Lines 27-43 Link Here
27	# FreeTDS stuff...	24	# FreeTDS stuff...
28	#	25	#
29	-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)	26	-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
30	- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.63),1)	27	- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.64),1)
31	+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)	28	+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
32	+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.63),1)	29	+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.64),1)
33	CFLAGS += -DFREETDS_0_63	30	CFLAGS += -DFREETDS_0_64
34	else	31	else
35	- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.62),1)	32	- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.63),1)
36	+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.62),1)	33	+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.63),1)
37	CFLAGS += -DFREETDS_0_62	34	CFLAGS += -DFREETDS_0_63
38	else	35	else
39	CFLAGS += -DFREETDS_PRE_0_62	36	- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.62),1)
40	@@ -61,7 +61,7 @@	37	+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h \| grep -c 0.62),1)
		38	CFLAGS += -DFREETDS_0_62
		39	else
		40	CFLAGS += -DFREETDS_PRE_0_62
		41	@@ -65,7 +65,7 @@
41	#	42	#
42	# PGSQL stuff... Autoconf anyone??	43	# PGSQL stuff... Autoconf anyone??
43	#	44	#
Lines 46-52 Link Here
46	MODS+=cdr_pgsql.so	47	MODS+=cdr_pgsql.so
47	endif	48	endif
48		49
49	@@ -82,9 +82,9 @@	50	@@ -86,9 +86,9 @@
50	MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql	51	MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql
51	endif	52	endif
52		53
Lines 59-65 Link Here
59	endif	60	endif
60		61
61	ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)	62	ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
62	@@ -110,7 +110,7 @@	63	@@ -114,7 +114,7 @@
63	all: depend $(MODS)	64	all: depend $(MODS)
64		65
65	install: all	66	install: all