From nobody Wed Nov 09 13:14:21 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N6lmY70DVz4V0N3; Wed, 9 Nov 2022 13:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N6lmY6PMcz44l8; Wed, 9 Nov 2022 13:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zkS9gaOSoh6GSTcc4fRk/zoyK0y9NL1ZNsc1jhT9lkI=; b=azevwkNT26+DxWbr9yW3BB7ol4cdjp1RNCr9QUJwbSa2oXMXZErDZvvLMhaYBCQLZTOes/ O4fouTcB86QiXpw2R5f11o/9/icoZWWeDcRuQdHuP/9S3z8OGDFka9Ph+YwdNm+Bk4caMP ERw5bDgwVPbXWWbqEs9BBz3uPaIw28P/PH1NhOBBjqJmhuHgeHFISiKQ1ydSNxSlqf5pin Flgjg+GgSaV5mcIS3Jy8VHrMGrtk/qpaRYGUS8nHLSezEZaC5or9HK/YZ+UK7z9xrwZgtp LwpPbvBGYP/VQUNDR6lrA6WTfrpzEUzksfja1SrxQlVyWQk04mH0pVMwOoQfTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zkS9gaOSoh6GSTcc4fRk/zoyK0y9NL1ZNsc1jhT9lkI=; b=VeylViJoFCF9aiqF7prnd4+Sfj0rwGoNC74VEnu3J+MK9y58QSV3WXVuPHrRZ7wMNX2Qyk o/Gl/W9268B3IKFevy/yGUcJGnEXGsR53Y4C3pj6tN+AY8MgeW20KRAUdtbD1XKSsn+pA5 K/2/Z1TXrPqjdfZ+gUW8dOaWSnX8cpj+rEYLBAoxGVmNL6vHt1WnoIYbpPcmP+8SjjtyRz KDWbNapGGFxkr61HZlKEq/d6bWvckLDHnWXxcDA/02cnQ8tIiz7k935Zki39i1rB4UPUDk maNTlJP5L7+Bhp0FgZ3e6Gr4w8qM/hQAovRF+Z7PEQP31d0fBu8Dd5K/oZzRJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667999661; a=rsa-sha256; cv=none; b=WZ/7YtHC1xxa/7aKl4UiF0TNnhSgwX5b4t6qguVr49t/ryDAKAun4e7rY86FkODJ9QoNNq 0B5VDbKlU6P77MoOcoqI5hTZaWdWkXREws+JFm7RuYUJ14bPpQujyvYCFh3RZ2OGV/g+AI uHR7+KW5wWk+rbZ8rAiX6gp7Z+b5FBJesr7GwfYIHOPJoy27DFXfY+kVFlyjFhpInrXYSQ ItGcPg8EOYcT+NP9tVB1ekDyhVXp/8n4DA4qsnVt5/b9VVjdLW+GOOlksPi+qMjfNQWpKa vhB/mXJRHMj8gCKrOc21fgoMgbM9R/1X1CNhxjnPMEA6yLRgal254tUr+xUF2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N6lmY5QQ1zMrM; Wed, 9 Nov 2022 13:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A9DEL4x045095; Wed, 9 Nov 2022 13:14:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9DELbf045094; Wed, 9 Nov 2022 13:14:21 GMT (envelope-from git) Date: Wed, 9 Nov 2022 13:14:21 GMT Message-Id: <202211091314.2A9DELbf045094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: a5f1cca72a5b - main - mail/wmmaiload: fix build on recent FreeBSD. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5f1cca72a5b84fe783e600eb468cf140b5e3a31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5f1cca72a5b84fe783e600eb468cf140b5e3a31 commit a5f1cca72a5b84fe783e600eb468cf140b5e3a31 Author: Robert Clausecker AuthorDate: 2022-11-07 18:55:17 +0000 Commit: Fernando Apesteguía CommitDate: 2022-11-09 13:10:25 +0000 mail/wmmaiload: fix build on recent FreeBSD. Also fix some obvious things (missing deps, etc). PR: 267613 Reported by: fuz@fuz.su (maintainer) MFH: 2022Q4 (build fix) --- mail/wmmaiload/Makefile | 31 ++++---------- .../files/patch-wmmaiload-config_mainwindow.c | 47 ++++++++++++++++++++++ mail/wmmaiload/files/patch-wmmaiload_Init.make | 18 +++++++++ mail/wmmaiload/files/patch-wmmaiload_checkthread.c | 47 ++++++++++++++++++++++ mail/wmmaiload/files/patch-wmmaiload_dockapp.c | 10 +++++ mail/wmmaiload/files/patch-wmmaiload_main.h | 11 +++++ mail/wmmaiload/files/patch-wmmaiload_ssl.c | 20 +++++++++ 7 files changed, 160 insertions(+), 24 deletions(-) diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile index 22348e59dbd1..48cbb6ebb5b0 100644 --- a/mail/wmmaiload/Makefile +++ b/mail/wmmaiload/Makefile @@ -1,5 +1,6 @@ PORTNAME= wmmaiload PORTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= mail windowmaker MASTER_SITES= http://tnemeth.free.fr/projets/programmes/ @@ -10,14 +11,16 @@ WWW= http://tnemeth.free.fr/projets/dockapps.html LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: application -BROKEN_FreeBSD_14= ld: error: duplicate symbol: application +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 USES= gmake gnome localbase:ldflags pkgconfig ssl tar:bzip2 xorg -USE_XORG= xpm -USE_GNOME= gtk20 +USE_XORG= x11 xext xpm +USE_GNOME= cairo gdkpixbuf2 gtk20 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} +CFLAGS+= -fcommon CPPFLAGS+= -I${OPENSSLINC} -D_GNU_SOURCE LDFLAGS+= -L${OPENSSLLIB} MAKE_ENV= DEBUG_CFLAGS="" DEBUG_LDFLAGS="" @@ -28,26 +31,6 @@ PLIST_FILES= bin/wmmaiload bin/wmmaiload-config \ post-patch: @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ 's| =| ?=|' -.for i in wmmaiload/Init.make - @${REINPLACE_CMD} -e "s|'-lssl'|'-lssl -lcrypto'| ; \ - s|-L/usr/X11R6/lib||" ${WRKSRC}/${i} -.endfor -.for i in wmmaiload/checkthread.c - @${REINPLACE_CMD} -e 's|isnumber(|isnum(|g' ${WRKSRC}/${i} -.endfor -.for i in wmmaiload/main.h - @${REINPLACE_CMD} -e '/time\.h>/d' ${WRKSRC}/${i} -.endfor -.for i in wmmaiload/ssl.c - @${REINPLACE_CMD} -e 's|SSLv2_client_method|SSLv23_client_method|' \ - ${WRKSRC}/${i} -.endfor -.for i in wmmaiload-config/mainwindow.c - @${REINPLACE_CMD} -e 's|remove;|rm;|g ; \ - s|remove,|rm,|g ; \ - s|remove =|rm =|g ; \ - s|PACKAGE"-config"|PACKAGE|g' ${WRKSRC}/${i} -.endfor do-install: .for i in wmmaiload wmmaiload-config diff --git a/mail/wmmaiload/files/patch-wmmaiload-config_mainwindow.c b/mail/wmmaiload/files/patch-wmmaiload-config_mainwindow.c new file mode 100644 index 000000000000..10678baec26e --- /dev/null +++ b/mail/wmmaiload/files/patch-wmmaiload-config_mainwindow.c @@ -0,0 +1,47 @@ +--- wmmaiload-config/mainwindow.c.orig 2009-02-23 02:58:00 UTC ++++ wmmaiload-config/mainwindow.c +@@ -12,7 +12,7 @@ + + static GtkWidget *b_edit; + static GtkWidget *b_set; +-static GtkWidget *b_remove; ++static GtkWidget *b_rm; + + static gint list_sel_cb (GtkCList *clist, + gint row, +@@ -23,7 +23,7 @@ static gint list_sel_cb (GtkCList *clist, + selected_row = row; + gtk_widget_set_sensitive(b_edit, TRUE); + gtk_widget_set_sensitive(b_set, TRUE); +- gtk_widget_set_sensitive(b_remove, TRUE); ++ gtk_widget_set_sensitive(b_rm, TRUE); + return TRUE; + } + +@@ -37,7 +37,7 @@ gint list_unsel_cb (GtkCList *clist, + selected_row = -1; + gtk_widget_set_sensitive(b_edit, FALSE); + gtk_widget_set_sensitive(b_set, FALSE); +- gtk_widget_set_sensitive(b_remove, FALSE); ++ gtk_widget_set_sensitive(b_rm, FALSE); + return TRUE; + } + +@@ -66,7 +66,7 @@ void create_mainwindow() + + /*** FENÊTRE PRINCIPALE ***/ + application = gtk_window_new(GTK_WINDOW_TOPLEVEL); +- gtk_window_set_title(GTK_WINDOW(application), PACKAGE"-config"); ++ gtk_window_set_title(GTK_WINDOW(application), PACKAGE); + /*-- Connexion aux signaux --*/ + gtk_signal_connect(GTK_OBJECT(application), "delete_event", + GTK_SIGNAL_FUNC(quit_app), NULL); +@@ -246,7 +246,7 @@ void create_mainwindow() + gtk_table_attach_defaults(GTK_TABLE(table), bouton, 2, 3, 0, 1); + gtk_widget_set_sensitive(bouton, FALSE); + gtk_widget_show(bouton); +- b_remove = bouton; ++ b_rm = bouton; + + /*--- Frame 5 ---*/ + frame = gtk_frame_new(NULL); diff --git a/mail/wmmaiload/files/patch-wmmaiload_Init.make b/mail/wmmaiload/files/patch-wmmaiload_Init.make new file mode 100644 index 000000000000..93cd2c1435b8 --- /dev/null +++ b/mail/wmmaiload/files/patch-wmmaiload_Init.make @@ -0,0 +1,18 @@ +--- wmmaiload/Init.make.orig 2005-08-28 19:14:57 UTC ++++ wmmaiload/Init.make +@@ -45,13 +45,13 @@ endif + # SPECIFIC INFORMATIONS : + # + +-LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl') ++LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl -lcrypto') + LIB_THREADS = $(shell grep -q '^OPTIONS.*HAVE_THREADS' ../Config.make && echo '-lpthread') + + CROSS_COMPILE = + USER_CPPFLAGS = $(OPTIONS) + USER_CFLAGS = +-USER_LDFLAGS = -L/usr/X11R6/lib -lX11 -lXext -lXpm $(LIB_THREADS) $(LIB_SSL) ++USER_LDFLAGS = -lX11 -lXext -lXpm $(LIB_THREADS) $(LIB_SSL) + + + #***************************************************************** diff --git a/mail/wmmaiload/files/patch-wmmaiload_checkthread.c b/mail/wmmaiload/files/patch-wmmaiload_checkthread.c new file mode 100644 index 000000000000..eee126b8dcf8 --- /dev/null +++ b/mail/wmmaiload/files/patch-wmmaiload_checkthread.c @@ -0,0 +1,47 @@ +--- wmmaiload/checkthread.c.orig 2009-02-23 02:59:20 UTC ++++ wmmaiload/checkthread.c +@@ -85,7 +85,7 @@ static Bool check_imap(MailBox *box, time_t now); + #endif /* HAVE_IMAP */ + #ifdef HAVE_MH + static Bool check_mh(MailBox *box, time_t now); +-static Bool isnumber(const char*); ++static Bool isnum(const char*); + static Bool isdir(const char*); + static Bool isfile(const char *); + static char *absname(const char*, int); +@@ -304,7 +304,7 @@ static Bool check_imap(MailBox *box, time_t now) + + + #ifdef HAVE_MH +-static Bool isnumber(const char *s) ++static Bool isnum(const char *s) + { + while (*s != '\0') + { +@@ -420,7 +420,7 @@ static char *mh_get_profile(void) + + if ((cp = getenv("MH"))) + { +- if (*cp |= '/') ++ if (*cp != '/') + profile = absname(cp, CWD); + else + profile = xstrdup(cp); +@@ -488,7 +488,7 @@ static int mh_getseqcnt(const char *word) + { + int retval = 0; + +- if (isnumber(word)) ++ if (isnum(word)) + retval = 1; + else + { +@@ -607,7 +607,7 @@ static int mh_getmails(const char *mh_box) + + while ((d_entry = readdir(dir))) + { +- if (isnumber(d_entry->d_name)) ++ if (isnum(d_entry->d_name)) + { + char * tmp = NULL; + diff --git a/mail/wmmaiload/files/patch-wmmaiload_dockapp.c b/mail/wmmaiload/files/patch-wmmaiload_dockapp.c new file mode 100644 index 000000000000..52f88ec43ad9 --- /dev/null +++ b/mail/wmmaiload/files/patch-wmmaiload_dockapp.c @@ -0,0 +1,10 @@ +--- wmmaiload/dockapp.c.orig 2022-11-07 08:58:34 UTC ++++ wmmaiload/dockapp.c +@@ -26,6 +26,7 @@ + #include "dockapp.h" + #include + #include ++#include + #include + + #define WINDOWED_SIZE_W 64 diff --git a/mail/wmmaiload/files/patch-wmmaiload_main.h b/mail/wmmaiload/files/patch-wmmaiload_main.h new file mode 100644 index 000000000000..cf70edc2c584 --- /dev/null +++ b/mail/wmmaiload/files/patch-wmmaiload_main.h @@ -0,0 +1,11 @@ +--- wmmaiload/main.h.orig 2005-08-28 11:54:03 UTC ++++ wmmaiload/main.h +@@ -27,8 +27,6 @@ + #ifndef MAIN_H + #define MAIN_H + +-#include +-#include + #include + #include + #include "dockapp.h" diff --git a/mail/wmmaiload/files/patch-wmmaiload_ssl.c b/mail/wmmaiload/files/patch-wmmaiload_ssl.c new file mode 100644 index 000000000000..a422839eec16 --- /dev/null +++ b/mail/wmmaiload/files/patch-wmmaiload_ssl.c @@ -0,0 +1,20 @@ +--- wmmaiload/ssl.c.orig 2005-07-30 13:52:55 UTC ++++ wmmaiload/ssl.c +@@ -23,6 +23,8 @@ + * + */ + ++#include ++ + #include "config.h" + + #ifdef HAVE_SSL +@@ -39,7 +41,7 @@ static SSL_CTX *init_CTX(void) + + OpenSSL_add_all_algorithms(); + +- method = SSLv2_client_method(); ++ method = SSLv23_client_method(); + ctx = SSL_CTX_new(method); + return ctx; + }