From owner-svn-ports-all@freebsd.org Tue Dec 25 07:59:32 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B8871345D47; Tue, 25 Dec 2018 07:59:32 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F1930684F7; Tue, 25 Dec 2018 07:59:31 +0000 (UTC) (envelope-from ashish@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E32389442; Tue, 25 Dec 2018 07:59:31 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBP7xVXU063121; Tue, 25 Dec 2018 07:59:31 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBP7xV8x063117; Tue, 25 Dec 2018 07:59:31 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <201812250759.wBP7xV8x063117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Tue, 25 Dec 2018 07:59:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488297 - in head/irc/irssi-fish: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ashish X-SVN-Commit-Paths: in head/irc/irssi-fish: . files X-SVN-Commit-Revision: 488297 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F1930684F7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Dec 2018 07:59:32 -0000 Author: ashish Date: Tue Dec 25 07:59:30 2018 New Revision: 488297 URL: https://svnweb.freebsd.org/changeset/ports/488297 Log: - Update to latest snapshot 15d199b6 - Reorder Makefile to silence portlint warnings - Fix pkg-descr to remove the irrelevant installation instruction PR: 234202 Submitted by: David O'Rourke Modified: head/irc/irssi-fish/Makefile head/irc/irssi-fish/distinfo head/irc/irssi-fish/files/patch-CMakeLists.txt head/irc/irssi-fish/pkg-descr Modified: head/irc/irssi-fish/Makefile ============================================================================== --- head/irc/irssi-fish/Makefile Tue Dec 25 07:22:49 2018 (r488296) +++ head/irc/irssi-fish/Makefile Tue Dec 25 07:59:30 2018 (r488297) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= irssi-fish -DISTVERSION= 1.4.20160122 -PORTREVISION= 3 +DISTVERSION= 1.5.20181025 CATEGORIES= irc security MAINTAINER= ashish@FreeBSD.org @@ -13,24 +12,28 @@ BUILD_DEPENDS= ${LOCALBASE}/include/glib-2.0/glib.h:de ${LOCALBASE}/include/irssi/src/common.h:irc/irssi RUN_DEPENDS= irssi:irc/irssi +USES= cmake gnome pkgconfig ssl + +USE_GNOME+= glib20 +USE_LDCONFIG= yes USE_GITHUB= yes + GH_PROJECT= FiSH-irssi GH_ACCOUNT= falsovsky -GH_TAGNAME= 2b0c1c09 +GH_TAGNAME= 15d199b6 -USES= cmake pkgconfig ssl CMAKE_ARGS= -DOPENSSL_FOUND=1 \ -DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \ -DOPENSSL_LIBRARY_DIRS=${OPENSSLLIB} -USE_LDCONFIG= yes PLIST_FILES= lib/irssi/modules/libfish.so -PORTDOCS= README.md FiSH-irssi.txt +PORTDOCS= README OPTIONS_DEFINE= DOCS post-patch: ${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE},g" \ - -e "s,share/doc/FiSH-irssi,${DOCSDIR_REL},g" ${WRKSRC}/CMakeLists.txt + -e "s,share/doc/FiSH-irssi,${DOCSDIR_REL},g" \ + ${WRKSRC}/CMakeLists.txt .include Modified: head/irc/irssi-fish/distinfo ============================================================================== --- head/irc/irssi-fish/distinfo Tue Dec 25 07:22:49 2018 (r488296) +++ head/irc/irssi-fish/distinfo Tue Dec 25 07:59:30 2018 (r488297) @@ -1,2 +1,3 @@ -SHA256 (falsovsky-FiSH-irssi-1.4.20160122-2b0c1c09_GH0.tar.gz) = 2ba50a440b923bc85167d89c38c5182f92f920ac1389d8c67aef22ad111104e0 -SIZE (falsovsky-FiSH-irssi-1.4.20160122-2b0c1c09_GH0.tar.gz) = 21161 +TIMESTAMP = 1545295027 +SHA256 (falsovsky-FiSH-irssi-1.5.20181025-15d199b6_GH0.tar.gz) = 48cc3dc43d1a1f261cf20d5f983b73be0146340b1ac279cec5cb3ff61c5c6584 +SIZE (falsovsky-FiSH-irssi-1.5.20181025-15d199b6_GH0.tar.gz) = 19345 Modified: head/irc/irssi-fish/files/patch-CMakeLists.txt ============================================================================== --- head/irc/irssi-fish/files/patch-CMakeLists.txt Tue Dec 25 07:22:49 2018 (r488296) +++ head/irc/irssi-fish/files/patch-CMakeLists.txt Tue Dec 25 07:59:30 2018 (r488297) @@ -1,16 +1,13 @@ -Skip pkgconfig lookup for OpenSSL on FreeBSD. -The values are passed via CMAKE_ARGS in the port Makefile. - ---- CMakeLists.txt.orig 2017-02-12 14:05:09 UTC +--- CMakeLists.txt.orig 2018-12-20 09:18:56 UTC +++ CMakeLists.txt -@@ -10,7 +10,9 @@ SET(FISH_VERSION ${VERSION_MAJOR}.${VERS - FIND_PACKAGE(PkgConfig REQUIRED) +@@ -29,7 +29,9 @@ if(GLIB_PKG_FOUND) + ENDIF() - PKG_CHECK_MODULES(GLIB_PKG REQUIRED glib-2.0) + # Look for OpenSSL -PKG_CHECK_MODULES(OPENSSL REQUIRED openssl) +if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ PKG_CHECK_MODULES(OPENSSL REQUIRED openssl) -+endif() - - if(GLIB_PKG_FOUND) - INCLUDE_DIRECTORIES(${GLIB_PKG_INCLUDE_DIRS}) ++ PKG_CHECK_MODULES(OPENSSL REQUIRED openssl) ++ENDIF() + if(OPENSSL_FOUND) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS}) + LINK_DIRECTORIES(${OPENSSL_LIBRARY_DIRS}) Modified: head/irc/irssi-fish/pkg-descr ============================================================================== --- head/irc/irssi-fish/pkg-descr Tue Dec 25 07:22:49 2018 (r488296) +++ head/irc/irssi-fish/pkg-descr Tue Dec 25 07:59:30 2018 (r488297) @@ -1,7 +1,5 @@ This is an encryption plugin for irssi, it is based on blowfish and is fully compatible to original 'blowcrypt' script. It supports private chat and channel -encryption. A secure key-exchange system is included as well. Please read the -file FiSH-irssi.txt, especially the 'Installation' section, before installing -it! +encryption. A secure key-exchange system is included as well. WWW: https://github.com/falsovsky/FiSH-irssi