diff options
Diffstat (limited to 'misc/libpri/files')
| -rw-r--r-- | misc/libpri/files/patch-Makefile | 92 | ||||
| -rw-r--r-- | misc/libpri/files/patch-mkdep | 8 |
2 files changed, 57 insertions, 43 deletions
diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile index 6ab85c6..087b757 100644 --- a/misc/libpri/files/patch-Makefile +++ b/misc/libpri/files/patch-Makefile @@ -1,63 +1,69 @@ ---- Makefile.orig Fri Feb 25 06:05:47 2005 -+++ Makefile Fri Feb 25 06:08:51 2005 -@@ -33,11 +33,11 @@ + +$FreeBSD$ + +--- Makefile.orig ++++ Makefile +@@ -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 +@@ -81,20 +81,19 @@ + 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 + mkdir -p $(INSTALL_PREFIX)/lib + mkdir -p $(INSTALL_PREFIX)/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 libpri.so ) +- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib +- if test $$(id -u) = 0; then $(LDCONFIG); 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 + 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 @@ +@@ -130,7 +129,6 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) - $(CC) -shared -Wl,-soname,libpri.so.1 -o $@ $(DYNAMIC_OBJS) -- /sbin/ldconfig $(LDCONFIG_FLAGS) . -+ #/sbin/ldconfig $(LDCONFIG_FLAGS) . + $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) +- $(LDCONFIG) $(LDCONFIG_FLAGS) . ln -sf libpri.so.1 libpri.so + $(SOSLINK) - 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 --git a/misc/libpri/files/patch-mkdep b/misc/libpri/files/patch-mkdep new file mode 100644 index 0000000..3d8849b8 --- /dev/null +++ b/misc/libpri/files/patch-mkdep @@ -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 $ |
