Index: head/misc/libpri/Makefile =================================================================== --- head/misc/libpri/Makefile (revision 487334) +++ head/misc/libpri/Makefile (revision 487335) @@ -1,24 +1,24 @@ # Created by: Alexander Timoshenko # $FreeBSD$ PORTNAME= libpri -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 CATEGORIES= misc MASTER_SITES= http://downloads.asterisk.org/pub/telephony/libpri/releases/ MAINTAINER= fjoe@FreeBSD.org COMMENT= C implementation of the Primary Rate ISDN specification 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 i386 sparc64 post-patch: ${REINPLACE_CMD} -e '/^all:/s/$$(UTILITIES)//' ${WRKSRC}/Makefile .include Index: head/misc/libpri/distinfo =================================================================== --- head/misc/libpri/distinfo (revision 487334) +++ head/misc/libpri/distinfo (revision 487335) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475599827 -SHA256 (libpri-1.5.0.tar.gz) = ee224bc4aa65c54546bd09675c3f0b71817ce9e277332bce86989d8dcd556a24 -SIZE (libpri-1.5.0.tar.gz) = 340683 +TIMESTAMP = 1544570232 +SHA256 (libpri-1.6.0.tar.gz) = 7225ea7ec334a115f9dc08e71f55589c38cb4e00b13964cd2f08cc4e6123e3f6 +SIZE (libpri-1.6.0.tar.gz) = 340578 Index: head/misc/libpri/files/patch-Makefile =================================================================== --- head/misc/libpri/files/patch-Makefile (revision 487334) +++ head/misc/libpri/files/patch-Makefile (revision 487335) @@ -1,78 +1,78 @@ ---- Makefile.orig 2012-09-26 22:46:23.000000000 +0700 -+++ Makefile 2012-11-03 17:39:22.000000000 +0700 +--- Makefile.orig 2017-01-27 23:25:12.000000000 +0700 ++++ Makefile 2018-12-12 06:20:14.634544000 +0700 @@ -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 @@ # 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) -@@ -67,10 +67,10 @@ - DYNAMIC_OBJS= \ +@@ -68,10 +68,10 @@ $(STATIC_OBJS) CFLAGS ?= -g + CFLAGS += $(CPPFLAGS) -CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes +CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes 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 -@@ -88,7 +88,7 @@ +@@ -89,7 +89,7 @@ ifeq (${OSARCH},FreeBSD) LDCONFIG_FLAGS=-m CFLAGS += -I../zaptel -I../zapata -INSTALL_BASE=/usr/local +INSTALL_BASE= endif endif ifeq (${OSARCH},SunOS) -@@ -148,12 +148,12 @@ +@@ -149,12 +149,12 @@ 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) -@@ -189,7 +189,7 @@ +@@ -190,7 +190,7 @@ $(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) -@@ -197,7 +197,7 @@ +@@ -198,7 +198,7 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . + #$(LDCONFIG) $(LDCONFIG_FLAGS) . ln -sf $(DYNAMIC_LIBRARY) libpri.so version.c: FORCE