Date: Sun, 23 May 1999 02:17:12 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11847: Port update: misc/mc Message-ID: <199905230017.CAA52713@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 11847
>Category: ports
>Synopsis: Port update: misc/mc
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat May 22 17:20:02 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports collection.
>Description:
Upgrade to 4.5.31. Misc clean-ups.
>How-To-Repeat:
>Fix:
misc/mc:
Upgrade from 4.5.23 to 4.5.31
Changes: Makefile files/md5 patches/patch-aa patches/patch-ab
patches/patch-ac patches/patch-af pkg/PLIST
Adds :
Removes: patches/patch-ae patches/patch-aj
--- /usr/ports.ref/misc/mc/Makefile Thu Apr 8 22:40:15 1999
+++ misc/mc/Makefile Tue May 11 23:51:37 1999
@@ -1,31 +1,33 @@
# New ports collection makefile for: mc
-# Version required: 4.5.23
+# Version required: 4.5.31
# Date created: 15 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
# $Id: Makefile,v 1.31 1999/04/08 18:08:35 steve Exp $
#
-DISTNAME= mc-4.5.23
+DISTNAME= mc-4.5.31
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/mc
MAINTAINER= reg@shale.csir.co.za
-LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 \
+LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
.if defined(USE_NCURSES_PORT)
LIB_DEPENDS+= ncurses.4:${PORTSDIR}/devel/ncurses
.endif
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ncurses --without-gnome --without-edit
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAKE="gmake" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
+ GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= midc.1
--- /usr/ports.ref/misc/mc/files/md5 Mon Mar 15 10:50:37 1999
+++ misc/mc/files/md5 Wed May 12 00:01:40 1999
@@ -1 +1 @@
-MD5 (mc-4.5.23.tar.gz) = 9953d8a88957e814a25e8ee364739318
+MD5 (mc-4.5.31.tar.gz) = ac1e86c7cba7584c7ab7dd1ef5fc28cf
--- /usr/ports.ref/misc/mc/patches/patch-aa Sun Jan 31 20:12:49 1999
+++ misc/mc/patches/patch-aa Sun May 9 16:05:52 1999
@@ -1,6 +1,6 @@
---- configure.orig Tue Jan 19 00:44:07 1999
-+++ configure Fri Jan 29 16:51:46 1999
-@@ -3188,15 +3188,15 @@
+--- configure.orig Sun Apr 11 04:38:29 1999
++++ configure Sun May 9 15:58:08 1999
+@@ -3267,15 +3267,15 @@
fi
@@ -10,19 +10,17 @@
INSTOBJEXT=.mo
DATADIRNAME=share
- INTLDEPS='$(top_builddir)/intl/libintl.a'
-- INTLLIBS=$INTLDEPS
-- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++ INTLDEPS='-lintl'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
-+# INTLDEPS='$(top_builddir)/intl/libintl.a'
-+# INTLLIBS=$INTLDEPS
-+# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+# nls_cv_header_intl=intl/libintl.h
+# nls_cv_header_libgt=intl/libgettext.h
fi
if test "$XGETTEXT" != ":"; then
-@@ -10359,13 +10359,13 @@
+@@ -10524,13 +10524,13 @@
if $search_ncurses
then
@@ -41,7 +39,7 @@
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
-@@ -10381,13 +10381,13 @@
+@@ -10546,13 +10546,13 @@
if $search_ncurses
then
@@ -60,7 +58,7 @@
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
-@@ -10403,13 +10403,13 @@
+@@ -10568,13 +10568,13 @@
if $search_ncurses
then
@@ -79,7 +77,7 @@
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
-@@ -10425,13 +10425,13 @@
+@@ -10590,13 +10590,13 @@
if $search_ncurses
then
@@ -98,27 +96,27 @@
cat >> confdefs.h <<\EOF
#define HAS_CURSES 1
EOF
-@@ -10676,6 +10676,8 @@
- fi
- done
+@@ -10655,6 +10655,8 @@
+ fi
+ fi
+CFLAGS="$CFLAGS $CURSES_INCLUDEDIR"
+LIBS="$LIBS $CURSES_LIBS"
- if test "x$screen_manager" = "xunknown"; then
- cat >> confdefs.h <<\EOF
-@@ -11212,7 +11214,7 @@
- vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR
- vfs/extfs/ulha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
+ if $search_ncurses
+ then
+@@ -11465,7 +11467,7 @@
+ vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha
+ vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
-doc/mc.1 doc/mcedit.1 doc/mcserv.8
+doc/mc.1 doc/mcserv.8
intl/Makefile po/Makefile.in
config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-@@ -11423,7 +11425,7 @@
- vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR
- vfs/extfs/ulha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
+@@ -11684,7 +11686,7 @@
+ vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha
+ vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
-doc/mc.1 doc/mcedit.1 doc/mcserv.8
+doc/mc.1 doc/mcserv.8
--- /usr/ports.ref/misc/mc/patches/patch-ab Sun Jan 31 20:12:49 1999
+++ misc/mc/patches/patch-ab Wed Apr 7 23:38:22 1999
@@ -1,6 +1,17 @@
---- vfs/Make-mc.in.orig Tue Jan 19 00:44:08 1999
-+++ vfs/Make-mc.in Tue Jan 26 19:26:43 1999
-@@ -180,20 +180,20 @@
+--- vfs/Make-mc.in.orig Tue Mar 30 08:34:34 1999
++++ vfs/Make-mc.in Wed Apr 7 23:37:58 1999
+@@ -13,8 +13,9 @@
+ DEFS = $(XDEFS)
+ LIBS = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ AR = @AR@
+
+ #
+@@ -185,7 +186,7 @@
install: @mcserv@ install.extfs
-(if test x@mcserv@ != x; then \
@@ -9,19 +20,17 @@
fi)
install.extfs:
- for I in $(EXTFS_MISC); do \
-- $(INSTALL_DATA) $(srcdir)/extfs/$$I \
-+ $(INSTALL_DATA) extfs/$$I \
- $(DESTDIR)$(libdir)/extfs/$$I; \
+@@ -194,11 +195,11 @@
+ $(DESTDIR)$(extfsdir)/$$I; \
done
for I in $(EXTFS_CONST) ; do \
- $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
-+ $(INSTALL_DATA) -m 555 extfs/$$I \
- $(DESTDIR)$(libdir)/extfs/$$I; \
++ $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
+ $(DESTDIR)$(extfsdir)/$$I; \
done
for I in $(EXTFS_OUT) ; do \
- $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
-+ $(INSTALL_DATA) -m 555 extfs/$$I \
- $(DESTDIR)$(libdir)/extfs/$$I; \
++ $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
+ $(DESTDIR)$(extfsdir)/$$I; \
done
--- /usr/ports.ref/misc/mc/patches/patch-ac Mon Mar 15 10:50:38 1999
+++ misc/mc/patches/patch-ac Wed Apr 7 23:40:23 1999
@@ -1,23 +1,23 @@
---- Make.common.in.orig Sat Feb 27 02:25:11 1999
-+++ Make.common.in Sat Feb 27 21:01:05 1999
+--- Make.common.in.orig Tue Mar 30 08:34:33 1999
++++ Make.common.in Wed Apr 7 23:40:05 1999
@@ -17,9 +17,10 @@
builddir = @builddir@
bindir = @bindir@
+sbindir = $(exec_prefix)/sbin
sysconfdir = @sysconfdir@
- corbadir = $(sysconfdir)/CORBA/servers
--libdir = $(exec_prefix)/lib/mc
-+libdir = $(exec_prefix)/share/mc
- idldir = $(prefix)/share/idl
- suppbindir = $(libdir)/bin
- gnewdir = $(prefix)/share/mc/templates
-@@ -60,7 +61,7 @@
+ datadir = @datadir@
+-libdir = @libdir@
++libdir = @datadir@
+ mandir = @mandir@
+ gnomeicondir = @gnomeicondir@
+ xv_bindir = @xv_bindir@
+@@ -64,7 +65,7 @@
# No way, to make make happy (except GNU), we cannot use := to append
# something to these, so that's why there is a leading _
XCFLAGS = @CFLAGS@
--XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\"
-+XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\"
+-XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
++XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
XLDFLAGS = @LDFLAGS@
XDEFS = @DEFS@
XLIBS = @LIBS@
--- /usr/ports.ref/misc/mc/patches/patch-ae Sun Dec 6 11:39:22 1998
+++ misc/mc/patches/patch-ae Wed Apr 7 23:40:48 1999
@@ -1,8 +0,0 @@
---- mcfn_install.in.orig Sun Dec 6 12:07:30 1998
-+++ mcfn_install.in Sun Dec 6 12:07:37 1998
-@@ -1,4 +1,4 @@
--#/bin/sh
-+#!/bin/sh
- #
- prefix=@prefix@
- if test -n `echo $prefix | grep prefix`; then
--- /usr/ports.ref/misc/mc/patches/patch-af Mon Mar 15 10:50:38 1999
+++ misc/mc/patches/patch-af Wed May 12 00:12:19 1999
@@ -1,31 +1,40 @@
---- Makefile.in.orig Sat Feb 27 02:25:11 1999
-+++ Makefile.in Sat Feb 27 21:02:30 1999
+--- Makefile.in.orig Tue Mar 30 08:34:33 1999
++++ Makefile.in Wed Apr 7 23:48:54 1999
@@ -5,7 +5,7 @@
@MCFGR@@MCF@
foreigndirs=pc
--codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl
-+codedirs=vfs lib doc slang edit src
+-codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
++codedirs=vfs lib doc slang edit src syntax
unixdirs=intl $(codedirs) @POSUB@
alldirs=$(unixdirs) $(foreigndirs)
subdirs=$(alldirs)
-@@ -46,7 +46,7 @@
+@@ -13,6 +13,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+ DISTMAIN = configure configure.in NEWS README INSTALL INSTALL.FAST \
+ Makefile.in FAQ COPYING create_vcs install-sh \
+@@ -46,7 +47,7 @@
install: installdirs
@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
+ $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
- $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
-+ $(INSTALL_DATA) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
++ $(INSTALL_SCRIPT) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
@echo "Please verify that the configuration values are correctly"
- @echo "set in the mc.ext file in $(libdir)"
-@@ -58,9 +58,8 @@
+ @echo "set in the mc.ext file in $(mclibdir)"
+@@ -58,9 +59,9 @@
installdirs:
- $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
- $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(suppbindir)
$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
-- $(MKINSTALLDIRS) $(DESTDIR)$(idldir)
+- $(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(syntaxdir)
mcfninstall:
-/bin/sh ./mcfn_install
@@ -53,13 +62,12 @@
--- lib/Makefile.in.orig Wed Jan 27 01:10:33 1999
+++ lib/Makefile.in Wed Jan 27 01:10:59 1999
-@@ -13,7 +13,8 @@
+@@ -13,7 +13,7 @@
#
LIBFILES_IN = mc.ext.in mc-gnome.ext.in
-LIBFILES_OUT = mc.ext mc-gnome.ext
+LIBFILES_OUT = mc.ext
-+#LIBFILES_OUT = mc.ext mc-gnome.ext
LIBFILES_CONST = mc.hint mc.lib mc.menu
TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \
--- /usr/ports.ref/misc/mc/patches/patch-aj Mon Feb 22 14:14:46 1999
+++ misc/mc/patches/patch-aj Wed May 12 00:11:32 1999
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig Mon Feb 1 01:55:19 1999
-+++ po/Makefile.in.in Tue Feb 2 15:08:38 1999
-@@ -11,7 +11,7 @@
-
- prefix = $(DESTDIR)@prefix@
- exec_prefix = $(DESTDIR)@exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
--- /usr/ports.ref/misc/mc/pkg/PLIST Mon Mar 15 10:50:38 1999
+++ misc/mc/pkg/PLIST Wed May 12 00:43:36 1999
@@ -6,14 +6,18 @@
share/locale/da/LC_MESSAGES/mc.mo
share/locale/de/LC_MESSAGES/mc.mo
share/locale/es/LC_MESSAGES/mc.mo
+share/locale/es_ES/LC_MESSAGES/mc.mo
share/locale/fr/LC_MESSAGES/mc.mo
share/locale/it/LC_MESSAGES/mc.mo
share/locale/ko/LC_MESSAGES/mc.mo
share/locale/no/LC_MESSAGES/mc.mo
share/locale/pl/LC_MESSAGES/mc.mo
+share/locale/ro/LC_MESSAGES/mc.mo
share/locale/ru/LC_MESSAGES/mc.mo
share/mc/FAQ
share/mc/bin/mcfn_install
+share/mc/desktop-scripts/README.desktop
+share/mc/desktop-scripts/startup.links
share/mc/extfs/README
share/mc/extfs/a
share/mc/extfs/deb
@@ -28,8 +32,11 @@
share/mc/extfs/sfs.ini
share/mc/extfs/trpm
share/mc/extfs/uar
+share/mc/extfs/uarj
share/mc/extfs/ucpio
+share/mc/extfs/uha
share/mc/extfs/ulha
share/mc/extfs/urar
share/mc/extfs/uzip
share/mc/extfs/uzoo
@@ -38,6 +45,22 @@
share/mc/mc.hlp
share/mc/mc.lib
share/mc/mc.menu
+share/mc/syntax/c.syntax
+share/mc/syntax/changelog.syntax
+share/mc/syntax/html.syntax
+share/mc/syntax/java.syntax
+share/mc/syntax/latex.syntax
+share/mc/syntax/lsm.syntax
+share/mc/syntax/makefile.syntax
+share/mc/syntax/ml.syntax
+share/mc/syntax/nroff.syntax
+share/mc/syntax/pascal.syntax
+share/mc/syntax/perl.syntax
+share/mc/syntax/python.syntax
+share/mc/syntax/sh.syntax
+share/mc/syntax/smalltalk.syntax
share/mc/term/README.xterm
share/mc/term/ansi.ti
share/mc/term/linux.ti
@@ -46,6 +69,8 @@
share/mc/term/xterm.tcap
share/mc/term/xterm.ti
@dirrm share/mc/term
+@dirrm share/mc/syntax
@dirrm share/mc/extfs
+@dirrm share/mc/desktop-scripts
@dirrm share/mc/bin
@dirrm share/mc
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199905230017.CAA52713>