Date: Mon, 22 May 2017 14:44:04 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441463 - in head/net/netatalk3: . files Message-ID: <201705221444.v4MEi4ru049977@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Mon May 22 14:44:04 2017 New Revision: 441463 URL: https://svnweb.freebsd.org/changeset/ports/441463 Log: * Fix build with LibreSSL [1] * Use shebang fix to fix afpstats' use of Python PR: 219366 [1] Obtained from: https://github.com/Netatalk/Netatalk/issues/91 [1] Added: head/net/netatalk3/files/patch-etc_uams_openssl__compat.h (contents, props changed) Modified: head/net/netatalk3/Makefile Modified: head/net/netatalk3/Makefile ============================================================================== --- head/net/netatalk3/Makefile Mon May 22 14:32:25 2017 (r441462) +++ head/net/netatalk3/Makefile Mon May 22 14:44:04 2017 (r441463) @@ -3,6 +3,7 @@ PORTNAME= netatalk PORTVERSION= 3.1.11 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF @@ -16,7 +17,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libevent.so:devel/libevent -USES= bdb:5+ gettext gmake iconv libtool perl5 pkgconfig ssl tar:bzip2 +USES= bdb:5+ gettext gmake iconv libtool perl5 pkgconfig shebangfix ssl tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= netatalk @@ -72,6 +73,8 @@ ACL_LIB_DEPENDS= libsunacl.so:sysutils/l ACL_CONFIGURE_WITH=acls LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers +SHEBANG_GLOB= afpstats + CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]* .include <bsd.port.pre.mk> @@ -88,8 +91,8 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|\.dist|\.sample|g' \ ${WRKSRC}/config/Makefile.in - @${REINPLACE_CMD} -e 's|%%PYTHONCMD%%|${PYTHONCMD}|' \ - ${WRKSRC}/contrib/shell_utils/afpstats +# @${REINPLACE_CMD} -e 's|%%PYTHONCMD%%|${PYTHONCMD}|' \ +# ${WRKSRC}/contrib/shell_utils/afpstats post-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \ Added: head/net/netatalk3/files/patch-etc_uams_openssl__compat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/netatalk3/files/patch-etc_uams_openssl__compat.h Mon May 22 14:44:04 2017 (r441463) @@ -0,0 +1,11 @@ +--- etc/uams/openssl_compat.h.orig 2016-06-06 11:21:51 UTC ++++ etc/uams/openssl_compat.h +@@ -11,7 +11,7 @@ + #ifndef OPENSSL_COMPAT_H + #define OPENSSL_COMPAT_H + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) + { + /* If the fields p and g in d are NULL, the corresponding input
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705221444.v4MEi4ru049977>