View | Details | Raw Unified | Return to bug 249910 | Differences between
and this patch

Collapse All | Expand All

(-)b/irc/irssi/Makefile (-45 / +33 lines)
Lines 1-11 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	irssi
3
PORTNAME=	irssi
4
PORTVERSION=	1.2.2
4
DISTVERSION=	1.3-dev-337
5
PORTREVISION=	1
5
DISTVERSIONSUFFIX=	-g17c6c22c
6
PORTEPOCH=	1
6
PORTEPOCH=	1
7
CATEGORIES?=	irc
7
CATEGORIES?=	irc
8
MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
9
8
10
MAINTAINER=	dor.bsd@xm0.uk
9
MAINTAINER=	dor.bsd@xm0.uk
11
COMMENT=	Modular IRC client with many features
10
COMMENT=	Modular IRC client with many features
Lines 13-68 COMMENT= Modular IRC client with many features Link Here
13
LICENSE=	GPLv2+
12
LICENSE=	GPLv2+
14
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
15
14
16
USES=		autoreconf cpe gettext-runtime gmake gnome libtool localbase \
15
# Until upstream makes a new release disable cpe
17
		ncurses pkgconfig tar:xz
16
USES=		gettext-runtime gnome meson localbase:ldflags ncurses \
17
		pkgconfig ssl
18
USE_GNOME=	glib20
18
USE_GNOME=	glib20
19
USE_LDCONFIG=	yes
19
20
20
GNU_CONFIGURE=	yes
21
USE_GITHUB=	yes
21
INSTALL_TARGET=	install-strip
22
GH_TAGNAME=	17c6c22
22
23
23
OPTIONS_DEFINE=	BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC
24
# Force OpenSSL from base
24
OPTIONS_DEFAULT=	BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR
25
CPPFLAGS+=	-I${OPENSSLINC}
26
LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
25
27
26
OPTIONS_SUB=	yes
28
MESON_ARGS=	-Dinstall-glib=no -Ddisable-gregex=no -Dstatic-dependency=no \
27
BOT_DESC=	Bot support
29
		-Dwith-fuzzer=no -Dwithout-textui=no
28
BOT_CONFIGURE_WITH=	bot
30
29
CAPSICUM_DESC=	Capsicum support
31
OPTIONS_DEFINE=		BOT CAPSICUM DOCS OTR PERL PROXY TRUECOLOR UTF8PROC
30
CAPSICUM_CONFIGURE_WITH=	capsicum
32
OPTIONS_DEFAULT=	BOT CAPSICUM PERL PROXY TRUECOLOR
31
OTR_DESC=	OTR (off-the-record) support
33
OPTIONS_SUB=		yes
32
OTR_CONFIGURE_ON=	--with-otr \
34
33
			--with-libotr-inc-prefix=${PREFIX}/include
35
BOT_DESC=		Bot support
34
OTR_CONFIGURE_OFF=	--with-otr=no
36
CAPSICUM_DESC=		Capsicum support
35
OTR_CONFIGURE_WITH=	otr
37
OTR_DESC=		OTR (off-the-record) support
38
TRUECOLOR_DESC=		True color support
39
UTF8PROC_DESC=		utf8proc support
40
41
BOT_MESON_YES=		with-bot
42
CAPSICUM_MESON_YES=	with-capsicum
36
OTR_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
43
OTR_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
37
			libgpg-error.so:security/libgpg-error \
38
			libotr.so:security/libotr
44
			libotr.so:security/libotr
39
PERL_USES=	perl5
45
OTR_MESON_YES=		with-otr
40
PERL_CONFIGURE_ON=	--with-perl-lib=site
46
PERL_USES=		perl5
41
PERL_CONFIGURE_OFF=	--with-perl=no
47
PERL_MESON_YES=		with-perl
42
PROXY_CONFIGURE_WITH=	proxy
48
PROXY_MESON_YES=	with-proxy
43
SOCKS_DESC=	Socks proxy support
49
TRUECOLOR_MESON_YES=	enable-true-color
44
SOCKS_CONFIGURE_WITH=	socks
45
TRUECOLOR_DESC=	Truecolor (24bit) support
46
TRUECOLOR_CONFIGURE_ENABLE=	true-color
47
UTF8PROC_DESC=	utf8proc support
48
UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
50
UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
49
UTF8PROC_CONFIGURE_ENABLE=	utf8proc
51
UTF8PROC_MESON_NO=	disable-utf8proc
50
51
.if defined(WITHOUT_SSL)
52
CONFIGURE_ARGS+=	--disable-ssl
53
.else
54
USES+=		ssl
55
.endif
56
52
57
post-install:
53
post-install:
58
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
54
	@${MV} ${WRKSRC}/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
59
	@${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf \
60
		${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
61
62
post-install-PERL-on:
63
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so
64
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irc/Irc.so
65
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/TextUI/TextUI.so
66
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/UI/UI.so
67
55
68
.include <bsd.port.mk>
56
.include <bsd.port.mk>
(-)b/irc/irssi/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1568194739
1
TIMESTAMP = 1601132587
2
SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578
2
SHA256 (irssi-irssi-1.3-dev-337-g17c6c22c-17c6c22_GH0.tar.gz) = d973aaf7bf58daab49bd5f5e3f8c400938e98ea1e2cb4a6eb3774e796e94b8d1
3
SIZE (irssi-1.2.2.tar.xz) = 1140844
3
SIZE (irssi-irssi-1.3-dev-337-g17c6c22c-17c6c22_GH0.tar.gz) = 794765
(-)a/irc/irssi/files/patch-Makefile.in (-22 lines)
Removed Link Here
1
--- Makefile.in.orig	2019-02-11 17:35:31 UTC
2
+++ Makefile.in
3
@@ -421,7 +421,7 @@ BUILT_SOURCES = default-config.h default-theme.h irssi
4
 CLEANFILES = default-config.h default-theme.h
5
 SUBDIRS = src tests docs scripts themes utils
6
 confdir = $(sysconfdir)
7
-conf_DATA = irssi.conf
8
+conf_DATA = irssi.conf.sample
9
 pkginclude_HEADERS = irssi-config.h irssi-version.h
10
 EXTRA_DIST = \
11
 	ChangeLog \
12
@@ -980,8 +980,8 @@ uninstall-am: uninstall-confDATA uninstall-pkgincludeH
13
 
14
 @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
15
 
16
-default-config.h: $(srcdir)/irssi.conf
17
-	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
18
+default-config.h: $(srcdir)/irssi.conf.sample
19
+	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
20
 
21
 default-theme.h: $(srcdir)/themes/default.theme
22
 	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h
(-)a/irc/irssi/files/patch-configure.ac (-15 lines)
Removed Link Here
1
--- configure.ac.orig	2019-02-11 17:35:17 UTC
2
+++ configure.ac
3
@@ -322,7 +322,11 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], [
4
 	AC_CHECK_LIB([ssl], [SSL_library_init], [
5
 		LIBS="$LIBS -lssl -lcrypto"
6
 	], [
7
-		AC_MSG_ERROR([The OpenSSL library was not found])
8
+		AC_CHECK_LIB([ssl], [OPENSSL_init_ssl], [
9
+			LIBS="$LIBS -lssl -lcrypto"
10
+		], [
11
+			AC_MSG_ERROR([The OpenSSL library was not found])
12
+		])
13
 	])
14
 ])
15
 
(-)b/irc/irssi/files/patch-meson.build (+13 lines)
Added Link Here
1
--- meson.build.orig	2020-09-26 07:02:44 UTC
2
+++ meson.build
3
@@ -273,8 +273,8 @@ endif
4
 dep += glib_dep
5
 dep += gmodule_dep
6
 
7
-openssl_dep = dependency('openssl', static : want_static_dependency)
8
-dep += openssl_dep
9
+#openssl_dep = dependency('openssl', static : want_static_dependency)
10
+#dep += openssl_dep
11
 
12
 ############
13
 # utf8proc #
(-)a/irc/irssi/files/patch-perl-Makefile (-22 lines)
Removed Link Here
1
--- src/perl/Makefile.am.orig	2019-02-11 17:27:58 UTC
2
+++ src/perl/Makefile.am
3
@@ -145,7 +145,7 @@ all-local:
4
 
5
 install-exec-local:
6
 	for dir in $(perl_dirs); do \
7
-	  cd $$dir && $(MAKE) install && cd ..; \
8
+	  cd $$dir && $(MAKE) pure_install && cd ..; \
9
 	done
10
 
11
 clean-generic:
12
--- src/perl/Makefile.in.orig	2019-02-11 17:35:32 UTC
13
+++ src/perl/Makefile.in
14
@@ -898,7 +898,7 @@ all-local:
15
 
16
 install-exec-local:
17
 	for dir in $(perl_dirs); do \
18
-	  cd $$dir && $(MAKE) install && cd ..; \
19
+	  cd $$dir && $(MAKE) pure_install && cd ..; \
20
 	done
21
 
22
 clean-generic:
(-)b/irc/irssi/pkg-plist (-6 / +5 lines)
Lines 39-44 include/irssi/src/core/queries.h Link Here
39
include/irssi/src/core/query-rec.h
39
include/irssi/src/core/query-rec.h
40
include/irssi/src/core/rawlog.h
40
include/irssi/src/core/rawlog.h
41
include/irssi/src/core/recode.h
41
include/irssi/src/core/recode.h
42
include/irssi/src/core/refstrings.h
42
include/irssi/src/core/server-connect-rec.h
43
include/irssi/src/core/server-connect-rec.h
43
include/irssi/src/core/server-rec.h
44
include/irssi/src/core/server-rec.h
44
include/irssi/src/core/server-setup-rec.h
45
include/irssi/src/core/server-setup-rec.h
Lines 93-98 include/irssi/src/fe-text/mainwindows.h Link Here
93
include/irssi/src/fe-text/statusbar.h
94
include/irssi/src/fe-text/statusbar.h
94
include/irssi/src/fe-text/statusbar-item.h
95
include/irssi/src/fe-text/statusbar-item.h
95
include/irssi/src/fe-text/term.h
96
include/irssi/src/fe-text/term.h
97
include/irssi/src/fe-text/textbuffer-formats.h
96
include/irssi/src/fe-text/textbuffer-view.h
98
include/irssi/src/fe-text/textbuffer-view.h
97
include/irssi/src/fe-text/textbuffer.h
99
include/irssi/src/fe-text/textbuffer.h
98
include/irssi/src/irc/core/bans.h
100
include/irssi/src/irc/core/bans.h
Lines 132-141 include/irssi/src/irc/notifylist/notify-setup.h Link Here
132
include/irssi/src/irc/notifylist/notifylist.h
134
include/irssi/src/irc/notifylist/notifylist.h
133
include/irssi/src/lib-config/iconfig.h
135
include/irssi/src/lib-config/iconfig.h
134
include/irssi/src/lib-config/module.h
136
include/irssi/src/lib-config/module.h
135
%%PROXY%%lib/irssi/modules/libirc_proxy.a
137
%%PERL%%lib/irssi/modules/libfe_perl.so
136
%%PROXY%%lib/irssi/modules/libirc_proxy.so
138
%%PROXY%%lib/irssi/modules/libirc_proxy.so
137
%%OTR%%lib/irssi/modules/libotr_core.a
138
%%OTR%%lib/irssi/modules/libotr_core.so
139
%%OTR%%lib/irssi/modules/libotr_core.so
140
%%PERL%%lib/irssi/modules/libperl_core.so
139
%%PERL%%%%SITE_ARCH%%/Irssi.pm
141
%%PERL%%%%SITE_ARCH%%/Irssi.pm
140
%%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
142
%%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
141
%%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
143
%%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
Lines 144-149 include/irssi/src/lib-config/module.h Link Here
144
%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
146
%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
145
%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
147
%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
146
%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
148
%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
149
libdata/pkgconfig/irssi-1.pc
147
man/man1/irssi.1.gz
150
man/man1/irssi.1.gz
148
%%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
151
%%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
149
%%PORTDOCS%%%%DOCSDIR%%/design.html
152
%%PORTDOCS%%%%DOCSDIR%%/design.html
Lines 275-288 man/man1/irssi.1.gz Link Here
275
%%DATADIR%%/scripts/autoop.pl
278
%%DATADIR%%/scripts/autoop.pl
276
%%DATADIR%%/scripts/autorejoin.pl
279
%%DATADIR%%/scripts/autorejoin.pl
277
%%DATADIR%%/scripts/buf.pl
280
%%DATADIR%%/scripts/buf.pl
278
%%DATADIR%%/scripts/command.pl
279
%%DATADIR%%/scripts/dns.pl
281
%%DATADIR%%/scripts/dns.pl
280
%%DATADIR%%/scripts/kills.pl
282
%%DATADIR%%/scripts/kills.pl
281
%%DATADIR%%/scripts/mail.pl
283
%%DATADIR%%/scripts/mail.pl
282
%%DATADIR%%/scripts/mlock.pl
284
%%DATADIR%%/scripts/mlock.pl
283
%%DATADIR%%/scripts/msg-event.pl
284
%%DATADIR%%/scripts/quitmsg.pl
285
%%DATADIR%%/scripts/quitmsg.pl
285
%%DATADIR%%/scripts/redirect.pl
286
%%DATADIR%%/scripts/scriptassist.pl
286
%%DATADIR%%/scripts/scriptassist.pl
287
%%DATADIR%%/scripts/usercount.pl
287
%%DATADIR%%/scripts/usercount.pl
288
%%DATADIR%%/themes/colorless.theme
288
%%DATADIR%%/themes/colorless.theme
289
- 

Return to bug 249910