- Update to 1.4.11.4.

- Take maintainership (see [1])

PR:		150795
Submitted by:	Florian Smeets

3 files changed, 19 insertions, 20 deletions

diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile
index 000570459a21..6729ea62a9c7 100644
--- a/misc/libpri/Makefile
+++ b/misc/libpri/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.4.10.2
+PORTVERSION=	1.4.11.4
 CATEGORIES=	misc
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/libpri/releases/
 
-MAINTAINER=	sobomax@FreeBSD.org
+MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C implementation of the Primary Rate ISDN specification
 
 USE_GMAKE=	yes
diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo
index 5b304e3766ac..a541fc25dc0c 100644
--- a/misc/libpri/distinfo
+++ b/misc/libpri/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpri-1.4.10.2.tar.gz) = dc1523d8ee027cd62f20fc6cc9727489
-SHA256 (libpri-1.4.10.2.tar.gz) = d2fcf66cb45fe0358936e14977ab5b9276c67fe6efb3ccbb5d70cbc303c86ce9
-SIZE (libpri-1.4.10.2.tar.gz) = 96019
+MD5 (libpri-1.4.11.4.tar.gz) = db12da6a9365231e15669ee0f2f34cc9
+SHA256 (libpri-1.4.11.4.tar.gz) = 93332cda6f5eacb18efde21bf3a5e67fcfef79d0f62333239c428ffb8ecbdcca
+SIZE (libpri-1.4.11.4.tar.gz) = 230748
diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile
index 98a81846aa93..7f0ab9f7291e 100644
--- a/misc/libpri/files/patch-Makefile
+++ b/misc/libpri/files/patch-Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	2010-02-11 23:35:49.000000000 +0600
++++ Makefile	2010-10-10 12:40:22.000000000 +0700
 @@ -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$
  GREP=grep
  AWK=awk
  
-@@ -37,15 +37,15 @@
+@@ -37,7 +37,7 @@
  # SONAME version; should be changed on every ABI change
  # please don't change it needlessly; it's perfectly fine to have a SONAME
  # of 1.2 and a version of 1.4.x
@@ -21,18 +18,20 @@ $FreeBSD$
  
  STATIC_LIBRARY=libpri.a
  DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
- STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
- DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+@@ -83,9 +83,9 @@
+ 	rose_qsig_mwi.lo \
+ 	rose_qsig_name.lo \
+ 	version.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
 -INSTALL_PREFIX=$(DESTDIR)
 -INSTALL_BASE=/usr
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
 +INSTALL_PREFIX=$(PREFIX)
 +INSTALL_BASE=
  libdir?=$(INSTALL_BASE)/lib
  SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
  LDCONFIG = /sbin/ldconfig
-@@ -55,7 +55,7 @@
+@@ -95,7 +95,7 @@
  ifeq (${OSARCH},FreeBSD)
  LDCONFIG_FLAGS=-m
  CFLAGS += -I../zaptel -I../zapata
@@ -41,7 +40,7 @@ $FreeBSD$
  endif
  endif
  ifeq (${OSARCH},SunOS)
-@@ -100,12 +100,12 @@
+@@ -147,12 +147,12 @@
  	mkdir -p $(INSTALL_PREFIX)$(libdir)
  	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
  ifneq (${OSARCH},SunOS)
@@ -49,7 +48,7 @@ $FreeBSD$
 -	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
 +	$(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 +	$(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
- 	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
+ 	#if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
  	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
 -	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
 -	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
@@ -58,7 +57,7 @@ $FreeBSD$
  else
  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
  	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
-@@ -138,7 +138,7 @@
+@@ -188,7 +188,7 @@
  	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
  
  %.lo: %.c
@@ -67,7 +66,7 @@ $FreeBSD$
  
  $(STATIC_LIBRARY): $(STATIC_OBJS)
  	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
-@@ -146,7 +146,7 @@
+@@ -196,7 +196,7 @@
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)