Add back bristuff 0.3.0-1p after repo-copy.

Sponsored by:	Ethon Technologies

5 files changed, 32 insertions, 27 deletions

diff --git a/misc/Makefile b/misc/Makefile
index a7610172cd38..0bd42b90f1a7 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -293,6 +293,7 @@
     SUBDIR += libhome
     SUBDIR += libmcal
     SUBDIR += libpri
+    SUBDIR += libpri-bristuff
     SUBDIR += libutf
     SUBDIR += lifelines
     SUBDIR += lile
diff --git a/misc/libpri-bristuff/Makefile b/misc/libpri-bristuff/Makefile
index de417c50ce4c..805564069113 100644
--- a/misc/libpri-bristuff/Makefile
+++ b/misc/libpri-bristuff/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	libpri
 PORTVERSION=	1.2.2
-PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.digium.com/pub/libpri/ \
 		ftp://ftp.digium.com/pub/libpri/old/
 
-#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-1l
+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-1p
 
 MAINTAINER=	gonzo@univ.kiev.ua
 COMMENT=	A C implementation of the Primary Rate ISDN specification
diff --git a/misc/libpri-bristuff/distinfo b/misc/libpri-bristuff/distinfo
index cfa28374603b..0d57dd38b286 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-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
+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
diff --git a/misc/libpri-bristuff/files/patch-Makefile b/misc/libpri-bristuff/files/patch-Makefile
index c274238c5b41..bb5739e909c7 100644
--- a/misc/libpri-bristuff/files/patch-Makefile
+++ b/misc/libpri-bristuff/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Wed Jan 11 02:19:14 2006
-+++ Makefile	Wed Apr 26 02:47:21 2006
-@@ -27,7 +27,7 @@
+--- 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
  
@@ -9,26 +9,27 @@
  
  OSARCH=$(shell uname -s)
  PROC?=$(shell uname -m)
-@@ -35,13 +35,13 @@
+ 
  TOBJS=testpri.o
  T2OBJS=testprilib.o
- STATIC_LIBRARY=libpri.a
+-STATIC_LIBRARY=libpri.a
 -DYNAMIC_LIBRARY=libpri.so.1.0
-+DYNAMIC_LIBRARY=libpri.so.1
++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 -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+-CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB
 -INSTALL_PREFIX?=
 -INSTALL_BASE=/usr
 -SOFLAGS = -Wl,-hlibpri.so.1.0
-+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?=$(PREFIX)
 +INSTALL_BASE=
-+SOFLAGS = -Wl,-hlibpri.so.1
++SOFLAGS = -Wl,-hlibpri-bristuff.so.1
  LDCONFIG = /sbin/ldconfig
  ifeq (${OSARCH},Linux)
  LDCONFIG_FLAGS=-n
-@@ -84,12 +84,11 @@
+@@ -84,14 +84,13 @@
  	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
  	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
  ifneq (${OSARCH},SunOS)
@@ -38,14 +39,17 @@
 -	( 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
-+	$(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)/include
++	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.so.1 libpri.so )
++	( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri-bristuff.so.1 libpri-bristuff.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)/include -m 644 libpri.h
++	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h -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 @@
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
diff --git a/misc/libpri-bristuff/pkg-plist b/misc/libpri-bristuff/pkg-plist
index e552b67c0b2a..2a12bdd75280 100644
--- a/misc/libpri-bristuff/pkg-plist
+++ b/misc/libpri-bristuff/pkg-plist
@@ -1,4 +1,4 @@
-include/libpri.h
-lib/libpri.a
-lib/libpri.so
-lib/libpri.so.1
+include/libpri-bristuff.h
+lib/libpri-bristuff.a
+lib/libpri-bristuff.so
+lib/libpri-bristuff.so.1