Index | Thread | Search

From:
Matthieu Herrb <matthieu@openbsd.org>
Subject:
Re: cooledit update to 3.17.28
To:
Daniel Dickman <didickman@gmail.com>
Cc:
Marc Espie <espie@openbsd.org>, ports@openbsd.org
Date:
Sun, 25 Feb 2024 08:35:55 +0100

Download raw body.

Thread
On Sat, Feb 24, 2024 at 04:00:44PM -0500, Daniel Dickman wrote:
> Hi Marc, while looking into cooledit with python3 support I noticed that 
> the project looks like it's actually still active.
> 
> Ok on the diff below to use working HOMEPAGE and SITES and update to the 
> latest version in the 3.17 series?
> 
> This update fixes a few minor bugs, but is really an intermediate step 
> before going to the 4.x series which appears to support python3.
> 
> ok?

Works here. There are some alignment glitches in the Makefile but
there where there already. With or without those fixed, ok matthieu@

> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/cooledit/Makefile,v
> diff -u -p -u -r1.52 Makefile
> --- Makefile	24 Feb 2024 19:08:20 -0000	1.52
> +++ Makefile	24 Feb 2024 20:57:31 -0000
> @@ -1,19 +1,21 @@
> -COMMENT =	easy to use, graphical editor
> +COMMENT =	easy to use graphical editor
>  
> -DISTNAME =	cooledit-3.17.17
> -REVISION =	6
> +DISTNAME =	cooledit-3.17.28
>  
>  CATEGORIES =	editors
>  
> -HOMEPAGE =	ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
> +HOMEPAGE =	https://github.com/paulsheer/cooledit/
>  
>  SHARED_LIBS =	Cw	1.0
>  
>  MAINTAINER =	Marc Espie <espie@openbsd.org>
>  
> +# GPLv2+
> +PERMIT_PACKAGE =	Yes
> +
>  WANTLIB =	X11 c iconv intl util xcb
>  
> -SITES =		http://fossies.org/linux/misc/
> +SITES =		https://www.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
>  
>  # not compatible with Python 3
>  CONFIGURE_ENV +=NOPYTHON=Yes
> @@ -25,8 +27,5 @@ CONFIGURE_STYLE = gnu
>  CONFIGURE_ENV += XTERM_CMD=xterm LDFLAGS="-L${LOCALBASE}/lib"
>  
>  CONFIGURE_ARGS += --enable-static --disable-mail-author
> -
> -# GPLv2+
> -PERMIT_PACKAGE =	Yes
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/editors/cooledit/distinfo,v
> diff -u -p -u -r1.7 distinfo
> --- distinfo	18 Jan 2015 03:13:49 -0000	1.7
> +++ distinfo	24 Feb 2024 20:57:31 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (cooledit-3.17.17.tar.gz) = PA2V1Al5bj2SQF6OwxessEBxO0Msyf+XQvhlfAkr5Ik=
> -SIZE (cooledit-3.17.17.tar.gz) = 1674273
> +SHA256 (cooledit-3.17.28.tar.gz) = TYtmRZJze7HUuT5Qn+GF1xIxj0D8PFo2u8Ui2H9raG0=
> +SIZE (cooledit-3.17.28.tar.gz) = 1265017
> Index: patches/patch-man_cooledit_1
> ===================================================================
> RCS file: /cvs/ports/editors/cooledit/patches/patch-man_cooledit_1,v
> diff -u -p -u -r1.2 patch-man_cooledit_1
> --- patches/patch-man_cooledit_1	11 Mar 2022 18:58:28 -0000	1.2
> +++ patches/patch-man_cooledit_1	24 Feb 2024 20:57:31 -0000
> @@ -1,6 +1,7 @@
> ---- man/cooledit.1.orig	Mon Apr  4 22:47:45 2005
> -+++ man/cooledit.1	Sat Mar 21 17:49:43 2015
> -@@ -1548,7 +1548,7 @@ newline characters. A \fI"non"-paragraph\fP is one of 
> +Index: man/cooledit.1
> +--- man/cooledit.1.orig
> ++++ man/cooledit.1
> +@@ -1539,7 +1539,7 @@ newline characters. A \fI"non"-paragraph\fP is one of 
>   .TP
>   .I   -
>   Paragraphs containing any line that begins with the characters:
> @@ -9,7 +10,7 @@
>   .TP
>   .I   -
>   Paragraphs containing any line (other than the first line) that begins 
> -@@ -1951,7 +1951,7 @@ displayed as follows on black:
> +@@ -1942,7 +1942,7 @@ displayed as follows on black:
>   ^A - ^Z
>   .TP
>   .I 27, 28, 29, 30, 31
> Index: patches/patch-widget_coollocal_h
> ===================================================================
> RCS file: /cvs/ports/editors/cooledit/patches/patch-widget_coollocal_h,v
> diff -u -p -u -r1.2 patch-widget_coollocal_h
> --- patches/patch-widget_coollocal_h	11 Mar 2022 18:58:28 -0000	1.2
> +++ patches/patch-widget_coollocal_h	24 Feb 2024 20:57:31 -0000
> @@ -1,6 +1,7 @@
> ---- widget/coollocal.h.orig	Wed May 19 17:11:58 2010
> -+++ widget/coollocal.h	Wed May 19 17:12:17 2010
> -@@ -49,7 +49,6 @@ CWidget *allocate_widget (Window newwin,
> +Index: widget/coollocal.h
> +--- widget/coollocal.h.orig
> ++++ widget/coollocal.h
> +@@ -51,7 +51,6 @@ CWidget *allocate_widget (Window newwin,
>   int eh_picture (struct cool_widget *w, XEvent * xevent, CEvent * cwevent);
>   void drawstring_xy (Window win, int x, int y, const char *text);
>   void drawstring_xy_hotkey (Window win, int x, int y, const char *text, int hotkey);
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/cooledit/pkg/PLIST,v
> diff -u -p -u -r1.10 PLIST
> --- pkg/PLIST	24 Feb 2024 19:08:20 -0000	1.10
> +++ pkg/PLIST	24 Feb 2024 20:57:31 -0000
> @@ -25,6 +25,7 @@ share/cooledit/syntax/fortran.syntax
>  share/cooledit/syntax/html.syntax
>  share/cooledit/syntax/jasm.syntax
>  share/cooledit/syntax/java.syntax
> +share/cooledit/syntax/js.syntax
>  share/cooledit/syntax/latex.syntax
>  share/cooledit/syntax/lsm.syntax
>  share/cooledit/syntax/lsm4.syntax
> @@ -49,19 +50,3 @@ share/cooledit/syntax/texinfo.syntax
>  share/cooledit/syntax/unknown.syntax
>  share/cooledit/syntax/xml.syntax
>  share/coolicon/
> -share/locale/cs/LC_MESSAGES/cooledit.mo
> -share/locale/da/LC_MESSAGES/cooledit.mo
> -share/locale/de/LC_MESSAGES/cooledit.mo
> -share/locale/es/LC_MESSAGES/cooledit.mo
> -share/locale/fi/LC_MESSAGES/cooledit.mo
> -share/locale/fr/LC_MESSAGES/cooledit.mo
> -share/locale/it/LC_MESSAGES/cooledit.mo
> -share/locale/ja/LC_MESSAGES/cooledit.mo
> -share/locale/ko/LC_MESSAGES/cooledit.mo
> -share/locale/nl/LC_MESSAGES/cooledit.mo
> -share/locale/no/LC_MESSAGES/cooledit.mo
> -share/locale/pl/LC_MESSAGES/cooledit.mo
> -share/locale/pt/LC_MESSAGES/cooledit.mo
> -share/locale/ru/LC_MESSAGES/cooledit.mo
> -share/locale/sl/LC_MESSAGES/cooledit.mo
> -share/locale/sv/LC_MESSAGES/cooledit.mo
> 

-- 
Matthieu Herrb