Update to 1.2.3 and bristuff-0.3.0-PRE-1s.

Sponsored by:	Ethon Technologies GmbH

3 files changed, 31 insertions, 32 deletions

diff --git a/misc/libpri-bristuff/Makefile b/misc/libpri-bristuff/Makefile
index 34028cf441d..ad650f904e1 100644
--- a/misc/libpri-bristuff/Makefile
+++ b/misc/libpri-bristuff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.digium.com/pub/libpri/ \
 		ftp://ftp.digium.com/pub/libpri/old/
@@ -16,7 +16,7 @@ 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-1p
+BRIVER=		bristuff-0.3.0-PRE-1s
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C implementation of the Primary Rate ISDN specification
diff --git a/misc/libpri-bristuff/distinfo b/misc/libpri-bristuff/distinfo
index 0d57dd38b28..7c507eeef7f 100644
--- a/misc/libpri-bristuff/distinfo
+++ b/misc/libpri-bristuff/distinfo
@@ -1,6 +1,6 @@
-MD5 (libpri-1.2.2.tar.gz) = efce9c3699110588df5e4cf09eae01d9
-SHA256 (libpri-1.2.2.tar.gz) = 168fce4699b77c1ac5ae176237dae2f289714be95ddd2fe8bdc25a22f00318dd
-SIZE (libpri-1.2.2.tar.gz) = 76070
-MD5 (libpri-1.2.2-bristuff-0.3.0-PRE-1p.patch.gz) = 4dc04b47f2a85e20922b57b189ae7924
-SHA256 (libpri-1.2.2-bristuff-0.3.0-PRE-1p.patch.gz) = ca6a3f909d288ac4093005500fb79dfd371d340f90238c8aba552334593f5d9d
-SIZE (libpri-1.2.2-bristuff-0.3.0-PRE-1p.patch.gz) = 45214
+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
diff --git a/misc/libpri-bristuff/files/patch-Makefile b/misc/libpri-bristuff/files/patch-Makefile
index bb5739e909c..f2ae3a62125 100644
--- a/misc/libpri-bristuff/files/patch-Makefile
+++ b/misc/libpri-bristuff/files/patch-Makefile
@@ -1,8 +1,8 @@
---- Makefile.orig	Sat Jun  3 21:21:43 2006
-+++ Makefile	Sat Jun  3 21:22:16 2006
-@@ -27,21 +27,21 @@
- # Uncomment if you want libpri to count number of Q921/Q931 sent/received
- #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
+--- 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
@@ -18,43 +18,42 @@
 +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) -DRELAX_TRB
--INSTALL_PREFIX?=
+-CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB
+-INSTALL_PREFIX=$(DESTDIR)
 -INSTALL_BASE=/usr
 -SOFLAGS = -Wl,-hlibpri.so.1.0
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB
++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
- ifeq (${OSARCH},Linux)
+ ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
  LDCONFIG_FLAGS=-n
-@@ -84,14 +84,13 @@
+@@ -91,12 +91,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
--	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
++	$(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
 -	( 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); fi
-+	echo installing libpri-bristuff.h
-+	$(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)/include/libpri-bristuff.h
-+	$(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/lib
-+	( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri-bristuff.so.1 libpri-bristuff.so )
-+	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/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
  else
--	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
-+	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h -m 644 libpri.h
+ 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
- 	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
-@@ -130,7 +129,6 @@
+@@ -137,9 +136,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.0 libpri.so
+-	ln -sf libpri.so.1.0 libpri.so.1
++	ln -sf libpri.so.1 libpri.so
  	$(SOSLINK)
+ 
+ clean: