Date: Tue, 25 Dec 2018 07:59:31 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> 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 Message-ID: <201812250759.wBP7xV8x063117@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <dor dot bsd at xm0 dot uk> 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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812250759.wBP7xV8x063117>