Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Jun 2006 17:20:54 +0100 (BST)
From:      Thomas Sandford <freebsduser@paradisegreen.co.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gonzo@univ.kiev.ua
Subject:   ports/98499: [PATCH] misc/libpri: update to 1.2.0
Message-ID:  <200606041620.k54GKs88050983@mail.paradisegreen.co.uk>
Resent-Message-ID: <200606041630.k54GUJBU039280@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         98499
>Category:       ports
>Synopsis:       [PATCH] misc/libpri: update to 1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 04 16:30:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Sandford
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD almaz.paradisegreen.co.uk 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Sun May 15 12:31:08 BST 2005 root@almaz.paradisegreen.co.uk:/usr/src/sys/i386/compile/SMP i386

>Description:
- Update to 1.2.3

Port maintainer (gonzo@univ.kiev.ua) is cc'd.

libpri appears, from basic testing, to be compatible with the existing FreeBSD
port of asterisk (1.2.7.1)

I have taken the opportunity to remove altogether the remaining vestiges of
the bristuff patches (now in a separate port).

>How-To-Repeat:
>Fix:

--- libpri-1.2.3.patch begins here ---
diff -ruN libpri/Makefile libpri-tdgs/Makefile
--- libpri/Makefile	Thu Apr 27 14:08:35 2006
+++ libpri-tdgs/Makefile	Sun Jun  4 14:29:34 2006
@@ -6,17 +6,10 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 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
 
 MAINTAINER=	gonzo@univ.kiev.ua
 COMMENT=	A C implementation of the Primary Rate ISDN specification
diff -ruN libpri/distinfo libpri-tdgs/distinfo
--- libpri/distinfo	Wed Mar 15 08:09:23 2006
+++ libpri-tdgs/distinfo	Sun Jun  4 14:29:47 2006
@@ -1,6 +1,3 @@
-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.3.tar.gz) = f365d9ee29a7253d605729a6d07ebfff
+SHA256 (libpri-1.2.3.tar.gz) = f4ca5d72aa4b5e5c99c4e1a9de7235af5ed12b51a20dd757f071f5d7cf9d0fd0
+SIZE (libpri-1.2.3.tar.gz) = 76348
diff -ruN libpri/files/patch-Makefile libpri-tdgs/files/patch-Makefile
--- libpri/files/patch-Makefile	Wed Apr 26 12:24:42 2006
+++ libpri-tdgs/files/patch-Makefile	Sun Jun  4 15:05:34 2006
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Jan 11 02:19:14 2006
-+++ Makefile	Wed Apr 26 02:47:21 2006
+--- Makefile.orig	Sun Apr 30 16:17:47 2006
++++ Makefile	Sun Jun  4 15:02:13 2006
 @@ -27,7 +27,7 @@
  # Uncomment if you want libpri to count number of Q921/Q931 sent/received
  #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
@@ -18,7 +18,7 @@
  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)
--INSTALL_PREFIX?=
+-INSTALL_PREFIX=$(DESTDIR)
 -INSTALL_BASE=/usr
 -SOFLAGS = -Wl,-hlibpri.so.1.0
 +CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
@@ -26,27 +26,30 @@
 +INSTALL_BASE=
 +SOFLAGS = -Wl,-hlibpri.so.1
  LDCONFIG = /sbin/ldconfig
- ifeq (${OSARCH},Linux)
+ ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
  LDCONFIG_FLAGS=-n
-@@ -84,12 +84,11 @@
- 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+@@ -81,15 +81,12 @@
+ 	fi
+ 
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+-	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
  ifneq (${OSARCH},SunOS)
 -	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 -	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/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)$(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
+-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
 +	echo installing libpri.h
-+	$(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)/include
-+	$(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/lib
-+	( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so )
-+	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib
++	$(BSD_INSTALL_DATA) libpri.h $(PREFIX)/include
++	$(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(PREFIX)/lib
++	( cd $(PREFIX)/lib ; ln -sf libpri.so.1 libpri.so )
++	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(PREFIX)/lib
  else
  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
-@@ -130,7 +129,6 @@
+@@ -130,7 +127,6 @@
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
--- libpri-1.2.3.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606041620.k54GKs88050983>