svn commit: r421961 - in head/net-p2p/shx: . files
John Marino
marino at FreeBSD.org
Mon Sep 12 20:36:55 UTC 2016
Author: marino
Date: Mon Sep 12 20:36:54 2016
New Revision: 421961
URL: https://svnweb.freebsd.org/changeset/ports/421961
Log:
net-p2p/shx: Document SSH reqirement, handle no EGD case (LibreSSL)
While here, convert options to modern framework
Approved by: SSL and infrastructure blankets
Added:
head/net-p2p/shx/files/patch-src_main.c (contents, props changed)
Modified:
head/net-p2p/shx/Makefile
Modified: head/net-p2p/shx/Makefile
==============================================================================
--- head/net-p2p/shx/Makefile Mon Sep 12 20:34:01 2016 (r421960)
+++ head/net-p2p/shx/Makefile Mon Sep 12 20:36:54 2016 (r421961)
@@ -27,46 +27,24 @@ HAL_DESC= Compile MegaHAL (enables hal
XMMS_DESC= Enable trackname command
NOIPV4_DESC= IPv6 support (disables IPv4 support)
-USES= readline tar:tgz
+USES= readline ssl tar:tgz
MAKEFILE= makefile
GNU_CONFIGURE= yes
-CONFIGURE_ARGS=
+CFLAGS+= -I${OPENSSLINC}
+LDFLAGS+= -L${OPENSSLLIB}
-.include <bsd.port.options.mk>
+CIPHER_IMPLIES= HOPE
+COMPRESS_IMPLIES= HOPE
-.if ${PORT_OPTIONS:MWARNINGS}
-CONFIGURE_ARGS+= --enable-warnings
-.endif
-
-.if ${PORT_OPTIONS:MHTXF_PTHREAD}
-CONFIGURE_ARGS+= --enable-htxf-pthread
-.endif
-
-.if ! ${PORT_OPTIONS:MHFS}
-CONFIGURE_ARGS+= --disable-hfs
-.endif
-
-.if ${PORT_OPTIONS:MHOPE}
-CONFIGURE_ARGS+= --enable-hope
-.if ${PORT_OPTIONS:MCIPHER}
-CONFIGURE_ARGS+= --enable-cipher
-.endif
-.if ${PORT_OPTIONS:MCOMPRESS}
-CONFIGURE_ARGS+= --enable-compress
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-CONFIGURE_ARGS+= --enable-hal
-.endif
-
-.if ${PORT_OPTIONS:MXMMS}
-CONFIGURE_ARGS+= --enable-xmms
-.endif
-
-.if ${PORT_OPTIONS:MNOIPV4}
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
+CIPHER_CONFIGURE_ENABLE= cipher
+COMPRESS_CONFIGURE_ENABLE= compress
+HAL_CONFIGURE_ENABLE= hal
+HFS_CONFIGURE_ENABLE= hfs
+HOPE_CONFIGURE_ENABLE= hope
+HTXF_PTHREAD_CONFIGURE_ENABLE= htxf-pthread
+NOIPV4_CONFIGURE_ENABLE= ipv6
+XMMS_CONFIGURE_ENABLE= xmms
+WARNINGS_CONFIGURE_ENABLE= warnings
PLIST_FILES= bin/hx \
share/examples/shx/hxrc \
Added: head/net-p2p/shx/files/patch-src_main.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-p2p/shx/files/patch-src_main.c Mon Sep 12 20:36:54 2016 (r421961)
@@ -0,0 +1,20 @@
+--- src/main.c.orig 2002-12-17 19:28:19 UTC
++++ src/main.c
+@@ -296,7 +296,7 @@ loopZ (void)
+ #if defined(CONFIG_CIPHER)
+ #include "cipher.h"
+
+-#if USE_OPENSSL
++#if USE_OPENSSL && !defined(OPENSSL_NO_EGD)
+ #include <openssl/rand.h>
+
+ static char *egd_path = 0;
+@@ -324,7 +324,7 @@ set_egd_path (char **egd_pathp, const ch
+ static void
+ cipher_init (void)
+ {
+-#if USE_OPENSSL
++#if USE_OPENSSL && !defined(OPENSSL_NO_EGD)
+ variable_add(&egd_path, set_egd_path, "egd_path");
+ #else
+ srand(getpid()*clock());
More information about the svn-ports-head
mailing list