diff options
author | marcus <marcus@FreeBSD.org> | 2017-05-22 22:44:04 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2017-05-22 22:44:04 +0800 |
commit | ff2d8f382d682068390ee3a1b54ccd955cafe2e3 (patch) | |
tree | a21c622e3592a5609eb97c2de67ccf3cd8db4b39 /net | |
parent | 910e02a7ec65b9ba6a1aa832297daace15a13604 (diff) | |
download | freebsd-ports-gnome-ff2d8f382d682068390ee3a1b54ccd955cafe2e3.tar.gz freebsd-ports-gnome-ff2d8f382d682068390ee3a1b54ccd955cafe2e3.tar.zst freebsd-ports-gnome-ff2d8f382d682068390ee3a1b54ccd955cafe2e3.zip |
* 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]
Diffstat (limited to 'net')
-rw-r--r-- | net/netatalk3/Makefile | 9 | ||||
-rw-r--r-- | net/netatalk3/files/patch-etc_uams_openssl__compat.h | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 1e575c589f6e..61940a5e2d72 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -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/libsunacl 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 \ diff --git a/net/netatalk3/files/patch-etc_uams_openssl__compat.h b/net/netatalk3/files/patch-etc_uams_openssl__compat.h new file mode 100644 index 000000000000..7aac8cc2c538 --- /dev/null +++ b/net/netatalk3/files/patch-etc_uams_openssl__compat.h @@ -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 |