Revert "FS-9970 build debug Makefile.openbsd until it successfully builds FreeSWITCH...

This reverts commit 68ec2a68ac1f2bd8df022cd02edbab1112ef00c3.

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index 5d6e481c3c6940f2a9a18589a5d3784bc7ed2b48..121c7562ab46f332246950388eaae9a3bd81532e 100644 (file)
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -7,17 +7,18 @@
 #
 #
 
-PKG=rsync-3.1.2p0 bzip2 git gmake automake-1.15p0 libtool apr apr-util-1.5.4p1 curl flac jpeg libidn libnatpmp libogg libldns libsndfile libsrtp libvorbis lua-5.2.4p1 miniupnpc pcre spandsp speex tiff libvpx yasm nasm opus
+PKG=rsync-3.1.2p0 git automake-1.15p0 autoconf-2.69p2 libtool gmake bzip2 jpeg wget pcre speex libldns
 PREFIX=/usr/local/freeswitch
 DOWNLOAD=http://files.freeswitch.org/downloads/libs
-OPENSSL=1.0.2
+OPENSSL=1.1.0c
 LIBEDIT=20140618-3.1
+CURL=7.49.0
 
 freeswitch: has-git deps freeswitch.git/Makefile
        cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.15 LIBTOOL=/usr/local/bin/libtoolize gmake
 
 freeswitch.git/Makefile: freeswitch.git/configure
-       cd freeswitch.git && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig ./configure LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' --prefix=$(PREFIX) --disable-libyuv
+       cd freeswitch.git && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig ./configure LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' --prefix=$(PREFIX)
 
 freeswitch.git/configure: freeswitch.git/bootstrap.sh
        cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.15 LIBTOOL=/usr/local/bin/libtoolize sh bootstrap.sh
@@ -29,23 +30,31 @@ install:
        cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.15 LIBTOOL=/usr/local/bin/libtoolize gmake install cd-sounds-install cd-moh-install
 
 clean:
-       @rm -rf openssl* libedit* *~
+       @rm -rf openssl* ldns* jpeg* pcre* perl* pkg-config* speex* sqlite* libedit* curl* *~
        (cd freeswitch.git && git clean -fdx && git reset --hard HEAD && git pull)
 
 has-git:
        @git --version || PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r git
 
-deps: libedit openssl 
+deps: libedit openssl curl
        @PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r $(PKG)
 
 openssl: openssl-$(OPENSSL)/.done
 openssl-$(OPENSSL)/.done: openssl-$(OPENSSL)
 openssl-$(OPENSSL):
-       (test -d $@) || (ftp -o $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./Configure --prefix=$(PREFIX) BSD-x86_64 shared && make && doas make install && touch .done)
+       (test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
+       (cd $@ && ./Configure --prefix=$(PREFIX) BSD-x86_64 shared && make && sudo make install && touch .done)
 
 libedit: libedit-$(LIBEDIT)/Makefile
 libedit-$(LIBEDIT)/Makefile: libedit-$(LIBEDIT)
 libedit-$(LIBEDIT):
-       (test -d $@) || (ftp -o $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
-       (cd $@ && ./configure --prefix=$(PREFIX) && make && doas make install)
+       (test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
+       (cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
+
+curl: curl-$(CURL)/.done
+curl-$(CURL)/.done: curl-$(CURL)
+curl-$(CURL):
+       (test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
+       (rm -rf $(PREFIX)/lib/libcurl.*)
+       (cd $@ && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig:$PKG_CONFIG_PATH LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath-link=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
+