summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/mc/Makefile21
-rw-r--r--sysutils/mc/files/md54
-rw-r--r--sysutils/mc/patches/patch-aa10
-rw-r--r--sysutils/mc/patches/patch-ab57
-rw-r--r--sysutils/mc/patches/patch-ac21
-rw-r--r--sysutils/mc/patches/patch-ae10
-rw-r--r--sysutils/mc/patches/patch-af30
-rw-r--r--sysutils/mc/pkg/PLIST32
8 files changed, 80 insertions, 105 deletions
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index f4d17eb63e1..1e247a3bffd 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,25 +1,28 @@
-# $NetBSD: Makefile,v 1.14 1999/03/14 20:59:14 tron Exp $
+# $NetBSD: Makefile,v 1.15 1999/03/14 23:07:55 tron Exp $
# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
#
-DISTNAME= mc-4.1.35
-CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/file/managers/mc
+DISTNAME= mc-4.5.25
+CATEGORIES= systuils
+MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/sources/gnome-1.0/sources/ \
+ ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
+ ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.gnome.org/mc/
+MAINTAINER= tron@netbsd.org
+HOMEPAGE= http://www.gnome.org/mc/
-DEPENDS+= libslang-1.2.2:../../devel/libslang
+DEPENDS+= libslang-1.2.2:../../devel/libslang
GNU_CONFIGURE= YES
+USE_GMAKE= yes
# XXX the cat-id-tbl is not up to date, so the catgets is broken.
CONFIGURE_ARGS+= --without-catgets --with-netrc --with-slang \
--without-x --without-gnome --without-tk
# Funny stuff to get this to use the system libslang.
CONFIGURE_ENV+= LIBS="-lm -ltermcap" CPPFLAGS="-I${LOCALBASE}/include"
-CFLAGS+= -Dunix -I${LOCALBASE}/include
+CFLAGS+= -Dunix -I${LOCALBASE}/include -DxBSD
LDFLAGS+= -L${LOCALBASE}/lib
+MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/files/md5 b/sysutils/mc/files/md5
index e18797075fb..e1852c2dc61 100644
--- a/sysutils/mc/files/md5
+++ b/sysutils/mc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/03/14 20:59:26 tron Exp $
+$NetBSD: md5,v 1.6 1999/03/14 23:07:55 tron Exp $
-MD5 (mc-4.1.35.tar.gz) = b563fdffb6b25b9f75bb019c2f9f70a2
+MD5 (mc-4.5.25.tar.gz) = b3462d5e33a3fb5e21ac64769dfc172b
diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa
index 56b063ba106..7cca71d21ca 100644
--- a/sysutils/mc/patches/patch-aa
+++ b/sysutils/mc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 1999/03/14 20:59:42 tron Exp $
+$NetBSD: patch-aa,v 1.8 1999/03/14 23:07:55 tron Exp $
--- configure.orig Mon May 25 06:16:04 1998
+++ configure Sun Oct 4 13:10:51 1998
@@ -11,11 +11,3 @@ $NetBSD: patch-aa,v 1.7 1999/03/14 20:59:42 tron Exp $
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -11280,6 +11280,7 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@PACKAGE@%$PACKAGE%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
index 9d48d59cee4..976d58e921a 100644
--- a/sysutils/mc/patches/patch-ab
+++ b/sysutils/mc/patches/patch-ab
@@ -1,43 +1,18 @@
-$NetBSD: patch-ab,v 1.6 1999/03/14 20:59:42 tron Exp $
+$NetBSD: patch-ab,v 1.7 1999/03/14 23:07:55 tron Exp $
---- vfs/Makefile.in.orig Mon May 25 06:16:04 1998
-+++ vfs/Makefile.in Sun Oct 4 09:07:34 1998
-@@ -91,25 +91,25 @@
+--- vfs/Make-mc.in.orig Sat Mar 13 03:02:30 1999
++++ vfs/Make-mc.in Sun Mar 14 23:25:48 1999
+@@ -192,11 +192,11 @@
+ $(DESTDIR)$(libdir)/extfs/$$I; \
+ done
+ for I in $(EXTFS_CONST) ; do \
+- $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
++ $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
+ $(DESTDIR)$(libdir)/extfs/$$I; \
+ done
+ for I in $(EXTFS_OUT) ; do \
+- $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
++ $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
+ $(DESTDIR)$(libdir)/extfs/$$I; \
+ done
- install: @mcserv@ install.extfs
- -(if test x@mcserv@ != x; then \
-- $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
-+ $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
- fi)
-
- install.extfs:
- $(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
- $(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
-- $(INSTALL_PROGRAM) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
-- $(INSTALL_PROGRAM) $(srcdir)/extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
-- $(INSTALL_PROGRAM) $(srcdir)/extfs/rpm $(DESTDIR)$(libdir)/extfs/rpm
-- $(INSTALL_PROGRAM) $(srcdir)/extfs/hp48 $(DESTDIR)$(libdir)/extfs/hp48
-+ $(INSTALL_DATA) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
-+ $(INSTALL_DATA) $(srcdir)/extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
-+ $(INSTALL_DATA) $(srcdir)/extfs/rpm $(DESTDIR)$(libdir)/extfs/rpm
-+ $(INSTALL_DATA) $(srcdir)/extfs/hp48 $(DESTDIR)$(libdir)/extfs/hp48
-
-- $(INSTALL_PROGRAM) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
-- $(INSTALL_PROGRAM) extfs/deb $(DESTDIR)$(libdir)/extfs/deb
-- $(INSTALL_PROGRAM) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
-- $(INSTALL_PROGRAM) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
-- $(INSTALL_PROGRAM) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
-- $(INSTALL_PROGRAM) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
-- $(INSTALL_PROGRAM) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
-- $(INSTALL_PROGRAM) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
-+ $(INSTALL_DATA) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
-+ $(INSTALL_DATA) extfs/deb $(DESTDIR)$(libdir)/extfs/deb
-+ $(INSTALL_DATA) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
-+ $(INSTALL_DATA) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
-+ $(INSTALL_DATA) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
-+ $(INSTALL_DATA) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
-+ $(INSTALL_DATA) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
-+ $(INSTALL_DATA) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
-
- uninstall:
- -$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
diff --git a/sysutils/mc/patches/patch-ac b/sysutils/mc/patches/patch-ac
deleted file mode 100644
index 7de9b098155..00000000000
--- a/sysutils/mc/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1999/03/14 20:59:42 tron Exp $
-
---- Make.common.in.orig Mon May 25 06:16:04 1998
-+++ Make.common.in Sun Oct 4 09:09:45 1998
-@@ -17,6 +17,7 @@
-
- builddir = @builddir@
- bindir = $(exec_prefix)/bin
-+sbindir = $(exec_prefix)/sbin
- libdir = $(exec_prefix)/lib/mc
- suppbindir = $(libdir)/bin
- tidir = $(libdir)/term
-@@ -51,7 +52,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@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\"
-+XCPPFLAGS = @CPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\"
- XLDFLAGS = @LDFLAGS@
- XDEFS = @DEFS@
- XLIBS = @LIBS@
diff --git a/sysutils/mc/patches/patch-ae b/sysutils/mc/patches/patch-ae
deleted file mode 100644
index 2340ee3b14a..00000000000
--- a/sysutils/mc/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.5 1999/03/14 20:59:42 tron Exp $
-
---- mcfn_install.in.orig Mon May 25 06:16:04 1998
-+++ mcfn_install.in Sun Oct 4 09:11:40 1998
-@@ -1,4 +1,4 @@
--#/bin/sh
-+#!/bin/sh
- #
- prefix=@prefix@
- if test -n `echo $prefix | grep prefix`; then
diff --git a/sysutils/mc/patches/patch-af b/sysutils/mc/patches/patch-af
index 0b5e497f00a..e23ef1f65ea 100644
--- a/sysutils/mc/patches/patch-af
+++ b/sysutils/mc/patches/patch-af
@@ -1,9 +1,18 @@
-$NetBSD: patch-af,v 1.5 1999/03/14 20:59:42 tron Exp $
+$NetBSD: patch-af,v 1.6 1999/03/14 23:07:55 tron Exp $
---- Makefile.in.orig Mon May 25 06:16:04 1998
-+++ Makefile.in Sun Oct 4 09:11:43 1998
-@@ -43,7 +43,7 @@
- install: installdirs @vcs@
+--- Makefile.in.orig Sun Mar 14 23:55:56 1999
++++ Makefile.in Sun Mar 14 23:56:19 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 gtkedit edit src new_icons icons
+ unixdirs=intl $(codedirs) @POSUB@
+ alldirs=$(unixdirs) $(foreigndirs)
+ subdirs=$(alldirs)
+@@ -46,7 +46,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_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
@@ -11,3 +20,14 @@ $NetBSD: patch-af,v 1.5 1999/03/14 20:59:42 tron Exp $
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 @@
+ installdirs:
+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
+- $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(suppbindir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
+- $(MKINSTALLDIRS) $(DESTDIR)$(idldir)
+
+ mcfninstall:
+ -/bin/sh ./mcfn_install
diff --git a/sysutils/mc/pkg/PLIST b/sysutils/mc/pkg/PLIST
index b84fae6870f..9262e9f0bac 100644
--- a/sysutils/mc/pkg/PLIST
+++ b/sysutils/mc/pkg/PLIST
@@ -1,22 +1,31 @@
-@comment $NetBSD: PLIST,v 1.5 1999/03/14 20:59:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/03/14 23:07:55 tron Exp $
bin/mc
bin/mcmfmt
+bin/mcedit
+bin/mcserv
+etc/mc.global
lib/mc/FAQ
lib/mc/bin/mcfn_install
lib/mc/extfs/README
lib/mc/extfs/a
-lib/mc/extfs/arfs
-lib/mc/extfs/cpio
lib/mc/extfs/deb
lib/mc/extfs/extfs.ini
lib/mc/extfs/ftplist
lib/mc/extfs/hp48
-lib/mc/extfs/lha
lib/mc/extfs/lslR
-lib/mc/extfs/rar
lib/mc/extfs/rpm
-lib/mc/extfs/zip
-lib/mc/extfs/zoo
+lib/mc/extfs/mailfs
+lib/mc/extfs/patchfs
+lib/mc/extfs/sfs.ini
+lib/mc/extfs/trpm
+lib/mc/extfs/rpms
+lib/mc/extfs/ucpio
+lib/mc/extfs/urar
+lib/mc/extfs/uzoo
+lib/mc/extfs/uar
+lib/mc/extfs/ulha
+lib/mc/extfs/uzip
+lib/mc/mc-gnome.ext
lib/mc/mc.ext
lib/mc/mc.hint
lib/mc/mc.hlp
@@ -32,10 +41,17 @@ lib/mc/term/xterm.ti
man/man1/mc.1
man/man1/mcedit.1
man/man8/mcserv.8
-sbin/mcserv
share/locale/es/LC_MESSAGES/mc.mo
share/locale/fr/LC_MESSAGES/mc.mo
share/locale/ru/LC_MESSAGES/mc.mo
+share/locale/de/LC_MESSAGES/mc.mo
+share/locale/da/LC_MESSAGES/mc.mo
+share/locale/cs/LC_MESSAGES/mc.mo
+share/locale/it/LC_MESSAGES/mc.mo
+share/locale/pl/LC_MESSAGES/mc.mo
+share/locale/ko/LC_MESSAGES/mc.mo
+share/locale/no/LC_MESSAGES/mc.mo
+share/locale/ro/LC_MESSAGES/mc.mo
@dirrm lib/mc/bin
@dirrm lib/mc/extfs
@dirrm lib/mc/term