diff options
author | Neel Chauhan <nc@FreeBSD.org> | 2021-03-15 17:38:14 +0000 |
---|---|---|
committer | Neel Chauhan <nc@FreeBSD.org> | 2021-03-15 17:38:14 +0000 |
commit | 10cd35070489725bf0500e8389414e64668a156d (patch) | |
tree | 6ca8412d48a718cbc75956e1124c8e00c3115da5 /irc/irssi/Makefile | |
parent | security/py-pycryptodome: Update to 3.10.1 (diff) |
irc/irssi: Revert to 1.2.2
The reason for the revert is complaints on IRC and questions to the maintainer
via email.
This commit:
- Restores the port to what it was before 1.3
- Bumps PORTEPOCH and PORTREVISION to 2
- These were both at 1 on the previous 1.2.2 package
- Fixes a minor issue when compiling with OTR (--with-otr being passed twice)
- Includes a patch for a glib related issue where pushing ctrl+space could break the client
This commit brings the port back inline with the current release version of
irssi as advertised on their download page (1.2.2 client + glib patch).
PR: 254237
Submitted by: David O'Rourke <dor.bsd@xm0.uk> (maintainer)
Notes
Notes:
svn path=/head/; revision=568480
Diffstat (limited to 'irc/irssi/Makefile')
-rw-r--r-- | irc/irssi/Makefile | 88 |
1 files changed, 47 insertions, 41 deletions
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 31db844a0afb..4310d9eb67ba 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= irssi -DISTVERSION= 1.3-dev-344 -DISTVERSIONSUFFIX= -gf57dcfe9 -PORTREVISION= 1 -PORTEPOCH= 1 +PORTVERSION= 1.2.2 +PORTREVISION= 2 +PORTEPOCH= 2 CATEGORIES?= irc +MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ MAINTAINER= dor.bsd@xm0.uk COMMENT= Modular IRC client with many features @@ -14,51 +14,57 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING # Until upstream makes a new release disable cpe -USES= compiler:c11 gettext-runtime gnome meson localbase:ldflags \ - ncurses perl5 pkgconfig ssl +USES= autoreconf cpe gettext-runtime gmake gnome libtool localbase \ + ncurses pkgconfig tar:xz USE_GNOME= glib20 -USE_LDCONFIG= yes -USE_GITHUB= yes -GH_TAGNAME= f57dcfe +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip -MESON_ARGS= -Dinstall-glib=no -Ddisable-gregex=no -Dstatic-dependency=no \ - -Dwith-fuzzer=no -Dwithout-textui=no - -# Default linker (bfd) in FreeBSD 11 breaks compilation -LDFLAGS_FreeBSD_11= -fuse-ld=lld - -# Force OpenSSL from base -CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl ${LDFLAGS_${OPSYS}_${OSREL:R}} - -OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY TRUECOLOR UTF8PROC -OPTIONS_DEFAULT= BOT CAPSICUM PERL PROXY TRUECOLOR +OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR \ + UTF8PROC +OPTIONS_DEFAULT= BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR OPTIONS_SUB= yes -BOT_DESC= Bot support -CAPSICUM_DESC= Capsicum support -OTR_DESC= OTR (off-the-record) support -TRUECOLOR_DESC= True color support -UTF8PROC_DESC= utf8proc support +BOT_DESC= Bot support +BOT_CONFIGURE_WITH= bot +CAPSICUM_DESC= Capsicum support +CAPSICUM_CONFIGURE_WITH= capsicum +OTR_DESC= OTR (off-the-record) support +OTR_CONFIGURE_ON= --with-libotr-inc-prefix=${PREFIX}/include +OTR_CONFIGURE_OFF= --with-otr=no +OTR_CONFIGURE_WITH= otr +OTR_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error \ + libotr.so:security/libotr +PERL_USES= perl5 +PERL_CONFIGURE_ON= --with-perl-lib=site +PERL_CONFIGURE_OFF= --with-perl=no +PROXY_CONFIGURE_WITH= proxy +SOCKS_DESC= Socks proxy support +SOCKS_CONFIGURE_WITH= socks +TRUECOLOR_DESC= True color support +TRUECOLOR_CONFIGURE_ENABLE= true-color +UTF8PROC_DESC= utf8proc support +UTF8PROC_LIB_DEPENDS= libutf8proc.so:textproc/utf8proc +UTF8PROC_CONFIGURE_ENABLE= utf8proc -BOT_MESON_YES= with-bot -CAPSICUM_MESON_YES= with-capsicum -OTR_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libotr.so:security/libotr -OTR_MESON_YES= with-otr -PERL_MESON_YES= with-perl -PROXY_MESON_YES= with-proxy -TRUECOLOR_MESON_YES= enable-true-color -UTF8PROC_LIB_DEPENDS= libutf8proc.so:textproc/utf8proc -UTF8PROC_MESON_NO= disable-utf8proc +.if defined(WITHOUT_SSL) +CONFIGURE_ARGS+= --disable-ssl +.else +USES+= ssl +.endif -PERL_USE_OFF= perl5=build - -post-install-PERL-off: - @${RM} -r ${STAGEDIR}${DATADIR}/scripts post-install: - ${INSTALL_DATA} ${WRKSRC}/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules + @${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf \ + ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample + +post-install-PERL-on: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irc/Irc.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/TextUI/TextUI.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/UI/UI.so .include <bsd.port.mk> |