Attachment #200296 for bug #234202

View | Details | Raw Unified | Return to bug 234202
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	irssi-fish
DISTVERSION=	1.5.20181025
PORTREVISION=	3
CATEGORIES=	irc security

MAINTAINER=	ashish@FreeBSD.org

		${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=	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

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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)irc/irssi-fish/distinfo (-2 / +3 lines)
1	SHA256 (falsovsky-FiSH-irssi-1.4.20160122-2b0c1c09_GH0.tar.gz) = 2ba50a440b923bc85167d89c38c5182f92f920ac1389d8c67aef22ad111104e0	1	TIMESTAMP = 1545295027
2	SIZE (falsovsky-FiSH-irssi-1.4.20160122-2b0c1c09_GH0.tar.gz) = 21161	2	SHA256 (falsovsky-FiSH-irssi-1.5.20181025-15d199b6_GH0.tar.gz) = 48cc3dc43d1a1f261cf20d5f983b73be0146340b1ac279cec5cb3ff61c5c6584
		3	SIZE (falsovsky-FiSH-irssi-1.5.20181025-15d199b6_GH0.tar.gz) = 19345




--- CMakeLists.txt.orig	2018-12-20 09:18:56 UTC
The values are passed via CMAKE_ARGS in the port Makefile.

--- CMakeLists.txt.orig	2017-02-12 14:05:09 UTC
+++ CMakeLists.txt
@@ -29,7 +29,9 @@ if(GLIB_PKG_FOUND)
 ENDIF()
 
 # Look for OpenSSL
-PKG_CHECK_MODULES(OPENSSL REQUIRED openssl)
+if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+    PKG_CHECK_MODULES(OPENSSL REQUIRED openssl)
+ENDIF()
 if(OPENSSL_FOUND)
     INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS})
     LINK_DIRECTORIES(${OPENSSL_LIBRARY_DIRS})

Lines 1-7 Link Here

(-)irc/irssi-fish/pkg-descr (-3 / +1 lines)
1	This is an encryption plugin for irssi, it is based on blowfish and is fully	1	This is an encryption plugin for irssi, it is based on blowfish and is fully
2	compatible to original 'blowcrypt' script. It supports private chat and channel	2	compatible to original 'blowcrypt' script. It supports private chat and channel
3	encryption. A secure key-exchange system is included as well. Please read the	3	encryption. A secure key-exchange system is included as well.
4	file FiSH-irssi.txt, especially the 'Installation' section, before installing
5	it!
6		4
7	WWW: https://github.com/falsovsky/FiSH-irssi	5	WWW: https://github.com/falsovsky/FiSH-irssi

Return to bug 234202

Lines 2-9 Link Here

(-)irc/irssi-fish/Makefile (-7 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= irssi-fish	4	PORTNAME= irssi-fish
5	DISTVERSION= 1.4.20160122	5	DISTVERSION= 1.5.20181025
6	PORTREVISION= 3
7	CATEGORIES= irc security	6	CATEGORIES= irc security
8		7
9	MAINTAINER= ashish@FreeBSD.org	8	MAINTAINER= ashish@FreeBSD.org
Lines 13-36 Link Here
13	${LOCALBASE}/include/irssi/src/common.h:irc/irssi	12	${LOCALBASE}/include/irssi/src/common.h:irc/irssi
14	RUN_DEPENDS= irssi:irc/irssi	13	RUN_DEPENDS= irssi:irc/irssi
15		14
		15	USES= cmake gnome pkgconfig ssl
		16
		17	USE_GNOME+= glib20
		18	USE_LDCONFIG= yes
16	USE_GITHUB= yes	19	USE_GITHUB= yes
		20
17	GH_PROJECT= FiSH-irssi	21	GH_PROJECT= FiSH-irssi
18	GH_ACCOUNT= falsovsky	22	GH_ACCOUNT= falsovsky
19	GH_TAGNAME= 2b0c1c09	23	GH_TAGNAME= 15d199b6
20		24
21	USES= cmake pkgconfig ssl
22	CMAKE_ARGS= -DOPENSSL_FOUND=1 \	25	CMAKE_ARGS= -DOPENSSL_FOUND=1 \
23	-DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \	26	-DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \
24	-DOPENSSL_LIBRARY_DIRS=${OPENSSLLIB}	27	-DOPENSSL_LIBRARY_DIRS=${OPENSSLLIB}
25	USE_LDCONFIG= yes
26		28
27	PLIST_FILES= lib/irssi/modules/libfish.so	29	PLIST_FILES= lib/irssi/modules/libfish.so
28	PORTDOCS= README.md FiSH-irssi.txt	30	PORTDOCS= README
29		31
30	OPTIONS_DEFINE= DOCS	32	OPTIONS_DEFINE= DOCS
31		33
32	post-patch:	34	post-patch:
33	${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE},g" \	35	${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE},g" \
34	-e "s,share/doc/FiSH-irssi,${DOCSDIR_REL},g" ${WRKSRC}/CMakeLists.txt	36	-e "s,share/doc/FiSH-irssi,${DOCSDIR_REL},g" \
		37	${WRKSRC}/CMakeLists.txt
35		38
36	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)irc/irssi-fish/files/patch-CMakeLists.txt (-12 / +9 lines)
1	Skip pkgconfig lookup for OpenSSL on FreeBSD.	1	--- CMakeLists.txt.orig 2018-12-20 09:18:56 UTC
2	The values are passed via CMAKE_ARGS in the port Makefile.
3
4	--- CMakeLists.txt.orig 2017-02-12 14:05:09 UTC
5	+++ CMakeLists.txt	2	+++ CMakeLists.txt
6	@@ -10,7 +10,9 @@ SET(FISH_VERSION ${VERSION_MAJOR}.${VERS	3	@@ -29,7 +29,9 @@ if(GLIB_PKG_FOUND)
7	FIND_PACKAGE(PkgConfig REQUIRED)	4	ENDIF()
8		5
9	PKG_CHECK_MODULES(GLIB_PKG REQUIRED glib-2.0)	6	# Look for OpenSSL
10	-PKG_CHECK_MODULES(OPENSSL REQUIRED openssl)	7	-PKG_CHECK_MODULES(OPENSSL REQUIRED openssl)
11	+if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")	8	+if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
12	+ PKG_CHECK_MODULES(OPENSSL REQUIRED openssl)	9	+ PKG_CHECK_MODULES(OPENSSL REQUIRED openssl)
13	+endif()	10	+ENDIF()
14		11	if(OPENSSL_FOUND)
15	if(GLIB_PKG_FOUND)	12	INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS})
16	INCLUDE_DIRECTORIES(${GLIB_PKG_INCLUDE_DIRS})	13	LINK_DIRECTORIES(${OPENSSL_LIBRARY_DIRS})