From owner-freebsd-ports Mon Jun 7 16:20: 9 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 128B714F7D for ; Mon, 7 Jun 1999 16:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id QAA63224; Mon, 7 Jun 1999 16:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Date: Mon, 7 Jun 1999 16:20:02 -0700 (PDT) Message-Id: <199906072320.QAA63224@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Chris Piazza Subject: Re: ports/12047: Update: editors/cooledit Reply-To: Chris Piazza Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/12047; it has been noted by GNATS. From: Chris Piazza To: Bill Fumerola Cc: FreeBSD-gnats-submit@FreeBSD.ORG Subject: Re: ports/12047: Update: editors/cooledit Date: Mon, 7 Jun 1999 16:12:03 -0700 On Mon, Jun 07, 1999 at 09:14:51AM -0400, Bill Fumerola wrote: > On Sun, 6 Jun 1999 cpiazza@home.net wrote: > > > +lib/coolicon/coolicon.config > > Doesn't this belong in etc/ > > > +lib/coolicon/modify-xinitrc > > Ditto. > Yes, of course :-). I updated the port to install coolicon.config in /etc and now all the stuff that was in lib/ that didn't need to be is in share/. Files removed: patch-aa patch-ab Files added: patch-ac patch-ad patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak. (whew! heh heh) portlint reports no warnings or errors. Index: cooledit/Makefile =================================================================== RCS file: /cvs/FreeBSD/ports/editors/cooledit/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 1999/06/05 19:00:07 1.13 +++ Makefile 1999/06/07 22:19:54 @@ -1,12 +1,12 @@ # New ports collection makefile for: cooledit -# Version required: 3.8.3 +# Version required: 3.11.0 # Date created: 18 November 1997 # Whom: brett@peloton.physics.montana.edu # # $Id: Makefile,v 1.13 1999/06/05 19:00:07 mharo Exp $ # -DISTNAME= cooledit-3.9.0 +DISTNAME= cooledit-3.11.0 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/editors/X @@ -16,12 +16,19 @@ 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/xhippo.config ]; then \ + ${INSTALL_SCRIPT} ${WRKSRC}/pixmap/coolicon.config \ + ${PREFIX}/etc ; \ + fi + ${INSTALL_SCRIPT} ${WRKSRC}/pixmap/coolicon.config \ + ${PREFIX}/etc/coolicon.config.dist .include Index: cooledit/files/md5 =================================================================== RCS file: /cvs/FreeBSD/ports/editors/cooledit/files/md5,v retrieving revision 1.6 diff -u -r1.6 md5 --- md5 1999/04/06 22:06:40 1.6 +++ md5 1999/06/07 18:11:05 @@ -1 +1 @@ -MD5 (cooledit-3.9.0.tar.gz) = 89514b4f8c92985017f8ec8cf818d78e +MD5 (cooledit-3.11.0.tar.gz) = 833b06b605533a85c48d2385e2ce445f Index: cooledit/patches/patch-aa =================================================================== RCS file: patch-aa diff -N patch-aa --- /tmp/cvsk52230 Mon Jun 7 16:06:58 1999 +++ /dev/null Mon Jun 7 16:01:14 1999 @@ -1,23 +0,0 @@ ---- icon/Makefile.in.orig Sat Mar 13 16:48:21 1999 -+++ icon/Makefile.in Tue Apr 6 12:02:40 1999 -@@ -95,8 +95,7 @@ - VERSION = @VERSION@ - l = @l@ - --bin_PROGRAMS = coolicon coolicon.static coolbrowse coolbrowse.static coolmessage coolmessage.static \ -- coollistbox coollistbox.static coolquery coolquery.static coolinput coolinput.static -+bin_PROGRAMS = coolicon coolbrowse coolmessage coollistbox coolquery coolinput - - INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir) -I$(top_srcdir)/intl - -@@ -199,8 +198,8 @@ - - TAR = tar - GZIP = --best --SOURCES = $(coolicon_SOURCES) $(coolicon_static_SOURCES) $(coolbrowse_SOURCES) $(coolbrowse_static_SOURCES) $(coolmessage_SOURCES) $(coolmessage_static_SOURCES) $(coollistbox_SOURCES) $(coollistbox_static_SOURCES) $(coolquery_SOURCES) $(coolquery_static_SOURCES) $(coolinput_SOURCES) $(coolinput_static_SOURCES) --OBJECTS = $(coolicon_OBJECTS) $(coolicon_static_OBJECTS) $(coolbrowse_OBJECTS) $(coolbrowse_static_OBJECTS) $(coolmessage_OBJECTS) $(coolmessage_static_OBJECTS) $(coollistbox_OBJECTS) $(coollistbox_static_OBJECTS) $(coolquery_OBJECTS) $(coolquery_static_OBJECTS) $(coolinput_OBJECTS) $(coolinput_static_OBJECTS) -+SOURCES = $(coolicon_SOURCES) $(coolbrowse_SOURCES) $(coolmessage_SOURCES) $(coollistbox_SOURCES) $(coolquery_SOURCES) $(coolinput_SOURCES) -+OBJECTS = $(coolicon_OBJECTS) $(coolbrowse_OBJECTS) $(coolmessage_OBJECTS) $(coollistbox_OBJECTS) $(coolquery_OBJECTS) $(coolinput_OBJECTS) - - all: Makefile $(PROGRAMS) - Index: cooledit/patches/patch-ab =================================================================== RCS file: patch-ab diff -N patch-ab --- /tmp/cvsV52230 Mon Jun 7 16:06:58 1999 +++ /dev/null Mon Jun 7 16:01:14 1999 @@ -1,22 +0,0 @@ ---- editor/Makefile.in.orig Sat Mar 13 16:48:21 1999 -+++ editor/Makefile.in Mon Apr 5 14:18:46 1999 -@@ -95,7 +95,7 @@ - VERSION = @VERSION@ - l = @l@ - --bin_PROGRAMS = cooledit smalledit coolman cooledit.static smalledit.static coolman.static -+bin_PROGRAMS = cooledit smalledit coolman - - INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir) -I$(top_srcdir)/intl @PYTHON_INCLUDES@ - -@@ -170,8 +170,8 @@ - - TAR = tar - GZIP = --best --SOURCES = $(cooledit_SOURCES) $(smalledit_SOURCES) $(coolman_SOURCES) $(cooledit_static_SOURCES) $(smalledit_static_SOURCES) $(coolman_static_SOURCES) --OBJECTS = $(cooledit_OBJECTS) $(smalledit_OBJECTS) $(coolman_OBJECTS) $(cooledit_static_OBJECTS) $(smalledit_static_OBJECTS) $(coolman_static_OBJECTS) -+SOURCES = $(cooledit_SOURCES) $(smalledit_SOURCES) $(coolman_SOURCES) -+OBJECTS = $(cooledit_OBJECTS) $(smalledit_OBJECTS) $(coolman_OBJECTS) - - all: Makefile $(PROGRAMS) - Index: cooledit/patches/patch-ac =================================================================== RCS file: patch-ac diff -N patch-ac --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-ac Mon Jun 7 16:04:32 1999 @@ -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 = Index: cooledit/patches/patch-ad =================================================================== RCS file: patch-ad diff -N patch-ad --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-ad Mon Jun 7 14:45:41 1999 @@ -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); Index: cooledit/patches/patch-ae =================================================================== RCS file: patch-ae diff -N patch-ae --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-ae Mon Jun 7 15:16:01 1999 @@ -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 + Index: cooledit/patches/patch-af =================================================================== RCS file: patch-af diff -N patch-af --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-af Mon Jun 7 15:56:48 1999 @@ -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); Index: cooledit/patches/patch-ag =================================================================== RCS file: patch-ag diff -N patch-ag --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-ag Mon Jun 7 15:17:14 1999 @@ -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 = Index: cooledit/patches/patch-ah =================================================================== RCS file: patch-ah diff -N patch-ah --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-ah Mon Jun 7 15:27:19 1999 @@ -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) Index: cooledit/patches/patch-ai =================================================================== RCS file: patch-ai diff -N patch-ai --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-ai Mon Jun 7 15:27:38 1999 @@ -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 Index: cooledit/patches/patch-aj =================================================================== RCS file: patch-aj diff -N patch-aj --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-aj Mon Jun 7 14:40:58 1999 @@ -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. Index: cooledit/patches/patch-ak =================================================================== RCS file: patch-ak diff -N patch-ak --- /dev/null Mon Jun 7 16:01:14 1999 +++ patch-ak Mon Jun 7 11:28:45 1999 @@ -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 Index: cooledit/pkg/PLIST =================================================================== RCS file: /cvs/FreeBSD/ports/editors/cooledit/pkg/PLIST,v retrieving revision 1.9 diff -u -r1.9 PLIST --- PLIST 1999/06/06 15:51:43 1.9 +++ PLIST 1999/06/07 22:49:39 @@ -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 -- Chris Piazza Abbotsford, BC, Canada cpiazza@home.net finger norn@norn.ca.eu.org for PGP key To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message