diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile index a9d410084fe5..cb3f760da2db 100644 --- a/irc/ircII/Makefile +++ b/irc/ircII/Makefile @@ -1,51 +1,50 @@ PORTNAME= ircii -PORTVERSION= 20210314 -PORTREVISION= 1 +PORTVERSION= 20240111 CATEGORIES= irc MASTER_SITES= https://ircii.warped.com/ MAINTAINER= andrew@tao11.riddles.org.uk COMMENT= Small and high extensible IRC client WWW= http://www.eterna23.net/ircii/ LICENSE= BSD3CLAUSE GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${STAGEDIR}/${PREFIX}/share CONFIGURE_ARGS= --with-warnings DATADIR= ${PREFIX}/share/irc USES= cpe iconv ncurses tar:bzip2 CPE_VENDOR= eterna OPTIONS_DEFINE= EMACS_KEYS HELP IRCBUG OPENSSL SCRIPTS OPTIONS_DEFAULT=EMACS_KEYS HELP OPENSSL SCRIPTS OPTIONS_SUB= yes HELP_DESC= Install ircII help files EMACS_KEYS_DESC=Use emacs meta keys IRCBUG_DESC= Install ircII bug-reporting script SCRIPTS_DESC= Install ircII script collection EMACS_KEYS_CONFIGURE_WITH= emacs-meta-keys OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE} OPENSSL_LDFLAGS= -L${OPENSSLLIB} .include # The ordering is very specific. This must come after pre.mk or # ircII won't link against libssl from ports CPPFLAGS+= -I${ICONV_PREFIX}/include LDFLAGS+= -L${ICONV_PREFIX}/lib post-patch: - @${REINPLACE_CMD} -e '/^LDFLAGS =/s/$$/ ${STRIP} ${ICONV_LIB}/' \ + @${REINPLACE_CMD} -e '/^mandir =/s/@mandir@/$${DESTDIR}&/' \ + -e '/^LDFLAGS =/s/$$/ ${STRIP} ${ICONV_LIB}/' \ -e '/^INCLUDES =/s|$$| -I${ICONV_PREFIX}/include -DHAVE_ICONV_OPEN|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|PREFIX/|${PREFIX}/|' ${WRKSRC}/doc/ircII.1 post-install: ${MV} -f ${STAGEDIR}${PREFIX}/bin/irc-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/irc .include diff --git a/irc/ircII/distinfo b/irc/ircII/distinfo index fa74cd287fcc..2e19fdbc77dd 100644 --- a/irc/ircII/distinfo +++ b/irc/ircII/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619062628 -SHA256 (ircii-20210314.tar.bz2) = 866f2b847daed3d70859f208f7cb0f20b58c0933b2159f7ff92a68c518d393a9 -SIZE (ircii-20210314.tar.bz2) = 590626 +TIMESTAMP = 1715865319 +SHA256 (ircii-20240111.tar.bz2) = acb9351d9215c783111ad118ab2a1d3ac27f96e53db9bdc685e5dde1c14fd95d +SIZE (ircii-20240111.tar.bz2) = 576700 diff --git a/irc/ircII/files/patch-source_alias.c b/irc/ircII/files/patch-source_alias.c deleted file mode 100644 index ab1f5adbb2ee..000000000000 --- a/irc/ircII/files/patch-source_alias.c +++ /dev/null @@ -1,11 +0,0 @@ ---- source/alias.c.orig 2019-01-18 10:29:41 UTC -+++ source/alias.c -@@ -2528,7 +2528,7 @@ function_userhost(u_char *input) - static u_char * - function_strip(u_char *input) - { -- u_char tmpbuf[128], *result; -+ u_char tmpbuf[128], *result = NULL; - u_char *retval = NULL; - u_char *chars; - u_char *cp, *dp; diff --git a/irc/ircII/files/patch-source_help.c b/irc/ircII/files/patch-source_help.c deleted file mode 100644 index f95d308866a7..000000000000 --- a/irc/ircII/files/patch-source_help.c +++ /dev/null @@ -1,11 +0,0 @@ ---- source/help.c.orig 2019-05-29 09:55:50 UTC -+++ source/help.c -@@ -311,7 +311,7 @@ help_topic(u_char *path, u_char *name) - #ifdef ZCAT - if (my_strcmp(name + (my_strlen(name) - my_strlen(ZSUFFIX)), ZSUFFIX)) - { -- malloc_snprintf(&filename, "%s/%s%s", path, ZSUFFIX); -+ malloc_snprintf(&filename, "%s/%s%s", path, name, ZSUFFIX); - if (stat(CP(filename), &sb) == -1) - { - new_free(&filename);