Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 08 Jan 2006 22:27:30 -0500
From:      Diane Bruce <db@db.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gonzo@univ.kiev.ua
Subject:   ports/91543: [PATCH] misc/libpri: update to 1.2.0
Message-ID:  <E1Evngw-0004iq-7g@heceta.db.net>
Resent-Message-ID: <200601090330.k093U9A3034460@freefall.freebsd.org>

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

>Number:         91543
>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:   Mon Jan 09 03:30:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Diane Bruce
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD db.net 6.0-STABLE FreeBSD 6.0-STABLE #1: Sun Jan  1 08:37:21 EST 2006
>Description:
- Update to 1.2.0 this is needed by asterisk 1.2.1 port update coming

Added file(s):
- files/patch-mkdep

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

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- libpri-1.2.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/misc/libpri/Makefile /usr/home/db/libpri/Makefile
--- /usr/ports/misc/libpri/Makefile	Thu Oct 20 12:44:56 2005
+++ /usr/home/db/libpri/Makefile	Sun Jan  8 22:17:59 2006
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	libpri
-PORTVERSION=	1.0.9
+PORTVERSION=	1.2.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.digium.com/pub/libpri/ \
 		ftp://ftp.digium.com/pub/libpri/old/
 
-PATCHFILES=	${PORTNAME}-1.0.8-${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-RC8h
 USE_GMAKE=	yes
-INSTALLS_SHLIB= yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff -ruN --exclude=CVS /usr/ports/misc/libpri/distinfo /usr/home/db/libpri/distinfo
--- /usr/ports/misc/libpri/distinfo	Mon Jul 18 10:45:27 2005
+++ /usr/home/db/libpri/distinfo	Sun Jan  8 22:16:31 2006
@@ -1,4 +1,6 @@
-MD5 (libpri-1.0.9.tar.gz) = c0652944376f6bbe035ec578ff445625
-SIZE (libpri-1.0.9.tar.gz) = 55801
+MD5 (libpri-1.2.0.tar.gz) = e22af697ff4002944436449c1803fc57
+SHA256 (libpri-1.2.0.tar.gz) = 1c00a28f935c14a8b75d120a74a4f4766db4c50238002639efbb0e34757e0593
+SIZE (libpri-1.2.0.tar.gz) = 75899
 MD5 (libpri-1.0.8-bristuff-0.2.0-RC8h.patch.gz) = 681ad82dfc6565e61c11467199ab987b
+SHA256 (libpri-1.0.8-bristuff-0.2.0-RC8h.patch.gz) = 0ebe8417e755ab2de9ef63068bbcdb35a179191034992c6aa59e48f27241e939
 SIZE (libpri-1.0.8-bristuff-0.2.0-RC8h.patch.gz) = 30486
diff -ruN --exclude=CVS /usr/ports/misc/libpri/files/patch-Makefile /usr/home/db/libpri/files/patch-Makefile
--- /usr/ports/misc/libpri/files/patch-Makefile	Tue May 17 12:25:09 2005
+++ /usr/home/db/libpri/files/patch-Makefile	Sun Jan  8 22:16:31 2006
@@ -1,63 +1,59 @@
---- Makefile.orig	Fri Feb 25 06:05:47 2005
-+++ Makefile	Fri Feb 25 06:08:51 2005
-@@ -33,11 +33,11 @@
+--- Makefile.orig	Mon Sep 26 11:57:23 2005
++++ Makefile	Fri Dec  2 15:22:21 2005
+@@ -27,7 +27,7 @@
+ # Uncomment if you want libpri to count number of Q921/Q931 sent/received
+ #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
+ 
+-CC=gcc
++CC?=gcc
+ 
+ OSARCH=$(shell uname -s)
+ PROC?=$(shell uname -m)
+@@ -35,11 +35,11 @@
  TOBJS=testpri.o
  T2OBJS=testprilib.o
  STATIC_LIBRARY=libpri.a
 -DYNAMIC_LIBRARY=libpri.so.1.0
 +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 -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
--INSTALL_PREFIX=
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes $(ALERTING) $(LIBPRI_COUNTERS)
+ 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?=
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
 +INSTALL_PREFIX=$(PREFIX)
- ifeq (${OSARCH},Linux)
- LDCONFIG_FLAGS=-n
- else
-@@ -62,21 +62,19 @@
- 	@cvs update -d
+ INSTALL_BASE=/usr
+ SOFLAGS = -Wl,-hlibpri.so.1
+ LDCONFIG = /sbin/ldconfig
+@@ -78,20 +78,22 @@
+ 	fi
  
  install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
--	mkdir -p $(INSTALL_PREFIX)/usr/lib
--	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
+-	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
++	echo $(INSTALL_PREFIX)$(INSTALL_BASE)
 +	mkdir -p $(INSTALL_PREFIX)/lib
 +	mkdir -p $(INSTALL_PREFIX)/include
-+	$(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)/include
-+	$(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/lib
+ ifneq (${OSARCH},SunOS)
+-	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
++	echo installing libpri.h
++	install -m 644 libpri.h $(INSTALL_PREFIX)/include
++	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/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 libpri.so )
+-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
 +	( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so )
-+	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib
++	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib
+ 	if test $$(id -u) = 0; then $(LDCONFIG); fi
+ else
+-	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+-	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
+-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) )
+-	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
++	install -f $(INSTALL_PREFIX)/include -m 644 libpri.h
++	install -f $(INSTALL_PREFIX)/lib -m 755 $(DYNAMIC_LIBRARY)
++	( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) )
++	install -f $(INSTALL_PREFIX)/lib -m 644 $(STATIC_LIBRARY)
+ endif
  
  uninstall:
- 	@echo "Removing Libpri"
--	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.so.1.0
--	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.so
--	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.a
--	rm -f $(INSTALL_PREFIX)/usr/include/libpri.h
-+	rm -f $(INSTALL_PREFIX)/lib/libpri.so.1
-+	rm -f $(INSTALL_PREFIX)/lib/libpri.so
-+	rm -f $(INSTALL_PREFIX)/lib/libpri.a
-+	rm -f $(INSTALL_PREFIX)/include/libpri.h
- 
- pritest: pritest.o
- 	$(CC) -o pritest pritest.o -L. -lpri -lzap $(CFLAGS)
-@@ -101,11 +99,11 @@
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
- 	$(CC) -shared -Wl,-soname,libpri.so.1 -o $@ $(DYNAMIC_OBJS)
--	/sbin/ldconfig $(LDCONFIG_FLAGS) .
-+	#/sbin/ldconfig $(LDCONFIG_FLAGS) .
- 	ln -sf libpri.so.1 libpri.so
- 
- clean:
--	rm -f *.o *.so *.lo *.so.1 *.so.1.0
-+	rm -f *.o *.so *.lo *.so.1
- 	rm -f testpri testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
- 	rm -f pritest pridump
- 	rm -f .depend
diff -ruN --exclude=CVS /usr/ports/misc/libpri/files/patch-mkdep /usr/home/db/libpri/files/patch-mkdep
--- /usr/ports/misc/libpri/files/patch-mkdep	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/libpri/files/patch-mkdep	Sun Jan  8 22:16:31 2006
@@ -0,0 +1,8 @@
+--- mkdep.orig	Wed Nov 30 22:55:54 2005
++++ mkdep	Wed Nov 30 22:56:00 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash -
++#!/bin/sh -
+ #
+ #	$OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $
+ #	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
--- libpri-1.2.0.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?E1Evngw-0004iq-7g>