12 files changed, 205 insertions, 62 deletions

diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 3ac32e3ba35f..1d94f55af682 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	 cooledit
-# Version required:	3.8.3
+# Version required:	3.11.2
 # Date created:		18 November 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.12 1999/04/06 22:06:40 jseger Exp $
+# $Id: Makefile,v 1.13 1999/06/05 19:00:07 mharo Exp $
 #
 
-DISTNAME=	cooledit-3.9.0
+DISTNAME=	cooledit-3.11.2
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITES= 	${MASTER_SITE_SUNSITE} \
+		http://www.netins.net/showcase/Comput-IT/cooledit/src/
 MASTER_SITE_SUBDIR=	apps/editors/X
 
 MAINTAINER=	brett@peloton.physics.montana.edu
@@ -16,12 +17,19 @@ MAINTAINER=	brett@peloton.physics.montana.edu
 LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--disable-mail-author --disable-static  --with-libs='-lcrypt -lreadline'
+CONFIGURE_ARGS=	--disable-mail-author --with-libs='-lcrypt -lreadline'
+
 USE_GMAKE= 	yes
 
+MAN1 = cooledit.1 smalledit.1 coolman.1 coolicon.1
+
 pre-install:
 	@${ECHO_MSG} "Installing in ${PREFIX}/bin"
-
-MAN1 = cooledit.1 smalledit.1 coolman.1 coolicon.1
+	@if [ ! -f ${PREFIX}/etc/coolicon.config ]; then \
+		${INSTALL_SCRIPT} ${WRKSRC}/pixmap/coolicon.config \
+		    ${PREFIX}/etc ; \
+	fi
+	${INSTALL_SCRIPT} ${WRKSRC}/pixmap/coolicon.config \
+		${PREFIX}/etc/coolicon.config.dist
 
 .include <bsd.port.mk>
diff --git a/editors/cooledit/distinfo b/editors/cooledit/distinfo
index 9b88ad24ff79..23b8c4cb8ea1 100644
--- a/editors/cooledit/distinfo
+++ b/editors/cooledit/distinfo
@@ -1 +1 @@
-MD5 (cooledit-3.9.0.tar.gz) = 89514b4f8c92985017f8ec8cf818d78e
+MD5 (cooledit-3.11.2.tar.gz) = a90d6cd6b6e16ef47ad0d5aa2cdd04fe
diff --git a/editors/cooledit/files/patch-ac b/editors/cooledit/files/patch-ac
new file mode 100644
index 000000000000..bce2dd765710
--- /dev/null
+++ b/editors/cooledit/files/patch-ac
@@ -0,0 +1,11 @@
+--- icon/Makefile.in.orig	Sun May 30 07:47:33 1999
++++ icon/Makefile.in	Mon Jun  7 14:54:23 1999
+@@ -119,7 +119,7 @@
+ datadir = $(prefix)/@DATADIRNAME@
+ localedir = $(datadir)/locale
+ 
+-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"${exec_prefix}/lib/coolicon\" @DEFS@ 
++DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"${exec_prefix}/lib/coolicon\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(datadir)/coolicon\" @DEFS@ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/editors/cooledit/files/patch-ad b/editors/cooledit/files/patch-ad
new file mode 100644
index 000000000000..b31264e0e7e4
--- /dev/null
+++ b/editors/cooledit/files/patch-ad
@@ -0,0 +1,11 @@
+--- icon/iconmanager.c.orig	Mon Jun  7 14:43:54 1999
++++ icon/iconmanager.c	Mon Jun  7 14:44:08 1999
+@@ -443,7 +443,7 @@
+     if (p->x + 20 > WidthOfScreen (DefaultScreenOfDisplay (CDisplay)))
+ 	p->x = WidthOfScreen (DefaultScreenOfDisplay (CDisplay)) - 20;
+     if (*p->xpm_filename != '/')
+-	f = catstrs (LIBDIR, "/", p->xpm_filename, 0);
++	f = catstrs (DATADIR, "/", p->xpm_filename, 0);
+     else
+ 	f = p->xpm_filename;
+     w = CDrawIcon (catstrs ("_icon", itoa (n), 0), CRoot, p->x, p->y, f, p->title);
diff --git a/editors/cooledit/files/patch-ae b/editors/cooledit/files/patch-ae
new file mode 100644
index 000000000000..0bcbab8d53a9
--- /dev/null
+++ b/editors/cooledit/files/patch-ae
@@ -0,0 +1,11 @@
+--- syntax/Makefile.in.orig	Mon Jun  7 15:12:47 1999
++++ syntax/Makefile.in	Mon Jun  7 15:15:31 1999
+@@ -99,7 +99,7 @@
+ VERSION = @VERSION@
+ l = @l@
+ 
+-syntaxdir = $(libdir)/cooledit/syntax
++syntaxdir = $(datadir)/cooledit/syntax
+ 
+ syntax_DATA = c.syntax changelog.syntax diff.syntax diffc.syntax html.syntax 	java.syntax latex.syntax lsm.syntax makefile.syntax ml.syntax 	nroff.syntax pascal.syntax perl.syntax python.syntax sh.syntax 	smalltalk.syntax texinfo.syntax unknown.syntax swig.syntax
+ 
diff --git a/editors/cooledit/files/patch-af b/editors/cooledit/files/patch-af
new file mode 100644
index 000000000000..225028776078
--- /dev/null
+++ b/editors/cooledit/files/patch-af
@@ -0,0 +1,11 @@
+--- widget/syntax.c.orig	Sun May 30 07:47:04 1999
++++ widget/syntax.c	Mon Jun  7 15:55:34 1999
+@@ -728,7 +728,7 @@
+     f = fopen (p, "r");
+     if (f)
+ 	return f;
+-    strcpy (p, LIBDIR "/syntax/");
++    strcpy (p, DATADIR "/cooledit/syntax/");
+     strcat (p, filename);
+     syntax_free (error_file_name);
+     error_file_name = strdup (p);
diff --git a/editors/cooledit/files/patch-ag b/editors/cooledit/files/patch-ag
new file mode 100644
index 000000000000..0c5244b8beb7
--- /dev/null
+++ b/editors/cooledit/files/patch-ag
@@ -0,0 +1,11 @@
+--- widget/Makefile.in.orig	Mon Jun  7 15:15:24 1999
++++ widget/Makefile.in	Mon Jun  7 15:17:00 1999
+@@ -113,7 +113,7 @@
+ 
+ libCw_la_LDFLAGS = -version-info 1:0:0
+ 
+-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"${exec_prefix}/lib/cooledit\" @DEFS@ 
++DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"${exec_prefix}/lib/cooledit\" -DDATADIR=\"$(datadir)\" @DEFS@ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/editors/cooledit/files/patch-ah b/editors/cooledit/files/patch-ah
new file mode 100644
index 000000000000..0cdd748518ab
--- /dev/null
+++ b/editors/cooledit/files/patch-ah
@@ -0,0 +1,29 @@
+--- editor/coolpython.c.orig	Mon Jun  7 15:26:22 1999
++++ editor/coolpython.c	Mon Jun  7 15:26:58 1999
+@@ -1329,7 +1329,7 @@
+     PyDict_SetItemString (d, "Mod3Mask", PyInt_FromLong ((long) Mod3Mask));
+     PyDict_SetItemString (d, "Mod4Mask", PyInt_FromLong ((long) Mod4Mask));
+     PyDict_SetItemString (d, "Mod5Mask", PyInt_FromLong ((long) Mod5Mask));
+-    PyDict_SetItemString (d, "LIBDIR", PyString_FromString (LIBDIR));
++    PyDict_SetItemString (d, "DATADIR", PyString_FromString (DATADIR));
+ }
+ 
+ void coolpython_run_file (char *filename)
+@@ -1387,7 +1387,7 @@
+ import sys\n\
+ sys.path.append('%s')\n\
+ sys.path.append('%s%s')\n\
+-", LIBDIR, home_dir, EDIT_DIR);
++", DATADIR, home_dir, EDIT_DIR);
+     e = PyRun_String (s, Py_file_input, name_space, name_space);
+     if (!e) {
+ 	PyErr_Print ();
+@@ -1396,7 +1396,7 @@
+     }
+     Py_DECREF (e);
+     coolpython_constants (name_space);
+-    sprintf (s, "%s/%s", LIBDIR, GLOBAL_STARTUP_FILE);
++    sprintf (s, "%s/%s", DATADIR, GLOBAL_STARTUP_FILE);
+     coolpython_run_file (s);
+     sprintf (s, "%s%s/%s", home_dir, EDIT_DIR, GLOBAL_STARTUP_FILE);
+     if ((fd = open (s, O_RDONLY)) >= 0)
diff --git a/editors/cooledit/files/patch-ai b/editors/cooledit/files/patch-ai
new file mode 100644
index 000000000000..db8a14013322
--- /dev/null
+++ b/editors/cooledit/files/patch-ai
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	Mon Jun  7 15:25:44 1999
++++ lib/Makefile.in	Mon Jun  7 15:25:54 1999
+@@ -99,7 +99,7 @@
+ VERSION = @VERSION@
+ l = @l@
+ 
+-pythondir = $(libdir)/cooledit
++pythondir = $(datadir)/cooledit
+ 
+ python_DATA = global.py
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/editors/cooledit/files/patch-aj b/editors/cooledit/files/patch-aj
new file mode 100644
index 000000000000..3f56b16090c2
--- /dev/null
+++ b/editors/cooledit/files/patch-aj
@@ -0,0 +1,23 @@
+--- pixmap/Makefile.in.orig	Mon Jun  7 14:39:02 1999
++++ pixmap/Makefile.in	Mon Jun  7 14:40:45 1999
+@@ -99,9 +99,9 @@
+ VERSION = @VERSION@
+ l = @l@
+ 
+-pixmapdir = $(libdir)/coolicon
++pixmapdir = $(datadir)/coolicon
+ 
+-pixmap_DATA = browse.xpm cooledit.xpm coolicon.config dynamite.xpm e.data launch.xpm 	manual.xpm mc.xpm netscape.xpm nscape.xpm phonedown.xpm phoneup.xpm printer.xpm 	spanner.xpm xterm.xpm xv.xpm cdrom_eject.xpm cdrom_view.xpm modify-xinitrc gmc.xpm 	lyx.xpm
++pixmap_DATA = browse.xpm cooledit.xpm dynamite.xpm e.data launch.xpm 	manual.xpm mc.xpm netscape.xpm nscape.xpm phonedown.xpm phoneup.xpm printer.xpm 	spanner.xpm xterm.xpm xv.xpm cdrom_eject.xpm cdrom_view.xpm gmc.xpm 	lyx.xpm
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -227,8 +227,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/files/patch-ak b/editors/cooledit/files/patch-ak
new file mode 100644
index 000000000000..4e98815650f4
--- /dev/null
+++ b/editors/cooledit/files/patch-ak
@@ -0,0 +1,11 @@
+--- icon/coolicon.c.orig	Mon Jun  7 11:23:06 1999
++++ icon/coolicon.c	Mon Jun  7 11:24:05 1999
+@@ -49,7 +49,7 @@
+ void free_icon_elements (CPowerIcon * icon);
+ void free_all_lists (void);
+ 
+-#define SYSTEM_ICONS LIBDIR "/coolicon.config"
++#define SYSTEM_ICONS SYSCONFDIR "/coolicon.config"
+ #define E_DATA LIBDIR "/e.data"
+ #define START_WIDTH size_of_e
+ #define START_HEIGHT size_of_e
diff --git a/editors/cooledit/pkg-plist b/editors/cooledit/pkg-plist
index 26af54767d8e..59a2070f689b 100644
--- a/editors/cooledit/pkg-plist
+++ b/editors/cooledit/pkg-plist
@@ -1,69 +1,75 @@
+bin/coolbrowse
 bin/cooledit
-bin/smalledit
-bin/coolman
 bin/coolicon
-bin/coolbrowse
-bin/coolmessage
+bin/coolinput
 bin/coollistbox
+bin/coolman
+bin/coolmessage
 bin/coolquery
-bin/coolinput
+bin/smalledit
+bin/ttyname_stop
+etc/coolicon.config.dist
+@exec if [ ! -f %D/etc/coolicon.config ]; then cp -p %D/%F %B/cooledit.config; fi 
+lib/libCw.a
 lib/libCw.so
 lib/libCw.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-lib/cooledit/global.py
-lib/coolicon/browse.xpm
-lib/coolicon/cooledit.xpm
-lib/coolicon/coolicon.config
-lib/coolicon/dynamite.xpm
-lib/coolicon/e.data
-lib/coolicon/launch.xpm
-lib/coolicon/manual.xpm
-lib/coolicon/mc.xpm
-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/coolicon/cdrom_eject.xpm
-lib/coolicon/cdrom_view.xpm
-lib/coolicon/modify-xinitrc
-lib/coolicon/gmc.xpm
-lib/coolicon/lyx.xpm
-lib/cooledit/syntax/c.syntax
-lib/cooledit/syntax/changelog.syntax
-lib/cooledit/syntax/diff.syntax
-lib/cooledit/syntax/diffc.syntax
-lib/cooledit/syntax/html.syntax
-lib/cooledit/syntax/java.syntax
-lib/cooledit/syntax/latex.syntax
-lib/cooledit/syntax/lsm.syntax
-lib/cooledit/syntax/makefile.syntax
-lib/cooledit/syntax/ml.syntax
-lib/cooledit/syntax/nroff.syntax
-lib/cooledit/syntax/pascal.syntax
-lib/cooledit/syntax/perl.syntax
-lib/cooledit/syntax/python.syntax
-lib/cooledit/syntax/sh.syntax
-lib/cooledit/syntax/smalltalk.syntax
-share/locale/de/LC_MESSAGES/cooledit.mo
-share/locale/fr/LC_MESSAGES/cooledit.mo
-share/locale/sv/LC_MESSAGES/cooledit.mo
+share/cooledit/global.py
+share/cooledit/syntax/c.syntax
+share/cooledit/syntax/changelog.syntax
+share/cooledit/syntax/diff.syntax
+share/cooledit/syntax/diffc.syntax
+share/cooledit/syntax/html.syntax
+share/cooledit/syntax/java.syntax
+share/cooledit/syntax/latex.syntax
+share/cooledit/syntax/lsm.syntax
+share/cooledit/syntax/makefile.syntax
+share/cooledit/syntax/ml.syntax
+share/cooledit/syntax/nroff.syntax
+share/cooledit/syntax/pascal.syntax
+share/cooledit/syntax/perl.syntax
+share/cooledit/syntax/python.syntax
+share/cooledit/syntax/sh.syntax
+share/cooledit/syntax/smalltalk.syntax
+share/cooledit/syntax/swig.syntax
+share/cooledit/syntax/texinfo.syntax
+share/cooledit/syntax/unknown.syntax
+share/coolicon/browse.xpm
+share/coolicon/cdrom_eject.xpm
+share/coolicon/cdrom_view.xpm
+share/coolicon/cooledit.xpm
+share/coolicon/dynamite.xpm
+share/coolicon/e.data
+share/coolicon/gmc.xpm
+share/coolicon/launch.xpm
+share/coolicon/lyx.xpm
+share/coolicon/manual.xpm
+share/coolicon/mc.xpm
+share/coolicon/netscape.xpm
+share/coolicon/nscape.xpm
+share/coolicon/phonedown.xpm
+share/coolicon/phoneup.xpm
+share/coolicon/printer.xpm
+share/coolicon/spanner.xpm
+share/coolicon/xterm.xpm
+share/coolicon/xv.xpm
 share/locale/cs/LC_MESSAGES/cooledit.mo
-share/locale/es/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/pt/LC_MESSAGES/cooledit.mo
 share/locale/no/LC_MESSAGES/cooledit.mo
 share/locale/pl/LC_MESSAGES/cooledit.mo
-share/locale/fi/LC_MESSAGES/cooledit.mo
-share/locale/ja/LC_MESSAGES/cooledit.mo
-share/locale/ko/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
-@dirrm lib/coolicon
-@dirrm lib/cooledit/syntax
-@dirrm lib/cooledit
+share/locale/sv/LC_MESSAGES/cooledit.mo
+@dirrm share/cooledit/syntax
+@dirrm share/cooledit
+@dirrm share/coolicon