- Bring back bristuff support (bristuff-0.3.0-PRE-1l).

- Bump PORTREVISIONs

Approved by:	sobomax

4 files changed, 30 insertions, 42 deletions

diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile
index ffb4303050fa..812cffec9e3c 100644
--- a/misc/libpri/Makefile
+++ b/misc/libpri/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.digium.com/pub/libpri/ \
 		ftp://ftp.digium.com/pub/libpri/old/
 
-#PATCHFILES=	${PORTNAME}-1.0.8-${BRIVER}.patch.gz
-#PATCH_SITES=	${MASTER_SITE_LOCAL}
-#PATCH_SITE_SUBDIR=	fjoe
-#PATCH_DIST_STRIP=	-p1
+PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	fjoe
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	gonzo@univ.kiev.ua
 COMMENT=	A C implementation of the Primary Rate ISDN specification
 
-BRIVER=		bristuff-0.2.0-RC8h
+BRIVER=		bristuff-0.3.0-PRE-1l
 USE_GMAKE=	yes
 INSTALLS_SHLIB= yes
 
diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo
index 24cfb7ccd8ac..cfa28374603b 100644
--- a/misc/libpri/distinfo
+++ b/misc/libpri/distinfo
@@ -1,3 +1,6 @@
-MD5 (libpri-1.2.1.tar.gz) = d039b171514ec8b1a163b0875f76734e
-SHA256 (libpri-1.2.1.tar.gz) = b34ef6f1bcac7ed8aa64e4cbcffad0f4c364a911e8c7509a1ba26280046d22f8
-SIZE (libpri-1.2.1.tar.gz) = 75687
+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-1l.patch.gz) = e24e00f07601f6c43fb3825d0e67af3c
+SHA256 (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 92b4a8e5a36bb772b8cfc7e8563d4c422dec9415bc1f3247179a83ddf8352fdf
+SIZE (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 43755
diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile
index 087b757839b9..e32cf46a3c84 100644
--- a/misc/libpri/files/patch-Makefile
+++ b/misc/libpri/files/patch-Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Sat Feb 25 12:53:36 2006
++++ Makefile	Sat Feb 25 12:56:28 2006
 @@ -27,7 +27,7 @@
  # Uncomment if you want libpri to count number of Q921/Q931 sent/received
  #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
@@ -12,7 +9,7 @@ $FreeBSD$
  
  OSARCH=$(shell uname -s)
  PROC?=$(shell uname -m)
-@@ -35,11 +35,11 @@
+@@ -35,12 +35,12 @@
  TOBJS=testpri.o
  T2OBJS=testprilib.o
  STATIC_LIBRARY=libpri.a
@@ -20,26 +17,23 @@ $FreeBSD$
 +DYNAMIC_LIBRARY=libpri.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 -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+-CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB
 -INSTALL_PREFIX?=
-+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+-INSTALL_BASE=/usr
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB
 +INSTALL_PREFIX=$(PREFIX)
- INSTALL_BASE=/usr
- SOFLAGS = -Wl,-hlibpri.so.1
++INSTALL_BASE=
+ SOFLAGS = -Wl,-hlibpri.so.1.0
  LDCONFIG = /sbin/ldconfig
-@@ -81,20 +81,19 @@
- 	fi
- 
- install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
--	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
--	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
-+	mkdir -p $(INSTALL_PREFIX)/lib
-+	mkdir -p $(INSTALL_PREFIX)/include
+ ifeq (${OSARCH},Linux)
+@@ -84,12 +84,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
--	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
+-	( 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.h
@@ -48,22 +42,13 @@ $FreeBSD$
 +	( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so )
 +	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib
  else
--	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 libpri.so ; $(SOSLINK) )
--	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
-+	install -f $(INSTALL_PREFIX)/include -m 644 libpri.h
-+	install -f $(INSTALL_PREFIX)/lib -m 755 $(DYNAMIC_LIBRARY)
-+	( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) )
-+	install -f $(INSTALL_PREFIX)/lib -m 644 $(STATIC_LIBRARY)
- endif
- 
- uninstall:
+ 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+ 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
 @@ -130,7 +129,6 @@
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
 -	$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf libpri.so.1 libpri.so
+ 	ln -sf libpri.so.1.0 libpri.so
+ 	ln -sf libpri.so.1.0 libpri.so.1
  	$(SOSLINK)
- 
diff --git a/misc/libpri/pkg-plist b/misc/libpri/pkg-plist
index ccbeae646ef3..e552b67c0b2a 100644
--- a/misc/libpri/pkg-plist
+++ b/misc/libpri/pkg-plist
@@ -1,4 +1,4 @@
 include/libpri.h
 lib/libpri.a
-lib/libpri.so.1
 lib/libpri.so
+lib/libpri.so.1