diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile index c94a106b983c..616431910691 100644 --- a/misc/libpri/Makefile +++ b/misc/libpri/Makefile @@ -1,22 +1,22 @@ PORTNAME= libpri -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.1 CATEGORIES= misc MASTER_SITES= http://downloads.asterisk.org/pub/telephony/libpri/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= C implementation of the Primary Rate ISDN specification WWW= https://www.asterisk.org/downloads/libpri/ LICENSE= GPLv2 USES= gmake USE_LDCONFIG= yes PLIST_FILES= include/libpri.h lib/libpri.a lib/libpri.so lib/libpri.so.1 MAKE_ARGS= INSTALL_PREFIX=${STAGEDIR}${PREFIX} ONLY_FOR_ARCHS= amd64 armv7 i386 powerpc powerpc64 powerpc64le sparc64 post-patch: ${REINPLACE_CMD} -e '/^all:/s/$$(UTILITIES)//' ${WRKSRC}/Makefile .include diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo index 689c1c293639..c9b0615bc6e1 100644 --- a/misc/libpri/distinfo +++ b/misc/libpri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544570232 -SHA256 (libpri-1.6.0.tar.gz) = 7225ea7ec334a115f9dc08e71f55589c38cb4e00b13964cd2f08cc4e6123e3f6 -SIZE (libpri-1.6.0.tar.gz) = 340578 +TIMESTAMP = 1692260005 +SHA256 (libpri-1.6.1.tar.gz) = d4d1a62766695455f1b616f5f7603458e6d23df787ebabc31ffda1c6298d0509 +SIZE (libpri-1.6.1.tar.gz) = 334119 diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile index d68dccf3a0cc..032dc86ae072 100644 --- a/misc/libpri/files/patch-Makefile +++ b/misc/libpri/files/patch-Makefile @@ -1,78 +1,78 @@ ---- Makefile.orig 2017-01-27 23:25:12.000000000 +0700 -+++ Makefile 2018-12-12 06:20:14.634544000 +0700 +--- Makefile.orig 2023-08-16 15:52:02 UTC ++++ Makefile @@ -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 - -@@ -34,7 +34,7 @@ + AR=ar +@@ -36,7 +36,7 @@ PROC?=$(shell uname -m) # 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 -SONAME:=1.4 +SONAME:=1 STATIC_LIBRARY=libpri.a DYNAMIC_LIBRARY:=libpri.so.$(SONAME) -@@ -68,10 +68,10 @@ +@@ -70,10 +70,10 @@ DYNAMIC_OBJS= \ $(STATIC_OBJS) CFLAGS ?= -g CFLAGS += $(CPPFLAGS) --CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -+CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes +-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wno-zero-length-bounds -Wno-stringop-overflow ++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-zero-length-bounds -Wno-stringop-overflow CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) -INSTALL_PREFIX=$(DESTDIR) -INSTALL_BASE=/usr +INSTALL_PREFIX=$(PREFIX) +INSTALL_BASE= libdir?=$(INSTALL_BASE)/lib ifneq ($(findstring Darwin,$(OSARCH)),) SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace -@@ -89,7 +89,7 @@ +@@ -91,7 +91,7 @@ else ifeq (${OSARCH},FreeBSD) LDCONFIG_FLAGS=-m CFLAGS += -I../zaptel -I../zapata -INSTALL_BASE=/usr/local +INSTALL_BASE= endif endif ifeq (${OSARCH},SunOS) -@@ -149,12 +149,12 @@ +@@ -151,12 +151,12 @@ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) 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)$(libdir) + $(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include + $(BSD_INSTALL_PROGRAM) $(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 $(DYNAMIC_LIBRARY) libpri.so) - install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) - if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi + $(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) + #if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi else install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY) -@@ -190,7 +190,7 @@ +@@ -192,7 +192,7 @@ MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< %.lo: %.c - $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< + $(CC) $(CFLAGS) $(MAKE_DEPS) -fPIC -c -o $@ $< $(STATIC_LIBRARY): $(STATIC_OBJS) - ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS) -@@ -198,7 +198,7 @@ + $(AR) rcs $(STATIC_LIBRARY) $(STATIC_OBJS) +@@ -200,7 +200,7 @@ $(STATIC_LIBRARY): $(STATIC_OBJS) $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . + #$(LDCONFIG) $(LDCONFIG_FLAGS) . ln -sf $(DYNAMIC_LIBRARY) libpri.so version.c: FORCE