4 files changed, 44 insertions, 52 deletions

diff --git a/misc/libpri-bristuff/Makefile b/misc/libpri-bristuff/Makefile
index 0078fa326358..0a21a2d7dcdb 100644
--- a/misc/libpri-bristuff/Makefile
+++ b/misc/libpri-bristuff/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.2.3
+PORTVERSION=	1.4.3
 CATEGORIES=	misc
-MASTER_SITES=	http://downloads.digium.com/pub/libpri/old/
+MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/libpri/releases/
 PKGNAMESUFFIX=	-bristuff
 PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
-BRIVER=		bristuff-0.3.0-PRE-1s
+BRIVER=		bristuff-0.4.0-RC3g
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C implementation of the Primary Rate ISDN specification
@@ -22,10 +22,4 @@ COMMENT=	A C implementation of the Primary Rate ISDN specification
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha"
-BROKEN=		Does not compile on alpha
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/libpri-bristuff/distinfo b/misc/libpri-bristuff/distinfo
index 7c507eeef7f8..bcdb1aec5e1b 100644
--- a/misc/libpri-bristuff/distinfo
+++ b/misc/libpri-bristuff/distinfo
@@ -1,6 +1,6 @@
-MD5 (libpri-1.2.3.tar.gz) = f365d9ee29a7253d605729a6d07ebfff
-SHA256 (libpri-1.2.3.tar.gz) = f4ca5d72aa4b5e5c99c4e1a9de7235af5ed12b51a20dd757f071f5d7cf9d0fd0
-SIZE (libpri-1.2.3.tar.gz) = 76348
-MD5 (libpri-1.2.3-bristuff-0.3.0-PRE-1s.patch.gz) = 022c92a5a2a6e87872528b46ef466b74
-SHA256 (libpri-1.2.3-bristuff-0.3.0-PRE-1s.patch.gz) = acdfad15687a0c14708be3f58e05b757b76cd83683354702a6bd8c74ba1012c8
-SIZE (libpri-1.2.3-bristuff-0.3.0-PRE-1s.patch.gz) = 45664
+MD5 (libpri-1.4.3.tar.gz) = c5be91fc98f1638ba0365bf87f696cd1
+SHA256 (libpri-1.4.3.tar.gz) = aec293708e3f70e0dc6352ac33a6680249c0795a9eb8f31972a95d5e2f41bd69
+SIZE (libpri-1.4.3.tar.gz) = 81741
+MD5 (libpri-1.4.3-bristuff-0.4.0-RC3g.patch.gz) = 50aaa72e6a813b7f969880332357e0a6
+SHA256 (libpri-1.4.3-bristuff-0.4.0-RC3g.patch.gz) = 46ed1818231c08a4995c099e99d283e1bcbb1395ade54c7cc8160fad9d03f5bf
+SIZE (libpri-1.4.3-bristuff-0.4.0-RC3g.patch.gz) = 44053
diff --git a/misc/libpri-bristuff/files/patch-Makefile b/misc/libpri-bristuff/files/patch-Makefile
index f2ae3a621257..9b36d90e63ea 100644
--- a/misc/libpri-bristuff/files/patch-Makefile
+++ b/misc/libpri-bristuff/files/patch-Makefile
@@ -1,59 +1,65 @@
---- Makefile.orig	Sun Oct 29 15:38:22 2006
-+++ Makefile	Sun Oct 29 15:39:37 2006
-@@ -34,21 +34,21 @@
- # device sends a RELEASE COMPLETE with cause 17
- #FASTBUSYONBUSY=-DFASTBUSYONBUSY
- 
--CC=gcc
-+CC?=gcc
- 
+--- Makefile.orig	2009-09-09 17:22:54.000000000 +0200
++++ Makefile	2009-09-09 17:23:33.000000000 +0200
+@@ -42,14 +42,14 @@
  OSARCH=$(shell uname -s)
  PROC?=$(shell uname -m)
  
- TOBJS=testpri.o
- T2OBJS=testprilib.o
 -STATIC_LIBRARY=libpri.a
 -DYNAMIC_LIBRARY=libpri.so.1.0
 +STATIC_LIBRARY=libpri-bristuff.a
 +DYNAMIC_LIBRARY=libpri-bristuff.so.1
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
--CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB
--INSTALL_PREFIX=$(DESTDIR)
--INSTALL_BASE=/usr
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB $(RELAXEDTIMERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB $(RELAXEDTIMERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
 -SOFLAGS = -Wl,-hlibpri.so.1.0
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB
-+INSTALL_PREFIX?=$(PREFIX)
-+INSTALL_BASE=
 +SOFLAGS = -Wl,-hlibpri-bristuff.so.1
  LDCONFIG = /sbin/ldconfig
- ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
+ ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
  LDCONFIG_FLAGS=-n
-@@ -91,12 +91,11 @@
+@@ -57,7 +57,7 @@
+ ifeq (${OSARCH},FreeBSD)
+ LDCONFIG_FLAGS=-m
+ CFLAGS += -I../zaptel -I../zapata
+-INSTALL_BASE=/usr/local
++INSTALL_BASE=$(PREFIX)
+ endif
+ endif
+ ifeq (${OSARCH},SunOS)
+@@ -90,12 +90,11 @@
  	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
  	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
  ifneq (${OSARCH},SunOS)
 -	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
--	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-+	$(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri-bristuff.h
-+	$(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- 	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then  restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
++	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri-bristuff.h
+ 	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ 	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
 -	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
--	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
--	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
 +	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri-bristuff.so.1 libpri-bristuff.so )
-+	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
  else
  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
-@@ -137,9 +136,7 @@
+@@ -111,7 +110,7 @@
+ 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.a
+ 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+ 
+-pritest: pritest.o
++
+ 	$(CC) -o pritest pritest.o -L. -lpri -lzap $(CFLAGS)
+ 
+ testprilib.o: testprilib.c
+@@ -136,9 +135,7 @@
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
 -	$(LDCONFIG) $(LDCONFIG_FLAGS) .
 -	ln -sf libpri.so.1.0 libpri.so
 -	ln -sf libpri.so.1.0 libpri.so.1
-+	ln -sf libpri.so.1 libpri.so
++	ln -sf libpri-bristuff.so.1 libpri-bristuff.so
  	$(SOSLINK)
  
  clean:
diff --git a/misc/libpri-bristuff/files/patch-mkdep b/misc/libpri-bristuff/files/patch-mkdep
deleted file mode 100644
index 3d8849b88e37..000000000000
--- a/misc/libpri-bristuff/files/patch-mkdep
+++ /dev/null
@@ -1,8 +0,0 @@
---- mkdep.orig	Wed Nov 30 22:55:54 2005
-+++ mkdep	Wed Nov 30 22:56:00 2005
-@@ -1,4 +1,4 @@
--#!/bin/bash -
-+#!/bin/sh -
- #
- #	$OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $
- #	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $