Attachment 99061 Details for Bug 138068 – patch-libpri.diff

[patch] patch-libpri.diff

patch-libpri.diff (text/plain), 6.08 KB, created by RIchard Neese on 2009-08-24 14:35:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: RIchard Neese

Created: 2009-08-24 14:35:03 UTC

Size: 6.08 KB

patch

obsolete

>diff -ruN /usr/ports/misc/libpri/Makefile libpri/Makefile
>--- /usr/ports/misc/libpri/Makefile	2009-02-03 20:03:34.000000000 -0700
>+++ libpri/Makefile	2009-07-27 12:27:32.000000000 -0600
>@@ -2,14 +2,13 @@
> # Date created:				25 Oct 2004
> # Whom:					Alexander Timoshenko <gonzo@univ.kiev.ua>
> #
>-# $FreeBSD: ports/misc/libpri/Makefile,v 1.17 2009/02/04 03:03:34 pgollucci Exp $
>+# $FreeBSD: ports/misc/libpri/Makefile,v 1.16 2007/07/22 10:36:56 sobomax Exp $
> #
> 
> PORTNAME=	libpri
>-PORTVERSION=	1.4.1
>+PORTVERSION=	1.4.10.1
> CATEGORIES=	misc
>-MASTER_SITES=	http://downloads.digium.com/pub/libpri/old/
>-
>+MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/libpri/releases/
> MAINTAINER=	sobomax@FreeBSD.org
> COMMENT=	A C implementation of the Primary Rate ISDN specification
> 
>diff -ruN /usr/ports/misc/libpri/distinfo libpri/distinfo
>--- /usr/ports/misc/libpri/distinfo	2007-07-22 04:36:56.000000000 -0600
>+++ libpri/distinfo	2009-08-18 01:42:55.000000000 -0600
>@@ -1,3 +1,3 @@
>-MD5 (libpri-1.4.1.tar.gz) = 9e5da1f2267711d9aaaf91ffa925b219
>-SHA256 (libpri-1.4.1.tar.gz) = 2c8b33213d68a187fb25430c39d79db04bdfc08c769bdada97ab00f521e8ec84
>-SIZE (libpri-1.4.1.tar.gz) = 81178
>+MD5 (libpri-1.4.10.1.tar.gz) = 55ce81cd0b2cf0c40e287fc5bd5b4883
>+SHA256 (libpri-1.4.10.1.tar.gz) = ac500e0e0b4f150c8741e939d289fcbcaa653dfff67cdec11f18417b92f76d21
>+SIZE (libpri-1.4.10.1.tar.gz) = 97607
>diff -ruN /usr/ports/misc/libpri/files/patch-Makefile libpri/files/patch-Makefile
>--- /usr/ports/misc/libpri/files/patch-Makefile	2007-07-22 04:36:56.000000000 -0600
>+++ libpri/files/patch-Makefile	2009-08-18 05:06:19.000000000 -0600
>@@ -1,27 +1,27 @@
>-
>-$FreeBSD: ports/misc/libpri/files/patch-Makefile,v 1.8 2007/07/22 10:36:56 sobomax Exp $
>-
>---- Makefile.orig
>-+++ Makefile
>-@@ -27,19 +27,19 @@
>+--- Makefile.orig	2009-08-18 01:46:16.000000000 -0600
>++++ Makefile	2009-08-18 02:40:23.000000000 -0600
>+@@ -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
>+ GREP=grep
>+ AWK=awk
>  
>- OSARCH=$(shell uname -s)
>- PROC?=$(shell uname -m)
>+@@ -40,14 +40,13 @@
>+ SONAME:=1.4
>  
>  STATIC_LIBRARY=libpri.a
>--DYNAMIC_LIBRARY=libpri.so.1.0
>-+DYNAMIC_LIBRARY=libpri.so.1
>- 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)
>+-DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
>++DYNAMIC_LIBRARY:=libpri.so.1
>+ 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)
> -INSTALL_PREFIX=$(DESTDIR)
> -INSTALL_BASE=/usr
>--SOFLAGS = -Wl,-hlibpri.so.1.0
>+-libdir?=$(INSTALL_BASE)/lib
>+-SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
> +CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
> +INSTALL_PREFIX=$(PREFIX)
> +INSTALL_BASE=
>@@ -29,7 +29,7 @@
>  LDCONFIG = /sbin/ldconfig
>  ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
>  LDCONFIG_FLAGS=-n
>-@@ -47,7 +47,7 @@
>+@@ -55,7 +54,7 @@
>  ifeq (${OSARCH},FreeBSD)
>  LDCONFIG_FLAGS=-m
>  CFLAGS += -I../zaptel -I../zapata
>@@ -38,32 +38,43 @@
>  endif
>  endif
>  ifeq (${OSARCH},SunOS)
>-@@ -80,12 +80,11 @@
>- 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
>+@@ -100,22 +99,22 @@
>+ 	mkdir -p $(INSTALL_PREFIX)$(libdir)
>  	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 /sbin/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) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
>+-	install -m 755 $(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)
>+-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
>+-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
> +	echo installing libpri.h
> +	$(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
> +	$(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
> +	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
> +	$(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
>++
>  else
>  	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
>- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
>-@@ -126,10 +125,6 @@
>+ 	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
>+-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
>++	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.1 libpri.so)
>+ 	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
>+ endif
>+ 
>+ uninstall:
>+ 	@echo "Removing Libpri"
>+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
>++	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.1
>+ 	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
>+ 	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
>+ 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
>+@@ -146,8 +145,6 @@
>  
>  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
>  	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
> -	$(LDCONFIG) $(LDCONFIG_FLAGS) .
>--	ln -sf libpri.so.1.0 libpri.so
>--	ln -sf libpri.so.1.0 libpri.so.1
>--	$(SOSLINK)
>+-	ln -sf libpri.so.$(SONAME) libpri.so
>  
>- clean:
>- 	rm -f *.o *.so *.lo *.so.1 *.so.1.0
>+ version.c: FORCE
>+ 	@build_tools/make_version_c > $@.tmp

Actions: View | Diff

Attachments on bug 138068: 99060 | 99061