svn commit: r392494 - head/net-mgmt/seafile

[Tijl Coosemans]

On Sun, 19 Jul 2015 14:39:17 +0200 Baptiste Daroussin <bapt at FreeBSD.org> wrote:
> On Sun, Jul 19, 2015 at 02:23:06PM +0200, Tijl Coosemans wrote:
>> On Sun, 19 Jul 2015 11:35:25 +0000 (UTC) Baptiste Daroussin <bapt at FreeBSD.org> wrote:
>>> Author: bapt
>>> Date: Sun Jul 19 11:35:25 2015
>>> New Revision: 392494
>>> URL: https://svnweb.freebsd.org/changeset/ports/392494
>>> 
>>> Log:
>>>   Properly respect OPENSSL_PORT (while here use libarchive from base)
>>>   
>>>   PR:		199265
>>>   Reported by:	ports at stdrand.com
>>> 
>>> Modified:
>>>   head/net-mgmt/seafile/Makefile
>>> 
>>> Modified: head/net-mgmt/seafile/Makefile
>>> ==============================================================================
>>> --- head/net-mgmt/seafile/Makefile	Sun Jul 19 11:28:37 2015	(r392493)
>>> +++ head/net-mgmt/seafile/Makefile	Sun Jul 19 11:35:25 2015	(r392494)
>>> @@ -2,6 +2,7 @@
>>>  
>>>  PORTNAME=	seafile
>>>  PORTVERSION=	4.0.6
>>> +PORTREVISION=	1
>>>  DISTVERSIONPREFIX=	v
>>>  DISTVERSIONSUFFIX=	-server
>>>  CATEGORIES=	net-mgmt devel
>>> @@ -16,7 +17,6 @@ LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/de
>>>  		libevhtp.so:${PORTSDIR}/www/libevhtp \
>>>  		libzdb.so:${PORTSDIR}/databases/libzdb \
>>>  		libcrypto.so:${PORTSDIR}/security/openssl \
>>> -		libarchive.so.13:${PORTSDIR}/archivers/libarchive \
>>>  		libcurl.so:${PORTSDIR}/ftp/curl \
>>>  		libinotify.so:${PORTSDIR}/devel/libinotify \
>>>  		libccnet.so:${PORTSDIR}/net-mgmt/ccnet
>>> @@ -33,8 +33,9 @@ SHEBANG_FILES=	scripts/*.sh scripts/upgr
>>>  GNU_CONFIGURE=	yes
>>>  USE_OPENSSL=	yes
>>>  USE_LDCONFIG=	yes
>>> +CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
>>> +		LIBARCHIVE_CFLAGS="-I/usr/include" LIBARCHIVE_LIBS="-larchive"
>> 
>> It's probably ok to remove the dependency above, but I'm not sure these
>> flags are fine.  When ports openssl is used, ports libarchive must be
>> used as well, because libarchive links to libcrypto.
> 
> I cannot see a sane way to handle this...

I think it's enough to replace LIBARCHIVE_CFLAGS="-I/usr/include" with
LIBARCHIVE_CFLAGS=" " for now.  Then ports libarchive will be used when
available (because of -I and -L flags from other libraries).