From 297da55e343a1f12023cb6607f2a170003d1d3be Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 20 Dec 2011 11:14:40 +0000
Subject: [PATCH] update to 3.17.17 and switch to using python.port.mk (using
 the default python version, this was previously using 2.4)

---
 editors/cooledit/Makefile  | 29 ++++++++++++++---------------
 editors/cooledit/distinfo  | 10 +++++-----
 editors/cooledit/pkg/PLIST |  8 ++++----
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 4463ba10b2f..7cbd9ef6c8d 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.37 2011/12/02 14:36:13 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2011/12/20 11:14:40 sthen Exp $
 
 COMMENT =	easy to use, graphical editor
 
+DISTNAME =	cooledit-3.17.17
+
 CATEGORIES =	editors
-MASTER_SITES =	${HOMEPAGE}
-HOMEPAGE = 	ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
-DISTNAME =	cooledit-3.17.14
-REVISION =	6
+
+HOMEPAGE =	ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
 
 SHARED_LIBS =	Cw	1.0
 
@@ -15,31 +15,30 @@ MAINTAINER =	Marc Espie <espie@openbsd.org>
 FLAVORS =	python
 FLAVOR ?=
 
-PYTHON_VER =	2.4
-WANTLIB =	X11 Xau Xdmcp c pthread-stubs util xcb
+WANTLIB =	X11 c util xcb
 USE_LIBTOOL =	Yes
 
+MASTER_SITES =	http://fossies.org/linux/misc/
+
 .if ${FLAVOR:Mpython}
-LIB_DEPENDS +=	python->=${PYTHON_VER},<2.5:lang/python/${PYTHON_VER}
-CONFIGURE_ENV +=PYTHON_VER=${PYTHON_VER} LOCALBASE=${LOCALBASE}
-WANTLIB +=	pthread m python${PYTHON_VER}
+MODULES +=	lang/python
+LIB_DEPENDS +=	${MODPY_LIB_DEPENDS}
+CONFIGURE_ENV += PYTHON_VER=${MODPY_VERSION} LOCALBASE=${LOCALBASE}
+WANTLIB +=	pthread m ${MODPY_WANTLIB}
 .else
 CONFIGURE_ENV +=NOPYTHON=Yes
 .endif
 
-MODULES =	devel/gettext
+MODULES +=	devel/gettext
 USE_GROFF =	Yes
 
 CONFIGURE_STYLE = gnu
 CONFIGURE_ENV += XTERM_CMD=xterm LDFLAGS="-L${LOCALBASE}/lib"
 
-# XXX temporary until we have full internationalization support
-#CONFIGURE_ENV +=		ac_cv_header_wchar_h=no
-
 CONFIGURE_ARGS += ${CONFIGURE_SHARED}
 CONFIGURE_ARGS += --enable-static --disable-mail-author
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_FTP =	Yes
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/editors/cooledit/distinfo b/editors/cooledit/distinfo
index 3ed89865708..4dd15317462 100644
--- a/editors/cooledit/distinfo
+++ b/editors/cooledit/distinfo
@@ -1,5 +1,5 @@
-MD5 (cooledit-3.17.14.tar.gz) = xb+g771hYLW6hotyJBjMAg==
-RMD160 (cooledit-3.17.14.tar.gz) = T1EdmWzkK7kWTdQ9T+8yAOSKBZU=
-SHA1 (cooledit-3.17.14.tar.gz) = /ataBiXKQb5iKKB9N4zto/qYRsc=
-SHA256 (cooledit-3.17.14.tar.gz) = rAhGLMxAqnCm7+ntiiCscE2jewctA4c+YCGmDpVNfJ0=
-SIZE (cooledit-3.17.14.tar.gz) = 1671619
+MD5 (cooledit-3.17.17.tar.gz) = u481TVN4+PqeF4skFBUphw==
+RMD160 (cooledit-3.17.17.tar.gz) = lt3eFPraIgw4EULWgUdzWsXHUWM=
+SHA1 (cooledit-3.17.17.tar.gz) = c/m//LXj6S8KcdPzT+8Z6wKH7gc=
+SHA256 (cooledit-3.17.17.tar.gz) = PA2V1Al5bj2SQF6OwxessEBxO0Msyf+XQvhlfAkr5Ik=
+SIZE (cooledit-3.17.17.tar.gz) = 1674273
diff --git a/editors/cooledit/pkg/PLIST b/editors/cooledit/pkg/PLIST
index 227378f70c6..778c078a277 100644
--- a/editors/cooledit/pkg/PLIST
+++ b/editors/cooledit/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/05/16 20:26:51 alek Exp $
-bin/cooledit
+@comment $OpenBSD: PLIST,v 1.7 2011/12/20 11:14:40 sthen Exp $
+@bin bin/cooledit
 bin/cooledit-gdb
-bin/coolman
+@bin bin/coolman
 bin/coolproject
-bin/smalledit
+@bin bin/smalledit
 lib/libCw.a
 lib/libCw.la
 @man man/man1/cooledit.1