...

.gitignore

@@ -14,6 +14,7 @@
 *.log
 *.gz
 *.pc
+*.dylib
 jimsh0
 tags
 TAGS

auto.def

@@ -335,6 +335,10 @@ if {[pkg-config-init 0]} {
 	if {[opt-bool with-libcurl]} {
 		if {![pkg-config libcurl]} {
 			user-error "Unable to find libcurl"
+		} else {
+			define PKG_LIBCURL_CFLAGS [exec pkg-config --static --cflags libcurl ]
+			define PKG_LIBCURL_LDFLAGS [exec pkg-config --static  --libs-only-L libcurl ]
+			define PKG_LIBCURL_LIBS [exec pkg-config --static --libs-only-l libcurl ]
 		}
 	}
 	if {[opt-bool with-libarchive.pc]} {

external/libcurl/Makefile.autosetup

@@ -23,6 +23,7 @@ SRCS=	\
 	cookie.c \
 	curl_addrinfo.c \
 	curl_get_line.c \
+	curl_memrchr.c \
 	curl_threads.c \
 	curl_trc.c \
 	dynbuf.c \

external/libcurl/curl_config.h

@@ -417,8 +417,11 @@
 /* #undef HAVE_MACH_ABSOLUTE_TIME */
 
 /* Define to 1 if you have the memrchr function or macro. */
+#if defined(_DARWIN_C_SOURCE) || defined (__APPLE__)
+/* #undef HAVE_MEMRCHR */
+#else
 #define HAVE_MEMRCHR 1
-
+#endif
 /* Define to 1 if you have the MSG_NOSIGNAL flag. */
 #define HAVE_MSG_NOSIGNAL 1
 

libpkg/pkg_repo_create.c

@@ -397,7 +397,7 @@ pkg_create_repo_thread(void *arg)
 	return (NULL);
 }
 
-#ifdef __linux__
+#if defined (__linux__) || defined(_DARWIN_C_SOURCE) || defined (__APPLE__)
 typedef const FTSENT *FTSENTP;
 #else
 typedef const FTSENT *const FTSENTP;

src/Makefile.autosetup

@@ -84,6 +84,12 @@ OTHER_LIBS+=	@PKG_OPENSSL_LIBS@
 OTHER_LIBS+=	-lssl -lcrypto
 @endif
 
+@if PKG_LIBCURL_LIBS
+LOCAL_CFLAGS+=	@PKG_LIBCURL_CFLAGS@
+LOCAL_LDFLAGS+=	@PKG_LIBCURL_LDFLAGS@ 
+OTHER_LIBS+=	@PKG_LIBCURL_LIBS@
+@endif
+
 @if libmachista
 LOCAL_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv
 STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv