Index | Thread | Search

From:
Daniel Dickman <didickman@gmail.com>
Subject:
Re: retire some python 2 ports
To:
Matthieu Herrb <matthieu@herrb.eu>
Cc:
ports@openbsd.org, espie@openbsd.org
Date:
Sat, 17 Feb 2024 16:37:26 -0500

Download raw body.

Thread

On Sat, 17 Feb 2024, Matthieu Herrb wrote:

> On Sat, Feb 17, 2024 at 11:51:05AM -0500, Daniel Dickman wrote:
> 
> for cooledit, it's a python flavor. You could remove only the -python
> flavor.
> 
> Not that I would miss cooledit a lot. but I used to like (and use) it
> some decades ago.
> -- 
> Matthieu Herrb
> 

That works too. here's a diff for that. I was still able to launch 
cooledit.


Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/cooledit/Makefile,v
diff -u -p -u -r1.51 Makefile
--- Makefile	21 Sep 2023 12:22:32 -0000	1.51
+++ Makefile	17 Feb 2024 21:32:53 -0000
@@ -1,7 +1,7 @@
 COMMENT =	easy to use, graphical editor
 
 DISTNAME =	cooledit-3.17.17
-REVISION =	5
+REVISION =	6
 
 CATEGORIES =	editors
 
@@ -11,22 +11,12 @@ SHARED_LIBS =	Cw	1.0
 
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 
-FLAVORS =	python
-FLAVOR ?=
-
 WANTLIB =	X11 c iconv intl util xcb
 
 SITES =		http://fossies.org/linux/misc/
 
-.if ${FLAVOR:Mpython}
-MODULES +=	lang/python
-MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
-LIB_DEPENDS +=	${MODPY_LIB_DEPENDS}
-CONFIGURE_ENV += PYTHON_VER=${MODPY_VERSION} LOCALBASE=${LOCALBASE}
-WANTLIB +=	pthread m ${MODPY_WANTLIB}
-.else
+# not compatible with Python 3
 CONFIGURE_ENV +=NOPYTHON=Yes
-.endif
 
 BUILD_DEPENDS += devel/gettext,-tools
 LIB_DEPENDS +=	devel/gettext,-runtime
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/editors/cooledit/pkg/DESCR,v
diff -u -p -u -r1.5 DESCR
--- pkg/DESCR	16 May 2005 20:26:51 -0000	1.5
+++ pkg/DESCR	17 Feb 2024 21:32:53 -0000
@@ -1,8 +1,5 @@
 Cooledit is a suite of programs consisting of the following:
    - cooledit - a GUI based editor which allows you to call external programs
 	(for instance LaTeX on a LaTeX file)
-   - smalledit - a stripped down version of cooledit 
+   - smalledit - a stripped down version of cooledit
    - coolman - a man page browser
-
-FLAVOR=python  
-	turns it into a programmable editor, must have Python 2.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/cooledit/pkg/PLIST,v
diff -u -p -u -r1.9 PLIST
--- pkg/PLIST	11 Mar 2022 18:58:28 -0000	1.9
+++ pkg/PLIST	17 Feb 2024 21:32:53 -0000
@@ -3,7 +3,7 @@ bin/cooledit-gdb
 @bin bin/coolman
 bin/coolproject
 @bin bin/smalledit
-lib/libCw.a
+@static-lib lib/libCw.a
 lib/libCw.la
 @lib lib/libCw.so.${LIBCw_VERSION}
 @man man/man1/cooledit.1