From owner-svn-ports-head@freebsd.org Sun Jul 19 11:52:32 2015 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 107C49A4F06; Sun, 19 Jul 2015 11:52:32 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 DAEC01E00; Sun, 19 Jul 2015 11:52:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6JBqVAj036803; Sun, 19 Jul 2015 11:52:31 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6JBqVqN036801; Sun, 19 Jul 2015 11:52:31 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201507191152.t6JBqVqN036801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 19 Jul 2015 11:52:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392496 - in head/net-mgmt/seafile-gui: . 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.20 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: Sun, 19 Jul 2015 11:52:32 -0000 Author: bapt Date: Sun Jul 19 11:52:30 2015 New Revision: 392496 URL: https://svnweb.freebsd.org/changeset/ports/392496 Log: Respect USE_OPENSSL Prevent the build system from using pkg-config to lookup for openssl Enforce passing the variables expected (only libcrypto os used) PR: 199265 Reported by: ports@stdrand.com Modified: head/net-mgmt/seafile-gui/Makefile head/net-mgmt/seafile-gui/files/patch-CMakeLists.txt Modified: head/net-mgmt/seafile-gui/Makefile ============================================================================== --- head/net-mgmt/seafile-gui/Makefile Sun Jul 19 11:46:24 2015 (r392495) +++ head/net-mgmt/seafile-gui/Makefile Sun Jul 19 11:52:30 2015 (r392496) @@ -2,6 +2,7 @@ PORTNAME= seafile-gui PORTVERSION= 4.1.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt @@ -28,9 +29,10 @@ USE_QT4= corelib dbus gui network \ USE_OPENSSL= yes INSTALLS_ICONS= yes LRELEASE= ${PREFIX}/bin/lrelease-qt4 -CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 +CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \ + -DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \ + -DOPENSSL_LIBRARIES="-L${OPENSSLLIB} -lcrypto" -WITH_OPENSSL_PORT= yes CMAKE_BUILD_TYPE= Release # Note that per PR 197984, cairo must be built with X11 and XCB options Modified: head/net-mgmt/seafile-gui/files/patch-CMakeLists.txt ============================================================================== --- head/net-mgmt/seafile-gui/files/patch-CMakeLists.txt Sun Jul 19 11:46:24 2015 (r392495) +++ head/net-mgmt/seafile-gui/files/patch-CMakeLists.txt Sun Jul 19 11:52:30 2015 (r392496) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2015-01-28 22:35:49.000000000 -0500 -+++ CMakeLists.txt 2015-01-28 22:42:26.000000000 -0500 -@@ -85,7 +85,7 @@ +--- CMakeLists.txt.orig 2015-02-05 08:43:51 UTC ++++ CMakeLists.txt +@@ -98,7 +98,7 @@ IF(USE_QT5) SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} "WebKit" "WebKitWidgets") ADD_DEFINITIONS(-DHAVE_SHIBBOLETH_SUPPORT) ENDIF() @@ -9,7 +9,7 @@ SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} "DBus") ENDIF() FIND_PACKAGE(Qt5 REQUIRED ${USE_QT_LIBRARIES}) -@@ -100,7 +100,7 @@ +@@ -113,7 +113,7 @@ ELSE() SET(QtWebKit "QtWebKit") ADD_DEFINITIONS(-DHAVE_SHIBBOLETH_SUPPORT) ENDIF() @@ -18,3 +18,12 @@ SET(QtDBus "QtDBus") ENDIF() FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtNetwork ${QtDBus} ${QtWebKit}) +@@ -263,7 +263,7 @@ PKG_CHECK_MODULES(LIBCCNET REQUIRED libc + + PKG_CHECK_MODULES(LIBSEARPC REQUIRED libsearpc>=1.0) + +-PKG_CHECK_MODULES(OPENSSL REQUIRED openssl>=0.98) ++#PKG_CHECK_MODULES(OPENSSL REQUIRED openssl>=0.98) + + PKG_CHECK_MODULES(LIBSEAFILE REQUIRED libseafile>=1.7) + ####################