4 files changed, 27 insertions, 26 deletions

diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile
index eeae4eaf8ebb..65ec2eee410c 100644
--- a/misc/libpri/Makefile
+++ b/misc/libpri/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.4.12
+PORTVERSION=	1.4.13
 CATEGORIES=	misc
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/libpri/releases/
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C implementation of the Primary Rate ISDN specification
 
+LICENSE=	GPLv2
+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-PLIST_FILES=	include/libpri.h lib/libpri.a lib/libpri.so \
-		lib/libpri.so.1
+PLIST_FILES=	include/libpri.h lib/libpri.a lib/libpri.so lib/libpri.so.1
 
 ONLY_FOR_ARCHS=	amd64 i386 sparc64
 
+post-patch:
+	${REINPLACE_CMD} -e '/^all:/s/$$(UTILITIES)//' ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo
index c7c80046d6ac..c9c848eeab86 100644
--- a/misc/libpri/distinfo
+++ b/misc/libpri/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpri-1.4.12.tar.gz) = c0e170a742ed5d19515c99472fe79a467522355b3c24e4f7359d667b7d756e75
-SIZE (libpri-1.4.12.tar.gz) = 339669
+SHA256 (libpri-1.4.13.tar.gz) = 5c17611b7294c83f20fac5dc5cd9930de684a2f84627efb15ef6742b68df1ebf
+SIZE (libpri-1.4.13.tar.gz) = 338432
diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile
index 6a4c5d209252..5c79891aef54 100644
--- a/misc/libpri/files/patch-Makefile
+++ b/misc/libpri/files/patch-Makefile
@@ -1,11 +1,5 @@
---- Makefile.orig	2011-02-01 06:37:49.000000000 +0600
-+++ Makefile	2011-09-16 14:25:02.000000000 +0700
-@@ -1,4 +1,4 @@
--#
-+	#
- # libpri: An implementation of Primary Rate ISDN
- #
- # Written by Mark Spencer <markster@linux-support.net>
+--- Makefile.orig	2012-09-26 22:46:23.000000000 +0700
++++ Makefile	2012-11-03 17:39:22.000000000 +0700
 @@ -24,7 +24,7 @@
  # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING
  #ALERTING=-DALERTING_NO_PROGRESS
@@ -24,20 +18,21 @@
  
  STATIC_LIBRARY=libpri.a
  DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
-@@ -90,9 +90,9 @@
- 	rose_qsig_mwi.lo \
- 	rose_qsig_name.lo \
- 	version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+@@ -67,10 +67,10 @@
+ DYNAMIC_OBJS= \
+ 	$(STATIC_OBJS)
+ CFLAGS ?= -g
+-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
 -INSTALL_PREFIX=$(DESTDIR)
 -INSTALL_BASE=/usr
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
 +INSTALL_PREFIX=$(PREFIX)
 +INSTALL_BASE=
  libdir?=$(INSTALL_BASE)/lib
  ifneq ($(findstring Darwin,$(OSARCH)),)
-   SOFLAGS=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-@@ -110,7 +110,7 @@
+   SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+@@ -88,7 +88,7 @@
  ifeq (${OSARCH},FreeBSD)
  LDCONFIG_FLAGS=-m
  CFLAGS += -I../zaptel -I../zapata
@@ -46,7 +41,7 @@
  endif
  endif
  ifeq (${OSARCH},SunOS)
-@@ -168,12 +168,12 @@
+@@ -148,12 +148,12 @@
  	mkdir -p $(INSTALL_PREFIX)$(libdir)
  	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
  ifneq (${OSARCH},SunOS)
@@ -55,7 +50,7 @@
 +	$(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
- 	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+ 	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so)
 -	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
 -	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
 +	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
@@ -63,7 +58,7 @@
  else
  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
  	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
-@@ -209,7 +209,7 @@
+@@ -189,7 +189,7 @@
  	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
  
  %.lo: %.c
@@ -72,12 +67,12 @@
  
  $(STATIC_LIBRARY): $(STATIC_OBJS)
  	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
-@@ -217,7 +217,7 @@
+@@ -197,7 +197,7 @@
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
 -	$(LDCONFIG) $(LDCONFIG_FLAGS) .
 +	#$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf libpri.so.$(SONAME) libpri.so
+ 	ln -sf $(DYNAMIC_LIBRARY) libpri.so
  
  version.c: FORCE
diff --git a/misc/libpri/pkg-descr b/misc/libpri/pkg-descr
index 22991e0164ee..563ccdeb333e 100644
--- a/misc/libpri/pkg-descr
+++ b/misc/libpri/pkg-descr
@@ -2,3 +2,5 @@ The libpri is a C implementation of the Primary Rate ISDN specification.
 It was based on the Bellcore specification SR-NWT-002343 for National 
 ISDN.  As of May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, 
 and Lucent 5E C ustom protocols on switches from Nortel and Lucent.
+
+WWW: http://www.asterisk.org/downloads/libpri/