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

Collapse All | Expand All

(-)b/irc/irssi/Makefile (-46 / +31 lines)
Lines 1-8 Link Here
1
PORTNAME=	irssi
1
PORTNAME=	irssi
2
PORTVERSION=	1.2.3
2
DISTVERSION=	1.4.1
3
PORTEPOCH=	2
3
PORTEPOCH=	1
4
CATEGORIES?=	irc
4
CATEGORIES?=	irc
5
MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
5
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
6
6
7
MAINTAINER=	dor.bsd@xm0.uk
7
MAINTAINER=	dor.bsd@xm0.uk
8
COMMENT=	Modular IRC client with many features
8
COMMENT=	Modular IRC client with many features
Lines 10-65 COMMENT= Modular IRC client with many features Link Here
10
LICENSE=	GPLv2+
10
LICENSE=	GPLv2+
11
LICENSE_FILE=	${WRKSRC}/COPYING
11
LICENSE_FILE=	${WRKSRC}/COPYING
12
12
13
# Until upstream makes a new release disable cpe
13
USES=		compiler:c11 cpe gettext-runtime gnome meson localbase:ldflags \
14
USES=		autoreconf cpe gettext-runtime gmake gnome libtool localbase \
14
		ncurses perl5 pkgconfig ssl tar:xz
15
		ncurses pkgconfig tar:xz
16
USE_GNOME=	glib20
15
USE_GNOME=	glib20
16
USE_LDCONFIG=	yes
17
17
18
GNU_CONFIGURE=	yes
18
MESON_ARGS=	-Dinstall-glib=no -Ddisable-gregex=no -Dstatic-dependency=no \
19
INSTALL_TARGET=	install-strip
19
		-Dwith-fuzzer=no -Dwithout-textui=no
20
20
21
OPTIONS_DEFINE=		BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR \
21
OPTIONS_DEFINE=		BOT CAPSICUM DOCS OTR PERL PROXY TRUECOLOR UTF8PROC
22
			UTF8PROC
22
OPTIONS_DEFAULT=	BOT CAPSICUM PERL PROXY TRUECOLOR
23
OPTIONS_DEFAULT=	BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR
24
OPTIONS_SUB=		yes
23
OPTIONS_SUB=		yes
25
24
26
BOT_DESC=			Bot support
25
BOT_DESC=		Bot support
27
BOT_CONFIGURE_WITH=		bot
26
CAPSICUM_DESC=		Capsicum support
28
CAPSICUM_DESC=			Capsicum support
27
OTR_DESC=		OTR (off-the-record) support
29
CAPSICUM_CONFIGURE_WITH=	capsicum
28
TRUECOLOR_DESC=		True color support
30
OTR_DESC=			OTR (off-the-record) support
29
UTF8PROC_DESC=		utf8proc support
31
OTR_CONFIGURE_ON=		--with-libotr-inc-prefix=${PREFIX}/include
32
OTR_CONFIGURE_OFF=		--with-otr=no
33
OTR_CONFIGURE_WITH=		otr
34
OTR_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt \
35
				libgpg-error.so:security/libgpg-error \
36
				libotr.so:security/libotr
37
PERL_USES=			perl5
38
PERL_CONFIGURE_ON=		--with-perl-lib=site
39
PERL_CONFIGURE_OFF=		--with-perl=no
40
PROXY_CONFIGURE_WITH=		proxy
41
SOCKS_CONFIGURE_WITH=		socks
42
TRUECOLOR_DESC=			True color support
43
TRUECOLOR_CONFIGURE_ENABLE=	true-color
44
UTF8PROC_DESC=			utf8proc support
45
UTF8PROC_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
46
UTF8PROC_CONFIGURE_ENABLE=	utf8proc
47
30
48
.if defined(WITHOUT_SSL)
31
BOT_MESON_YES=		with-bot
49
CONFIGURE_ARGS+=	--disable-ssl
32
CAPSICUM_MESON_YES=	with-capsicum
50
.else
33
OTR_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
51
USES+=		ssl
34
			libotr.so:security/libotr
52
.endif
35
OTR_MESON_YES=		with-otr
36
PERL_MESON_YES=		with-perl
37
PROXY_MESON_YES=	with-proxy
38
TRUECOLOR_MESON_YES=	enable-true-color
39
UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
40
UTF8PROC_MESON_NO=	disable-utf8proc
53
41
54
post-install:
42
PERL_USE_OFF=		perl5=build
55
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
43
56
	@${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf \
44
post-install-PERL-off:
57
		${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
45
	@${RM} -r ${STAGEDIR}${DATADIR}/scripts
58
46
59
post-install-PERL-on:
47
post-install:
60
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so
48
	${INSTALL_DATA} ${WRKSRC}/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
61
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irc/Irc.so
62
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/TextUI/TextUI.so
63
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/UI/UI.so
64
49
65
.include <bsd.port.mk>
50
.include <bsd.port.mk>
(-)b/irc/irssi/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1618317211
1
TIMESTAMP = 1655010990
2
SHA256 (irssi-1.2.3.tar.xz) = a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f
2
SHA256 (irssi-1.4.1.tar.xz) = 6a7692741bba16f3ba6f97cf7246421ac57055dcedcca9a4d21663f8efe47501
3
SIZE (irssi-1.2.3.tar.xz) = 1145292
3
SIZE (irssi-1.4.1.tar.xz) = 1210772
(-)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
 
(-)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-message (+8 lines)
Added Link Here
1
[
2
{ type: install
3
  message: <<EOM
4
If Perl support was enabled during compilation you need to make sure the module
5
is listed in /set autoload_modules
6
EOM
7
}
8
]
(-)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-142 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
@dir lib/irssi/modules
137
%%PERL%%lib/irssi/modules/libfe_perl.so
136
%%PROXY%%lib/irssi/modules/libirc_proxy.a
137
%%PROXY%%lib/irssi/modules/libirc_proxy.so
138
%%PROXY%%lib/irssi/modules/libirc_proxy.so
138
%%OTR%%lib/irssi/modules/libotr_core.a
139
%%OTR%%lib/irssi/modules/libotr_core.so
139
%%OTR%%lib/irssi/modules/libotr_core.so
140
%%PERL%%lib/irssi/modules/libperl_core.so
140
%%PERL%%%%SITE_ARCH%%/Irssi.pm
141
%%PERL%%%%SITE_ARCH%%/Irssi.pm
141
%%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
142
%%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
142
%%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
143
%%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
Lines 145-150 include/irssi/src/lib-config/module.h Link Here
145
%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
146
%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
146
%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
147
%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
147
%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
148
%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
149
libdata/pkgconfig/irssi-1.pc
148
man/man1/irssi.1.gz
150
man/man1/irssi.1.gz
149
%%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
151
%%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
150
%%PORTDOCS%%%%DOCSDIR%%/design.html
152
%%PORTDOCS%%%%DOCSDIR%%/design.html
Lines 276-289 man/man1/irssi.1.gz Link Here
276
%%PERL%%%%DATADIR%%/scripts/autoop.pl
278
%%PERL%%%%DATADIR%%/scripts/autoop.pl
277
%%PERL%%%%DATADIR%%/scripts/autorejoin.pl
279
%%PERL%%%%DATADIR%%/scripts/autorejoin.pl
278
%%PERL%%%%DATADIR%%/scripts/buf.pl
280
%%PERL%%%%DATADIR%%/scripts/buf.pl
279
%%PERL%%%%DATADIR%%/scripts/command.pl
280
%%PERL%%%%DATADIR%%/scripts/dns.pl
281
%%PERL%%%%DATADIR%%/scripts/dns.pl
281
%%PERL%%%%DATADIR%%/scripts/kills.pl
282
%%PERL%%%%DATADIR%%/scripts/kills.pl
282
%%PERL%%%%DATADIR%%/scripts/mail.pl
283
%%PERL%%%%DATADIR%%/scripts/mail.pl
283
%%PERL%%%%DATADIR%%/scripts/mlock.pl
284
%%PERL%%%%DATADIR%%/scripts/mlock.pl
284
%%PERL%%%%DATADIR%%/scripts/msg-event.pl
285
%%PERL%%%%DATADIR%%/scripts/quitmsg.pl
285
%%PERL%%%%DATADIR%%/scripts/quitmsg.pl
286
%%PERL%%%%DATADIR%%/scripts/redirect.pl
287
%%PERL%%%%DATADIR%%/scripts/scriptassist.pl
286
%%PERL%%%%DATADIR%%/scripts/scriptassist.pl
288
%%PERL%%%%DATADIR%%/scripts/usercount.pl
287
%%PERL%%%%DATADIR%%/scripts/usercount.pl
289
%%DATADIR%%/themes/colorless.theme
288
%%DATADIR%%/themes/colorless.theme

Return to bug 264628