From owner-svn-ports-head@freebsd.org Mon May 22 14:44:05 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C64AD78225; Mon, 22 May 2017 14:44:05 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5576F13A8; Mon, 22 May 2017 14:44:05 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4MEi4NE049979; Mon, 22 May 2017 14:44:04 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4MEi4ru049977; Mon, 22 May 2017 14:44:04 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201705221444.v4MEi4ru049977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Mon, 22 May 2017 14:44:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441463 - in head/net/netatalk3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 May 2017 14:44:05 -0000 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 @@ -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