Changes 3.17.11:

* Improvements and bug-fixes
* coolicon has been removed

8 files changed, 63 insertions, 154 deletions

diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index cd5d57423de..cb2ed0ee9a9 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,23 +1,21 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:14:38 tv Exp $
-#
+# $NetBSD: Makefile,v 1.13 2004/11/08 15:48:20 adam Exp $
 
-DISTNAME=	cooledit-3.17.5
-PKGREVISION=	2
+DISTNAME=	cooledit-3.17.11
 CATEGORIES=	editors
-MASTER_SITES=	http://cooledit.sourceforge.net/
+MASTER_SITES=	ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://cooledit.sourceforge.net/
 COMMENT=	Full-featured text editor
 
-BUILD_USES_MSGFMT=	# defined
+BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK3=		# defined
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
-USE_PKGLOCALEDIR=	# defined
-USE_X11=		# defined
-GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 post-configure:
@@ -27,5 +25,7 @@ post-configure:
 			< ${WRKSRC}/config.h.bak > ${WRKSRC}/config.h ; \
 	fi
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/cooledit/PLIST b/editors/cooledit/PLIST
index 9af5d3303d4..acdc47b015e 100644
--- a/editors/cooledit/PLIST
+++ b/editors/cooledit/PLIST
@@ -1,72 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:30 jlam Exp $
-bin/coolbrowse
+@comment $NetBSD: PLIST,v 1.3 2004/11/08 15:48:20 adam Exp $
 bin/cooledit
 bin/cooledit-gdb
-bin/coolicon
-bin/coolinput
-bin/coollistbox
 bin/coolman
-bin/coolmessage
 bin/coolproject
-bin/coolquery
 bin/smalledit
-lib/cooledit/Xmlrpclib.py
-lib/cooledit/c_utils.py
-lib/cooledit/global.py
-lib/cooledit/sh_utils.py
-lib/cooledit/syntax/ada95.syntax
-lib/cooledit/syntax/bapc.syntax
-lib/cooledit/syntax/c.syntax
-lib/cooledit/syntax/changelog.syntax
-lib/cooledit/syntax/diff.syntax
-lib/cooledit/syntax/fortran.syntax
-lib/cooledit/syntax/html.syntax
-lib/cooledit/syntax/jasm.syntax
-lib/cooledit/syntax/java.syntax
-lib/cooledit/syntax/latex.syntax
-lib/cooledit/syntax/lsm.syntax
-lib/cooledit/syntax/lua.syntax
-lib/cooledit/syntax/mail.syntax
-lib/cooledit/syntax/makefile.syntax
-lib/cooledit/syntax/mhtml.syntax
-lib/cooledit/syntax/ml.syntax
-lib/cooledit/syntax/mudela.syntax
-lib/cooledit/syntax/nroff.syntax
-lib/cooledit/syntax/pascal.syntax
-lib/cooledit/syntax/perl.syntax
-lib/cooledit/syntax/php.syntax
-lib/cooledit/syntax/prolog.syntax
-lib/cooledit/syntax/python.syntax
-lib/cooledit/syntax/sh.syntax
-lib/cooledit/syntax/smalltalk.syntax
-lib/cooledit/syntax/swig.syntax
-lib/cooledit/syntax/texinfo.syntax
-lib/cooledit/syntax/unknown.syntax
-lib/cooledit/zope_utils.py
-lib/coolicon/browse.xpm
-lib/coolicon/cdrom_eject.xpm
-lib/coolicon/cdrom_view.xpm
-lib/coolicon/cooledit.xpm
-lib/coolicon/coolicon.config
-lib/coolicon/dynamite.xpm
-lib/coolicon/e.data
-lib/coolicon/gmc.xpm
-lib/coolicon/launch.xpm
-lib/coolicon/lyx.xpm
-lib/coolicon/manual.xpm
-lib/coolicon/mc.xpm
-lib/coolicon/modify-xinitrc
-lib/coolicon/netscape.xpm
-lib/coolicon/nscape.xpm
-lib/coolicon/phonedown.xpm
-lib/coolicon/phoneup.xpm
-lib/coolicon/printer.xpm
-lib/coolicon/spanner.xpm
-lib/coolicon/xterm.xpm
-lib/coolicon/xv.xpm
 lib/libCw.la
 man/man1/cooledit.1
-man/man1/coolicon.1
 man/man1/coolman.1
 man/man1/smalledit.1
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/cooledit.mo
@@ -85,6 +24,41 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/cooledit.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/cooledit.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/cooledit.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/cooledit.mo
-@dirrm lib/coolicon
-@dirrm lib/cooledit/syntax
-@dirrm lib/cooledit
+share/cooledit/c_utils.py
+share/cooledit/global.py
+share/cooledit/sh_utils.py
+share/cooledit/syntax/ada95.syntax
+share/cooledit/syntax/bapc.syntax
+share/cooledit/syntax/c.syntax
+share/cooledit/syntax/changelog.syntax
+share/cooledit/syntax/css.syntax
+share/cooledit/syntax/diff.syntax
+share/cooledit/syntax/fortran.syntax
+share/cooledit/syntax/html.syntax
+share/cooledit/syntax/jasm.syntax
+share/cooledit/syntax/java.syntax
+share/cooledit/syntax/latex.syntax
+share/cooledit/syntax/lsm.syntax
+share/cooledit/syntax/lsm4.syntax
+share/cooledit/syntax/lua.syntax
+share/cooledit/syntax/mail.syntax
+share/cooledit/syntax/makefile.syntax
+share/cooledit/syntax/mhtml.syntax
+share/cooledit/syntax/ml.syntax
+share/cooledit/syntax/mudela.syntax
+share/cooledit/syntax/nroff.syntax
+share/cooledit/syntax/pascal.syntax
+share/cooledit/syntax/perl.syntax
+share/cooledit/syntax/php.syntax
+share/cooledit/syntax/prolog.syntax
+share/cooledit/syntax/python.syntax
+share/cooledit/syntax/scm.syntax
+share/cooledit/syntax/sh.syntax
+share/cooledit/syntax/smalltalk.syntax
+share/cooledit/syntax/sql.syntax
+share/cooledit/syntax/swig.syntax
+share/cooledit/syntax/texinfo.syntax
+share/cooledit/syntax/unknown.syntax
+share/cooledit/syntax/xml.syntax
+@dirrm share/cooledit/syntax
+@dirrm share/cooledit
diff --git a/editors/cooledit/distinfo b/editors/cooledit/distinfo
index d9317d253d2..399ef884095 100644
--- a/editors/cooledit/distinfo
+++ b/editors/cooledit/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
+$NetBSD: distinfo,v 1.2 2004/11/08 15:48:20 adam Exp $
 
-SHA1 (cooledit-3.17.5.tar.gz) = 7a5685b6694460bd7e5e58e508e599500d218532
-Size (cooledit-3.17.5.tar.gz) = 1530105 bytes
-SHA1 (patch-aa) = 0234ddc8c42c712bf82d96f8b5e70ddd4b7f56b5
+SHA1 (cooledit-3.17.11.tar.gz) = 12c2745dd3dddf6e8c97ce28c29dd9eff6c3f971
+Size (cooledit-3.17.11.tar.gz) = 1672627 bytes
 SHA1 (patch-ab) = d85ef6100fe3f9dcecdb88af57d585a8ea0881ae
-SHA1 (patch-ac) = bae59eea56c2499bc4fcf5bdb1eda9356ac22e2f
 SHA1 (patch-ad) = 09de32bf6e88b11136acf13756dbdc9a77003673
 SHA1 (patch-ae) = b5de0e395562effea6790be06b65d0d7265a4ea1
 SHA1 (patch-af) = c3d948e490e1756c33080e252949de0fb1c4743a
-SHA1 (patch-ag) = 6f1fd9f6b73a71d6120d2c8af3e641ecaf7f15bb
-SHA1 (patch-ah) = 5f4301bdd7cf84f9d00f000a6b6af6075aa19195
-SHA1 (patch-ai) = 73a5bbce734d5a6458537d96ed64fcf2072e348f
+SHA1 (patch-ah) = 6c657d734f7b4ec15321cf8ed8db1cecbb89db07
+SHA1 (patch-ai) = 48ef9745aef54e337aa5f55710a4c4711ffe017c
diff --git a/editors/cooledit/patches/patch-aa b/editors/cooledit/patches/patch-aa
deleted file mode 100644
index bf8c6e93753..00000000000
--- a/editors/cooledit/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
-
---- configure.orig	Sun Oct 28 02:36:23 2001
-+++ configure
-@@ -6243,7 +6197,6 @@
- 
- fi
- 
--PACKAGE_FORCE_USE_INCLUDED_GETTEXT=yes
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
- echo "configure:6249: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-@@ -6770,12 +6723,9 @@
-   withval="$with_included_gettext"
-   nls_cv_force_use_gnu_gettext=$withval
- else
--  nls_cv_force_use_gnu_gettext=yes
-+  nls_cv_force_use_gnu_gettext=no
- fi
- 
--      if test x$PACKAGE_FORCE_USE_INCLUDED_GETTEXT != x ; then
--          nls_cv_force_use_gnu_gettext=$PACKAGE_FORCE_USE_INCLUDED_GETTEXT
--      fi
-       echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
- 
-       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-@@ -8093,8 +8056,8 @@
- EOF
- 
- cat >> $CONFIG_STATUS <<EOF
--ac_sources="$nls_cv_header_libgt $nls_cv_header_libgt"
--ac_dests="$nls_cv_header_intl $nls_cv_header_intl"
-+ac_sources="$nls_cv_header_libgt"
-+ac_dests="$nls_cv_header_intl"
- EOF
- 
- cat >> $CONFIG_STATUS <<\EOF
diff --git a/editors/cooledit/patches/patch-ac b/editors/cooledit/patches/patch-ac
deleted file mode 100644
index b04cc37a40a..00000000000
--- a/editors/cooledit/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
-
---- pixmap/Makefile.in.orig	Sat Jul  6 16:20:21 2002
-+++ pixmap/Makefile.in
-@@ -253,7 +253,6 @@
- 
- install-data-local:
- 	chmod 0755 $(libdir)/coolicon/modify-xinitrc
--	$(libdir)/coolicon/modify-xinitrc
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/editors/cooledit/patches/patch-ag b/editors/cooledit/patches/patch-ag
deleted file mode 100644
index 2229d3fbc23..00000000000
--- a/editors/cooledit/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
-
---- icon/coolicon.c.orig	Sat Oct 27 14:36:12 2001
-+++ icon/coolicon.c
-@@ -239,7 +239,7 @@
-     return 0;
- }
- 
--void raise_lower_all (int r)
-+void raise_lower_all (long int r)
- {
-     XUngrabPointer (CDisplay, CurrentTime);
-     for_all_widgets ((void *) raise_lower_all_callback, (void *) r, 0);
diff --git a/editors/cooledit/patches/patch-ah b/editors/cooledit/patches/patch-ah
index 4c56857fe51..b6229f50910 100644
--- a/editors/cooledit/patches/patch-ah
+++ b/editors/cooledit/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2004/11/08 15:48:20 adam Exp $
 
---- widget/editcmd.c.orig	Sat Oct 27 14:36:12 2001
+--- widget/editcmd.c.orig	2004-10-18 19:56:57.000000000 +0000
 +++ widget/editcmd.c
-@@ -249,6 +249,7 @@
+@@ -236,6 +236,7 @@ int edit_save_file (WEdit * edit, const 
      FILE *file;
      char *savename = 0;
      int this_save_mode, fd;
diff --git a/editors/cooledit/patches/patch-ai b/editors/cooledit/patches/patch-ai
index a3652abb60c..bd3368c597a 100644
--- a/editors/cooledit/patches/patch-ai
+++ b/editors/cooledit/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.2 2004/11/08 15:48:20 adam Exp $
 
---- editor/shell.c.orig	Sat Oct 27 14:36:12 2001
+--- editor/shell.c.orig	2004-10-18 19:56:58.000000000 +0000
 +++ editor/shell.c
-@@ -437,8 +437,8 @@
+@@ -437,8 +437,8 @@ static void shell_pool_update (int fd, f
  {
      CWidget *w;
      struct running_shell *r;
@@ -13,7 +13,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
      if (r->shell_pipe != fd) {
  	printf ("huh??\n");
      }
-@@ -560,7 +560,7 @@
+@@ -559,7 +559,7 @@ int execute_background_display_output (c
      char *argv[] =
      {0, 0};
      pid_t p;
@@ -22,7 +22,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2002/07/07 19:45:39 dmcmahill Exp $
      i = restart_shell (0, name, 0);
      argv[0] = hme_i (SCRIPT_FILE, i);
      savefile (argv[0], s, strlen (s), 0700);
-@@ -585,7 +585,7 @@
+@@ -584,7 +584,7 @@ static int execute_background_shell (str
      char *argv[] =
      {0, 0};
      pid_t p = 0;