aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2011-09-16 15:42:13 +0800
committerfjoe <fjoe@FreeBSD.org>2011-09-16 15:42:13 +0800
commit3cc8d4c2731bdd7f9dfc94d70545c26417936f3e (patch)
tree3415499f6259daaa67bb802c70968f2a5aa9e1c0
parentcf4879adf36243a362e965fb33cd8fce611f7b92 (diff)
downloadfreebsd-ports-gnome-3cc8d4c2731bdd7f9dfc94d70545c26417936f3e.tar.gz
freebsd-ports-gnome-3cc8d4c2731bdd7f9dfc94d70545c26417936f3e.tar.zst
freebsd-ports-gnome-3cc8d4c2731bdd7f9dfc94d70545c26417936f3e.zip
Update to 1.4.12.
-rw-r--r--misc/libpri/Makefile2
-rw-r--r--misc/libpri/distinfo4
-rw-r--r--misc/libpri/files/patch-Makefile38
3 files changed, 25 insertions, 19 deletions
diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile
index 86f3625234ae..eeae4eaf8ebb 100644
--- a/misc/libpri/Makefile
+++ b/misc/libpri/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libpri
-PORTVERSION= 1.4.11.5
+PORTVERSION= 1.4.12
CATEGORIES= misc
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/libpri/releases/
diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo
index 9bdb6d78fa2e..c7c80046d6ac 100644
--- a/misc/libpri/distinfo
+++ b/misc/libpri/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpri-1.4.11.5.tar.gz) = f72f0bbf9115be939ccf24ebd83a3a1482603743dff91952d8afacb16b954e6f
-SIZE (libpri-1.4.11.5.tar.gz) = 235367
+SHA256 (libpri-1.4.12.tar.gz) = c0e170a742ed5d19515c99472fe79a467522355b3c24e4f7359d667b7d756e75
+SIZE (libpri-1.4.12.tar.gz) = 339669
diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile
index 7f0ab9f7291e..6a4c5d209252 100644
--- a/misc/libpri/files/patch-Makefile
+++ b/misc/libpri/files/patch-Makefile
@@ -1,15 +1,21 @@
---- 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
+--- 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>
+@@ -24,7 +24,7 @@
+ # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING
+ #ALERTING=-DALERTING_NO_PROGRESS
-CC=gcc
+CC?=gcc
GREP=grep
AWK=awk
-@@ -37,7 +37,7 @@
+@@ -34,7 +34,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
@@ -18,20 +24,20 @@
STATIC_LIBRARY=libpri.a
DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
-@@ -83,9 +83,9 @@
+@@ -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_COUNTERS) $(LIBPRI_OPT)
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
-INSTALL_PREFIX=$(DESTDIR)
-INSTALL_BASE=/usr
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
++CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+INSTALL_PREFIX=$(PREFIX)
+INSTALL_BASE=
libdir?=$(INSTALL_BASE)/lib
- SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
- LDCONFIG = /sbin/ldconfig
-@@ -95,7 +95,7 @@
+ 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 @@
ifeq (${OSARCH},FreeBSD)
LDCONFIG_FLAGS=-m
CFLAGS += -I../zaptel -I../zapata
@@ -40,7 +46,7 @@
endif
endif
ifeq (${OSARCH},SunOS)
-@@ -147,12 +147,12 @@
+@@ -168,12 +168,12 @@
mkdir -p $(INSTALL_PREFIX)$(libdir)
mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
ifneq (${OSARCH},SunOS)
@@ -57,7 +63,7 @@
else
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
-@@ -188,7 +188,7 @@
+@@ -209,7 +209,7 @@
$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
%.lo: %.c
@@ -66,10 +72,10 @@
$(STATIC_LIBRARY): $(STATIC_OBJS)
ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
-@@ -196,7 +196,7 @@
+@@ -217,7 +217,7 @@
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
+ $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
- $(LDCONFIG) $(LDCONFIG_FLAGS) .
+ #$(LDCONFIG) $(LDCONFIG_FLAGS) .
ln -sf libpri.so.$(SONAME) libpri.so