Date: Wed, 24 Aug 2016 16:19:40 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420804 - head/net/asterisk13/files Message-ID: <201608241619.u7OGJebg006313@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Aug 24 16:19:39 2016 New Revision: 420804 URL: https://svnweb.freebsd.org/changeset/ports/420804 Log: Fix build on head after r303920. Added: head/net/asterisk13/files/patch-main_crypt.c (contents, props changed) Modified: head/net/asterisk13/files/patch-main__Makefile Modified: head/net/asterisk13/files/patch-main__Makefile ============================================================================== --- head/net/asterisk13/files/patch-main__Makefile Wed Aug 24 15:43:30 2016 (r420803) +++ head/net/asterisk13/files/patch-main__Makefile Wed Aug 24 16:19:39 2016 (r420804) @@ -1,14 +1,20 @@ ---- main/Makefile.orig 2016-06-23 13:47:35 UTC +--- main/Makefile.orig 2016-07-21 14:54:02 UTC +++ main/Makefile -@@ -82,6 +82,7 @@ ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) +@@ -79,9 +79,12 @@ endif + + ifeq ($(OSARCH),FreeBSD) + # -V is understood by BSD Make, not by GNU make. +- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) ++ BSDVERSION=$(OSVERSION) ++ BSDVERSION?=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) ++ CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi) AST_LIBS+=-lcrypto + AST_LIBS+=%%LIBSYSINFO%% endif ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) -@@ -351,9 +352,6 @@ else # Darwin +@@ -351,9 +354,6 @@ else # Darwin $(INSTALL) -m 755 $(ASTPJ_LIB) "$(DESTDIR)$(ASTLIBDIR)/" endif endif Added: head/net/asterisk13/files/patch-main_crypt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/asterisk13/files/patch-main_crypt.c Wed Aug 24 16:19:39 2016 (r420804) @@ -0,0 +1,11 @@ +--- main/crypt.c.orig 2016-07-21 14:54:02 UTC ++++ main/crypt.c +@@ -31,7 +31,7 @@ + ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + + #include <unistd.h> +-#if defined(HAVE_CRYPT_R) ++#if defined(HAVE_CRYPT_R) && !defined(__FreeBSD__) + #include <crypt.h> + #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608241619.u7OGJebg006313>