4 files changed, 18 insertions, 28 deletions

diff --git a/misc/libpri2/Makefile b/misc/libpri2/Makefile
index 2fe90909e54c..99dd2a02bf96 100644
--- a/misc/libpri2/Makefile
+++ b/misc/libpri2/Makefile
@@ -6,14 +6,20 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.4
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/libpri/ \
 		ftp://ftp.asterisk.org/pub/libpri/old/
 
+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-RC7f
 USE_GMAKE=	yes
 INSTALLS_SHLIB= yes
 
@@ -23,7 +29,4 @@ INSTALLS_SHLIB= yes
 BROKEN=		"Does not compile on alpha"
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -name \*.orig -or -name \*.bak -delete
-
 .include <bsd.port.post.mk>
diff --git a/misc/libpri2/distinfo b/misc/libpri2/distinfo
index 5ba1dbf0365f..c11747653367 100644
--- a/misc/libpri2/distinfo
+++ b/misc/libpri2/distinfo
@@ -1,2 +1,4 @@
-MD5 (libpri-1.0.2.tar.gz) = 374c089bf3bdee3f8e2d7b315190022e
-SIZE (libpri-1.0.2.tar.gz) = 55451
+MD5 (libpri-1.0.4.tar.gz) = 82f3ac51101b456f9f916ed1ca774ebc
+SIZE (libpri-1.0.4.tar.gz) = 55677
+MD5 (libpri-1.0.4-bristuff-0.2.0-RC7f.patch.gz) = 3baf8a992d4aade33ed0347a994a3c94
+SIZE (libpri-1.0.4-bristuff-0.2.0-RC7f.patch.gz) = 28966
diff --git a/misc/libpri2/files/patch-Makefile b/misc/libpri2/files/patch-Makefile
index 69c9ec960f8f..6ab85c668787 100644
--- a/misc/libpri2/files/patch-Makefile
+++ b/misc/libpri2/files/patch-Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Fri Feb 25 06:05:47 2005
++++ Makefile	Fri Feb 25 06:08:51 2005
 @@ -33,11 +33,11 @@
  TOBJS=testpri.o
  T2OBJS=testprilib.o
@@ -11,14 +8,14 @@ $FreeBSD$
 +DYNAMIC_LIBRARY=libpri.so.1
  STATIC_OBJS=pri.o q921.o prisched.o q931.o
  DYNAMIC_OBJS=pri.lo q921.lo prisched.lo q931.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+-CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
 -INSTALL_PREFIX=
-+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes $(ALERTING) $(LIBPRI_COUNTERS)
 +INSTALL_PREFIX=$(PREFIX)
  ifeq (${OSARCH},Linux)
  LDCONFIG_FLAGS=-n
  else
-@@ -62,20 +62,19 @@
+@@ -62,21 +62,19 @@
  	@cvs update -d
  
  install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
@@ -26,6 +23,7 @@ $FreeBSD$
 -	mkdir -p $(INSTALL_PREFIX)/usr/include
 -	install -m 644 libpri.h $(INSTALL_PREFIX)/usr/include
 -	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/usr/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)/usr/lib ; ln -sf libpri.so.1 libpri.so )
 -	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)/usr/lib
 -	/sbin/ldconfig
@@ -49,7 +47,7 @@ $FreeBSD$
  
  pritest: pritest.o
  	$(CC) -o pritest pritest.o -L. -lpri -lzap $(CFLAGS)
-@@ -100,11 +99,11 @@
+@@ -101,11 +99,11 @@
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) -shared -Wl,-soname,libpri.so.1 -o $@ $(DYNAMIC_OBJS)
diff --git a/misc/libpri2/files/patch-pri_q921.h b/misc/libpri2/files/patch-pri_q921.h
deleted file mode 100644
index 8cb788d6d722..000000000000
--- a/misc/libpri2/files/patch-pri_q921.h
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur pri_q921.h.orig pri_q921.h
---- pri_q921.h.orig	2004-10-02 17:55:20.000000000 +0300
-+++ pri_q921.h	2004-10-19 19:12:38.000000000 +0300
-@@ -30,6 +30,9 @@
- #include <endian.h>
- #elif defined(__FreeBSD__)
- #include <sys/endian.h>
-+#define __BYTE_ORDER _BYTE_ORDER
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
- #endif
- 
- /* Timer values */