diff options
Diffstat (limited to 'misc/mc')
| -rw-r--r-- | misc/mc/Makefile | 30 | ||||
| -rw-r--r-- | misc/mc/distinfo | 2 | ||||
| -rw-r--r-- | misc/mc/files/patch-aa | 120 | ||||
| -rw-r--r-- | misc/mc/files/patch-ab | 6 | ||||
| -rw-r--r-- | misc/mc/files/patch-ac | 20 | ||||
| -rw-r--r-- | misc/mc/files/patch-af | 31 | ||||
| -rw-r--r-- | misc/mc/files/patch-ag | 6 | ||||
| -rw-r--r-- | misc/mc/pkg-plist | 78 |
8 files changed, 219 insertions, 74 deletions
diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 1f88cff7cb45..3e8eac6e32cf 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -1,21 +1,33 @@ # New ports collection makefile for: mc -# Version required: 4.5.1 +# Version required: 4.5.9 # Date created: 15 Jul 1995 # Whom: torstenb@FreeBSD.ORG # -# $Id: Makefile,v 1.25 1998/12/06 09:39:22 vanilla Exp $ +# $Id: Makefile,v 1.26 1998/12/07 08:50:59 obrien Exp $ # -DISTNAME= mc-4.5.1 +DISTNAME= mc-4.5.9 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= utils/file/managers/mc/devel +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= mc -MAINTAINER= ports@FreeBSD.ORG +MAINTAINER= reg@shale.csir.co.za -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-ncurses --without-edit --with-dusum --disable-nls -CONFIGURE_ENV= CCOPTS="$(CFLAGS)" INSTALL="$${INSTALL} -c" +BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel + +.if defined(USE_NCURSES_PORT) +LIB_DEPENDS+= ncurses.4:${PORTSDIR}/devel/ncurses +.endif + +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/glib11d-config" \ + LIBS="-L${LOCALBASE}/lib" MAN1= midc.1 MAN8= mcserv.8 diff --git a/misc/mc/distinfo b/misc/mc/distinfo index e63e4622efbe..57c005343985 100644 --- a/misc/mc/distinfo +++ b/misc/mc/distinfo @@ -1 +1 @@ -MD5 (mc-4.5.1.tar.gz) = 51ae681925f9d2b57323526545c93a36 +MD5 (mc-4.5.9.tar.gz) = a16de52c4454eaaf10d7fe94d34c4aeb diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa index 3a19fdfe7d92..ef507b35623f 100644 --- a/misc/mc/files/patch-aa +++ b/misc/mc/files/patch-aa @@ -1,15 +1,113 @@ ---- configure.orig Sun Dec 6 11:57:21 1998 -+++ configure Sun Dec 6 11:59:02 1998 -@@ -10840,7 +10840,7 @@ - if test -f /usr/include/ncurses.h +--- configure.orig Tue Jan 19 00:44:07 1999 ++++ configure Fri Jan 29 16:51:46 1999 +@@ -3188,15 +3188,15 @@ + fi + + +- USE_INCLUDED_LIBINTL=yes ++# USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share +- 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 ++# 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 @@ + + if $search_ncurses + then +- if test -f /usr/include/ncurses.h ++ if test -f /usr/local/include/ncurses/ncurses.h + then +- echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6 +- CURSES_LIBS="-lncurses" +- CURSES_INCLUDEDIR="" ++ echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6 ++ CURSES_LIBS="-L/usr/local/lib -lncurses" ++ CURSES_INCLUDEDIR="-I/usr/local/include/ncurses" + search_ncurses=false +- screen_manager="ncurses on /usr/include" ++ screen_manager="ncurses on /usr/local/include/ncurses" + cat >> confdefs.h <<\EOF + #define HAS_CURSES 1 + EOF +@@ -10381,13 +10381,13 @@ + + if $search_ncurses + then +- if test -f /usr/include/ncurses/ncurses.h ++ if test -f /usr/include/ncurses.h + then +- echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6 +- CURSES_LIBS="-lncurses" +- CURSES_INCLUDEDIR="-I/usr/include/ncurses" ++ echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6 ++ CURSES_LIBS="-lncurses -lmytinfo" ++ CURSES_INCLUDEDIR="" + search_ncurses=false +- screen_manager="ncurses on /usr/include/ncurses" ++ screen_manager="ncurses on /usr/include" + cat >> confdefs.h <<\EOF + #define HAS_CURSES 1 + EOF +@@ -10403,13 +10403,13 @@ + + if $search_ncurses + then +- if test -f /usr/local/include/ncurses.h ++ if test -f /usr/include/ncurses/ncurses.h + then +- echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6 +- CURSES_LIBS="-L/usr/local/lib -lncurses" +- CURSES_INCLUDEDIR="-I/usr/local/include" ++ echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6 ++ CURSES_LIBS="-lncurses" ++ CURSES_INCLUDEDIR="-I/usr/include/ncurses" + search_ncurses=false +- screen_manager="ncurses on /usr/local" ++ screen_manager="ncurses on /usr/include/ncurses" + cat >> confdefs.h <<\EOF + #define HAS_CURSES 1 + EOF +@@ -10425,13 +10425,13 @@ + + if $search_ncurses + then +- if test -f /usr/local/include/ncurses/ncurses.h ++ if test -f /usr/local/include/ncurses.h then - echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6 -- LIBS="$LIBS -lncurses" -+ LIBS="$LIBS -lncurses -lmytinfo" - CPPFLAGS="$CPPFLAGS " +- echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6 +- CURSES_LIBS="-L/usr/local/lib -L/usr/local/lib/ncurses -lncurses" +- CURSES_INCLUDEDIR="-I/usr/local/include/ncurses" ++ echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6 ++ CURSES_LIBS="-L/usr/local/lib -lncurses" ++ CURSES_INCLUDEDIR="-I/usr/local/include" search_ncurses=false - screen_manager="ncurses on /usr/include" -@@ -11648,7 +11648,7 @@ +- screen_manager="ncurses on /usr/local/include/ncurses" ++ screen_manager="ncurses on /usr/local" + cat >> confdefs.h <<\EOF + #define HAS_CURSES 1 + EOF +@@ -10676,6 +10676,8 @@ + fi + done + ++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 @@ -18,7 +116,7 @@ intl/Makefile po/Makefile.in config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -@@ -11851,7 +11851,7 @@ +@@ -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 diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab index a658376cf7e5..2e7bb63a2d15 100644 --- a/misc/mc/files/patch-ab +++ b/misc/mc/files/patch-ab @@ -1,6 +1,6 @@ ---- vfs/Make-mc.in.orig Sun Dec 6 11:59:31 1998 -+++ vfs/Make-mc.in Sun Dec 6 12:26:32 1998 -@@ -172,20 +172,20 @@ +--- 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 @@ install: @mcserv@ install.extfs -(if test x@mcserv@ != x; then \ diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac index 50f7a0eefc38..2dfc012812d9 100644 --- a/misc/mc/files/patch-ac +++ b/misc/mc/files/patch-ac @@ -1,19 +1,23 @@ ---- Make.common.in.orig Sun Dec 6 12:04:28 1998 -+++ Make.common.in Sun Dec 6 12:05:41 1998 -@@ -17,6 +17,7 @@ +--- Make.common.in.orig Tue Jan 19 00:44:07 1999 ++++ Make.common.in Tue Jan 26 18:50:46 1999 +@@ -17,9 +17,10 @@ builddir = @builddir@ bindir = @bindir@ +sbindir = $(exec_prefix)/sbin - libdir = $(exec_prefix)/lib/mc + sysconfdir = @sysconfdir@ + corbadir = $(sysconfdir)/CORBA/servers +-libdir = $(exec_prefix)/lib/mc ++libdir = $(exec_prefix)/share/mc + idldir = $(prefix)/share/idl suppbindir = $(libdir)/bin - tidir = $(libdir)/term -@@ -52,7 +53,7 @@ + gnewdir = $(prefix)/share/mc/templates +@@ -56,7 +57,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)/"\" +-XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" ++XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" XLDFLAGS = @LDFLAGS@ XDEFS = @DEFS@ XLIBS = @LIBS@ diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af index 90316a17bd22..504ba70ade86 100644 --- a/misc/mc/files/patch-af +++ b/misc/mc/files/patch-af @@ -1,6 +1,15 @@ ---- Makefile.in.orig Sun Dec 6 12:08:01 1998 -+++ Makefile.in Sun Dec 6 12:08:51 1998 -@@ -45,7 +45,7 @@ +--- Makefile.in.orig Tue Jan 19 00:44:07 1999 ++++ Makefile.in Tue Jan 26 19:38:26 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 + unixdirs=intl $(codedirs) @POSUB@ + alldirs=$(unixdirs) $(foreigndirs) + subdirs=$(alldirs) +@@ -46,7 +46,7 @@ install: installdirs @vcs@ @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ @@ -9,15 +18,17 @@ chmod +x $(DESTDIR)$(suppbindir)/mcfn_install @echo "Please verify that the configuration values are correctly" @echo "set in the mc.ext file in $(libdir)" -@@ -57,7 +57,7 @@ +@@ -58,9 +58,8 @@ installdirs: $(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir) - $(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir) + $(mcsrcdir)/xmkdir $(DESTDIR)$(suppbindir) $(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir) +- $(mcsrcdir)/xmkdir $(DESTDIR)$(idldir) mcfninstall: + -/bin/sh ./mcfn_install --- src/Makefile.in.orig Sun Dec 6 12:08:54 1998 +++ src/Makefile.in Sun Dec 6 12:09:24 1998 @@ -130,7 +130,7 @@ @@ -40,3 +51,15 @@ -$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(mandir)/$(manprefix)mcedit.$(manext) -$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext) +--- 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 @@ + # + + 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) \ diff --git a/misc/mc/files/patch-ag b/misc/mc/files/patch-ag index edbc6be74bf2..ebc0bc551c9b 100644 --- a/misc/mc/files/patch-ag +++ b/misc/mc/files/patch-ag @@ -1,5 +1,5 @@ ---- lib/mc.ext.in.orig Mon Oct 12 15:31:03 1998 -+++ lib/mc.ext.in Mon Dec 7 00:09:23 1998 +--- lib/mc.ext.in.orig Wed Jan 13 05:38:06 1999 ++++ lib/mc.ext.in Sat Jan 16 23:41:24 1999 @@ -265,7 +265,7 @@ # ar library regex/\.s?a$ @@ -170,7 +170,7 @@ @@ -551,7 +551,7 @@ shell/.cpio.gz - Open=%cd cpio:%d/%p/ + Open=%cd %d/%p#ucpio/ View=%view{ascii} gzip -dc '%f' | cpio -ictv - Extract=gzip -dc '%f' | cpio -ic + Extract=gzip -dc '%d/%p' | cpio -ic diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist index a35daba9ffb5..d15ed3e9dd6a 100644 --- a/misc/mc/pkg-plist +++ b/misc/mc/pkg-plist @@ -1,38 +1,46 @@ bin/midc bin/mcmfmt -lib/mc/FAQ -lib/mc/mc.ext -lib/mc/mc.hint -lib/mc/mc.hlp -lib/mc/mc.lib -lib/mc/mc.menu -lib/mc/bin/mcfn_install -lib/mc/extfs/README -lib/mc/extfs/a -lib/mc/extfs/deb -lib/mc/extfs/extfs.ini -lib/mc/extfs/ftplist -lib/mc/extfs/hp48 -lib/mc/extfs/lslR -lib/mc/extfs/mailfs -lib/mc/extfs/patchfs -lib/mc/extfs/rpm -lib/mc/extfs/sfs.ini -lib/mc/extfs/uar -lib/mc/extfs/ucpio -lib/mc/extfs/ulha -lib/mc/extfs/urar -lib/mc/extfs/uzip -lib/mc/extfs/uzoo -lib/mc/term/README.xterm -lib/mc/term/ansi.ti -lib/mc/term/linux.ti -lib/mc/term/vt100.ti -lib/mc/term/xterm.ad -lib/mc/term/xterm.tcap -lib/mc/term/xterm.ti sbin/mcserv -@dirrm lib/mc/bin -@dirrm lib/mc/extfs -@dirrm lib/mc/term -@dirrm lib/mc +share/locale/de/LC_MESSAGES/mc.mo +share/locale/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/ru/LC_MESSAGES/mc.mo +share/mc/FAQ +share/mc/bin/mcfn_install +share/mc/extfs/README +share/mc/extfs/a +share/mc/extfs/deb +share/mc/extfs/extfs.ini +share/mc/extfs/ftplist +share/mc/extfs/hp48 +share/mc/extfs/lslR +share/mc/extfs/mailfs +share/mc/extfs/patchfs +share/mc/extfs/rpm +share/mc/extfs/sfs.ini +share/mc/extfs/uar +share/mc/extfs/ucpio +share/mc/extfs/ulha +share/mc/extfs/urar +share/mc/extfs/uzip +share/mc/extfs/uzoo +share/mc/mc.ext +share/mc/mc.hint +share/mc/mc.hlp +share/mc/mc.lib +share/mc/mc.menu +share/mc/term/README.xterm +share/mc/term/ansi.ti +share/mc/term/linux.ti +share/mc/term/vt100.ti +share/mc/term/xterm.ad +share/mc/term/xterm.tcap +share/mc/term/xterm.ti +@dirrm share/mc/bin +@dirrm share/mc/extfs +@dirrm share/mc/term +@dirrm share/mc |