<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4728a4ecbe1eae99bd1d28ace943831b73900467">https://github.com/macports/macports-ports/commit/4728a4ecbe1eae99bd1d28ace943831b73900467</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4728a4ecbe1eae99bd1d28ace943831b73900467
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Apr 20 22:24:11 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> libpdel: update to 0.6.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also incorporate FreeBSD patches.
</span>---
devel/libpdel/Portfile | 42 +++++-----
devel/libpdel/files/GNUmakefile.patch | 34 ++++++++
devel/libpdel/files/http_http_server.patch | 11 +++
devel/libpdel/files/http_servlet_file.c.patch | 11 +++
devel/libpdel/files/patch-GNUmakefile | 90 ----------------------
.../files/patch-http_servlet_http_servlet_file.c | 28 -------
devel/libpdel/files/pd_port.h.patch | 22 ++++++
devel/libpdel/files/ppp_ppp__msoft.c.patch | 32 ++++++++
8 files changed, 132 insertions(+), 138 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/Portfile b/devel/libpdel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f14e80..04218e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libpdel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpdel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,7 @@
</span> PortSystem 1.0
name libpdel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.5.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.6.1
</span> categories devel www
license Permissive BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,33 +30,36 @@ long_description The Packet Design Embedded Library (PDEL) is a kitchen \
</span> - Filesystem mounting/unmounting \
- String quoting/parsing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.dellroad.org/pdel/index
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://web.archive.org/web/20080925073208/http://www.dellroad.org/pdel/index
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib lib:libexpat:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib:libssl.0.9:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openssl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/archie/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1f8bbb1360f8f8e9bbff470a8c1424dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/libpdel/libpdel-combined/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 13af4b8eb09602838e99c41a05712f56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 dad96204f2d4f737326d8622f069bb74186c84f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5e99afa267fd20e6bfff2437b01065d85063f4a7
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Darwin doesn't support sendfile(), so we skip the optimization.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-GNUmakefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-http_servlet_http_servlet_file.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-${version}/pdel
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global shlibBuild shlibName
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set shlibBuild "cc -dynamiclib \$(objs) \$(LDFLAGS) -compatibility_version 0.1 -current_version ${version} -install_name ${prefix}/lib/libpdel.dylib -o libpdel.dylib -L${prefix}/lib -lssl -lcrypto -lexpat"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set shlibName "libpdel.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Darwin's sendfile() has a different prototype, so we skip the optimization.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles GNUmakefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http_servlet_file.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pd_port.h.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http_http_server.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppp_ppp__msoft.c.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy -force ${filespath}/Darwin ${worksrcpath}/ports/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@LIBNAME@|${shlibName}|g ${worksrcpath}/GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@LIBRARY_BUILD@|${shlibBuild}|g ${worksrcpath}/GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${filespath}/Darwin ${worksrcpath}/ports/
</span> }
build.type gnu
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MP_CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/files/GNUmakefile.patch b/devel/libpdel/files/GNUmakefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fd551e5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpdel/files/GNUmakefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GNUmakefile.orig 2009-05-14 07:36:05.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GNUmakefile 2018-04-20 21:01:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,10 +99,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DO_SHARED= 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-shlib_ext= so.$(shlib_major).$(shlib_minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++shlib_ext= dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlibrary= lib$(libbase).$(shlib_ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sharedobjargs= -shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sharedlibargs= -shared $(sobjs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sharedobjargs=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sharedlibargs= -dynamiclib $(sobjs) $(MP_CFLAGS) -compatibility_version 0.1 -current_version $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) -install_name $(prefix)/lib/$(dlibrary) -L$(prefix)/lib -lssl -lcrypto -lexpat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(arch),amd64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ picargs= -fPIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,7 +116,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef WIN32_PORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRAINCS+= -I$(srcdir)/ports/WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTRAINCS+= -I$(prefix)/ssl/include -I/usr/kerberos/include ${OTHERINCDIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EXTRAINCS+= -I$(prefix)/ssl/include -I$(prefix)/include ${OTHERINCDIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Below here should not need to be edited
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,7 +128,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASEINCS= pd_base.h pd_io.h pd_mem.h pd_inet.h pd_poll.h pd_port.h pd_regex.h pd_string.h pd_sys.h pd_syslog.h pd_thread.h pd_time.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAN= libpdel.3 config/app_config.3 http/http_server.3 http/http_client.3 http/http_request.3 http/http_mime.3 http/http_response.3 http/http_servlet.3 http/http_xml.3 http/servlet/http_servlet_basicauth.3 http/servlet/http_servlet_cookieauth.3 http/servlet/http_servlet_file.3 http/servlet/http_servlet_redirect.3 http/servlet/http_servlet_tmpl.3 http/servlet/http_servlet_xml.3 http/servlet/http_servlet_xmlrpc.3 io/base64.3 io/boundary_fopen.3 io/count_fopen.3 io/timeout_fp.3 io/filter.3 [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MLINKS= app_config.3 app_config_alog_subsystem.3 app_config.3 app_config_copy.3 app_config.3 app_config_curconf_subsystem.3 app_config.3 app_config_directory_subsystem.3 app_config.3 app_config_free.3 app_config.3 app_config_get.3 app_config.3 app_config_get_type.3 app_config.3 app_config_init.3 app_config.3 app_config_load.3 app_config.3 app_config_new.3 app_config.3 app_config_pidfile_subsystem.3 app_config.3 app_config_reload.3 app_config.3 app_config_set.3 app_config.3 app_config_s [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS= -O2 -fno-strict-aliasing -pipe -DPOSIX_MISTAKE -I$(srcdir) -I/usr/local/include -DTYPED_MEM_UNDEFINE_ORIGINALS -DBUILDING_PDEL=1 -O2 -Wall -Wcast-align -Wchar-subscripts -Wcomment -Wformat -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long -Wparentheses -Wpointer-arith -Wreturn-type -Wswitch -Wtrigraphs -Wuninitialized -Wunused -Wwrite-strings -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS= $(MP_CFLAGS) -fno-strict-aliasing -pipe -DPOSIX_MISTAKE -I$(srcdir) -DTYPED_MEM_UNDEFINE_ORIGINALS -DBUILDING_PDEL=1 -Wall -Wcast-align -Wchar-subscripts -Wcomment -Wformat -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long -Wparentheses -Wpointer-arith -Wreturn-type -Wswitch -Wtrigraphs -Wuninitialized -Wunused -Wwrite-strings -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Functional add-ons
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/files/http_http_server.patch b/devel/libpdel/files/http_http_server.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2b90f2e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpdel/files/http_http_server.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- http/http_server.c.orig 2005-01-21 16:01:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ http/http_server.c 2015-03-23 19:34:45.664653000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +197,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _http_ssl_init();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Initialize SSL context for this server */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((serv->ssl = SSL_CTX_new(SSLv2_server_method())) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((serv->ssl = SSL_CTX_new(SSLv23_server_method())) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssl_log(http_server_ssl_logger, serv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto fail;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/files/http_servlet_file.c.patch b/devel/libpdel/files/http_servlet_file.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8a51278
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpdel/files/http_servlet_file.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- http/servlet/http_servlet_file.c.orig 2009-05-14 07:36:02.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ http/servlet/http_servlet_file.c 2018-04-20 20:44:48.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -404,7 +404,7 @@ fail_errno: http_response_send_errno_err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Send file contents, using sendfile(2) if possible */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(__CYGWIN__) && !defined(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__CYGWIN__) && !defined(WIN32) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((sock = http_response_get_raw_socket(resp)) != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct http_servlet_file_serve_state state;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/files/patch-GNUmakefile b/devel/libpdel/files/patch-GNUmakefile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d2aed3e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libpdel/files/patch-GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,90 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GNUmakefile.orig Sun Jan 30 18:29:44 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GNUmakefile Sun Jan 30 18:33:41 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srcdir = .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- top_srcdir = .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--prefix = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix = @PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec_prefix = ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdir = ${exec_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mandir = ${prefix}/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OS= $(shell uname -s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--EXTRAINCS= -I$(srcdir)/ports/$(OS) -I$(prefix)/ssl/include -I/usr/kerberos/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EXTRAINCS= -I$(srcdir)/ports/$(OS) -I$(prefix)/ssl/include -I$(prefix)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VPATH= $(SRCDIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cman= $(foreach m,$(MAN),$(m).gz)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc= gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--library= libpdel.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+library= @LIBNAME@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: $(library) $(cman)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,8 +62,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(cc) -c -o $@ $(CFLAGS) -include $(srcdir)/ports/$(OS)/hacks.h -I$(srcdir) $(EXTRAINCS) $+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(library): $(objs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(ar) rv $@ $(objs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(ranlib) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @LIBRARY_BUILD@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $(objs) $(library) $(cman)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall: uninstall-library uninstall-headers uninstall-man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-library: $(library)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(install) -c -o $(libown) -g $(libgroup) -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(install) -c -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(library) $(DESTDIR)$(libdir)/$(library)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall-library:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,18 +83,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | grep / | sed 's,^\(.*\)/[^/][^/]*$$,\1,g' | sort -u`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in $$incdirs; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ! [ -d $(DESTDIR)$(includedir)$$dir ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo $(install) -d -o $(includeown) -g $(includegroup) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo $(install) -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -m 0755 $(DESTDIR)$(includedir)/$$dir; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(install) -d -o $(includeown) -g $(includegroup) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(install) -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -m 0755 $(DESTDIR)$(includedir)/$$dir; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-headers:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @for hdr in $(INCS); do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo $(install) -c -o $(includeown) -g $(includegroup) -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo $(install) -c -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $$hdr $(DESTDIR)$(includedir)/$$hdr; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(install) -c -o $(includeown) -g $(includegroup) -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(install) -c -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $$hdr $(DESTDIR)$(includedir)/$$hdr; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,14 +113,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- section=`echo $$p | sed 's/^[^.]*.//g'`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f=`basename $$p`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! -d $(DESTDIR)$(mandir)/man$$section ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo $(install) -d -o $(manown) -g $(mangroup) -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo $(install) -d -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(DESTDIR)$(mandir)/man$$section; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(install) -d -o $(manown) -g $(mangroup) -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(install) -d -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(DESTDIR)$(mandir)/man$$section; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo $(install) -c -o $(manown) -g $(mangroup) -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo $(install) -c -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $$p.gz $(DESTDIR)$(mandir)/man$$section/$$f.gz; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(install) -c -o $(manown) -g $(mangroup) -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(install) -c -m 444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $$p.gz $(DESTDIR)$(mandir)/man$$section/$$f.gz; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/files/patch-http_servlet_http_servlet_file.c b/devel/libpdel/files/patch-http_servlet_http_servlet_file.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5d80053..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libpdel/files/patch-http_servlet_http_servlet_file.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- http/servlet/http_servlet_file.c.orig Sun Jan 30 18:53:42 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ http/servlet/http_servlet_file.c Sun Jan 30 18:54:39 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,6 +419,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Send file contents, using sendfile(2) if possible */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((sock = http_response_get_raw_socket(resp)) != -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct http_servlet_file_serve_state state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -444,6 +445,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Close file */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_cleanup_pop(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__APPLE__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE *fp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -466,7 +468,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Close file */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_cleanup_pop(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__APPLE__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/files/pd_port.h.patch b/devel/libpdel/files/pd_port.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2065c86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpdel/files/pd_port.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdel/pd_port.h.orig 2009-05-14 07:36:03.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdel/pd_port.h 2018-04-20 21:41:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** BSD Common **/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_SIN_LEN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PDEL_NET_SUPPORT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_FUNOPEN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,8 +266,10 @@ __THROW __attribute__ ((__format__ (__pr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __FBSDID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __FBSDID(s) static const char *pd_fbsdid __attribute__ ((unused)) = (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* DLL Export/Import Tricks */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(NEED_WINDLL_DECLSPEC) && (defined(PDEL_SHARED) && PDEL_SHARED != 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpdel/files/ppp_ppp__msoft.c.patch b/devel/libpdel/files/ppp_ppp__msoft.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fa1dd85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpdel/files/ppp_ppp__msoft.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ppp/ppp_msoft.c.orig 2005-01-21 22:02:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ppp/ppp_msoft.c 2015-01-24 13:42:43.120485776 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,14 +163,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppp_msoft_des_encrypt(const u_char *clear, u_char *key0, u_char *cypher)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- des_key_schedule ks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DES_key_schedule ks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u_char key[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Create DES key
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Note: we don't bother setting the parity bit because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the des_set_key() algorithm does that for us. A different
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the DES_set_key() algorithm does that for us. A different
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * algorithm may care though.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key[0] = key0[0] & 0xfe;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,10 +181,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key[5] = (key0[4] << 3) | (key0[5] >> 5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key[6] = (key0[5] << 2) | (key0[6] >> 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key[7] = key0[6] << 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- des_set_key((des_cblock *)key, ks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DES_set_key((DES_cblock *)key, &ks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Encrypt using key */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cypher, ks, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cypher, &ks, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span></pre><pre style='margin:0'>
</pre>