sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 4.5.55.

Browse source
This commit is contained in:
Maxim Sobolev 2001-09-11 16:25:08 +00:00
parent 4f0e364f53
commit 1ade34e4fd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=47691
10 changed files with 135 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
x11-fm/gnomemc/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= gnomemc PORTNAME= gnomemc
PORTVERSION= 4.5.54 PORTVERSION= 4.5.55
CATEGORIES= x11-fm gnome CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/mc MASTER_SITE_SUBDIR= stable/sources/mc
@ -19,11 +19,13 @@ USE_GMAKE= yes
USE_GNOME= yes USE_GNOME= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-edit -with-ncurses CONFIGURE_ARGS= --without-edit -with-ncurses
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LIBS="-L${LOCALBASE}/lib" LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
post-patch: post-patch:
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(libdir\)/mc|\$\(datadir\)/mc|g' 's|\$\(libdir\)/mc|\$\(datadir\)/mc|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk> .include <bsd.port.mk>

2
x11-fm/gnomemc/distinfo
View file

@ -1 +1 @@
MD5 (mc-4.5.54.tar.gz) = 46bd6d7e25fc3f509c5d8d063fa701eb MD5 (mc-4.5.55.tar.gz) = bb670d48589f26f00b7fce8d25f66bd6

30
x11-fm/gnomemc/files/patch-aa
View file

@ -1,18 +1,14 @@
--- configure.orig Sun Mar 18 12:20:41 2001
+++ configure Thu Mar 29 10:08:26 2001
@@ -3106,3 +3106,3 @@
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
@@ -12107,6 +12107,6 @@
esac
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
+# case "$ac_given_INSTALL" in
+# [/$]*) INSTALL="$ac_given_INSTALL" ;;
+# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+# esac
$FreeBSD$
--- configure.orig Fri Aug 24 11:05:06 2001
+++ configure Tue Sep 11 18:16:08 2001
@@ -2552,6 +2552,8 @@
echo "$as_me:2552: result: no" >&5
echo "${ECHO_T}no" >&6
fi
+CPPLAGS="$save_CPPFLAGS"
+CFLAGS="$CFLAGS -I${LOCALBASE}/include"
rm -f conftest*
echo "$as_me:2557: checking for minix/config.h" >&5

16
x11-fm/gnomemc/files/patch-ab
View file

@ -1,12 +1,14 @@
--- vfs/Make-mc.in.orig Wed Mar 14 20:05:53 2001
+++ vfs/Make-mc.in Wed Mar 28 18:11:44 2001 $FreeBSD$
@@ -20,3 +20,3 @@
--- vfs/Make-mc.in.orig Wed Aug 1 19:15:22 2001
+++ vfs/Make-mc.in Tue Sep 11 18:20:08 2001
@@ -18,7 +18,7 @@
DEFS = $(XDEFS)
LIBS = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
INSTALL = @INSTALL@ INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
@@ -242,4 +242,2 @@ AR = @AR@
install_mcserv:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv

24
x11-fm/gnomemc/files/patch-ac
View file

@ -1,22 +1,16 @@
--- Make.common.in.orig Thu Sep 23 12:01:07 1999
+++ Make.common.in Fri Sep 24 17:16:22 1999 $FreeBSD$
@@ -24,17 +24,17 @@
gnomeicondir = @gnomeicondir@ --- Make.common.in.orig Fri Jul 20 18:22:50 2001
xv_bindir = @xv_bindir@ +++ Make.common.in Tue Sep 11 18:23:08 2001
corbadir = $(sysconfdir)/CORBA/servers @@ -13,10 +13,10 @@
datadir = @datadir@
libdir = @libdir@
mandir = @mandir@
-mclibdir = $(libdir)/mc -mclibdir = $(libdir)/mc
+mclibdir = $(datadir)/mc +mclibdir = $(datadir)/mc
desktopdir = $(mclibdir)/desktop-scripts
-idldir = $(prefix)/share/idl
+idldir = $(datadir)/idl
suppbindir = $(mclibdir)/bin suppbindir = $(mclibdir)/bin
-gnewdir = $(prefix)/share/mc/templates
+gnewdir = $(datadir)/mc/templates
tidir = $(mclibdir)/term
extfsdir = $(mclibdir)/extfs
confdir = $(sysconfdir) confdir = $(sysconfdir)
icondir = $(datadir)/pixmaps/mc
syntaxdir = $(mclibdir)/syntax
-localedir = $(datadir)/locale -localedir = $(datadir)/locale
+localedir = $(prefix)/share/locale +localedir = $(prefix)/share/locale
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1

66
x11-fm/gnomemc/files/patch-af
View file

@ -1,49 +1,25 @@
--- Makefile.in.orig Sun Mar 18 12:20:52 2001
+++ Makefile.in Wed Mar 28 18:16:22 2001
@@ -159,3 +159,3 @@
-SUBDIRS = vfs lib doc slang gtkedit edit src gnome new_icons idl syntax intl doc-gnome po pc $FreeBSD$
+SUBDIRS = vfs lib gtkedit gnome new_icons idl syntax intl po
@@ -174,3 +174,3 @@ --- Makefile.in.orig Fri Aug 24 11:05:06 2001
+++ Makefile.in Tue Sep 11 18:25:56 2001
@@ -155,8 +155,8 @@
smbfs = @smbfs@
undelfs_o = @undelfs_o@
-SUBDIRS = intl po vfs slang edit src lib doc syntax pc \
- gtkedit gnome new_icons idl doc-gnome
+SUBDIRS = intl po vfs lib syntax pc \
+ gtkedit gnome new_icons idl
ACLOCAL_AMFLAGS = -I macros
@@ -181,7 +181,7 @@
CONFIG_HEADER = config.h CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = Make.common mc.spec mcfn_install CONFIG_CLEAN_FILES = Make.common mc.spec gnome/Makefile gnome/mc.keys.in \
+CONFIG_CLEAN_FILES = Make.common mc.spec src/Makefile slang/Makefile edit/Makefile gtkedit/Makefile \
DATA = $(noinst_DATA) - mcfn_install intl/Makefile
--- lib/Makefile.in.orig Sun Mar 18 12:20:57 2001 + intl/Makefile
+++ lib/Makefile.in Wed Mar 28 18:19:55 2001 DIST_SOURCES =
@@ -161,4 +161,2 @@ DATA = $(noinst_DATA)
desktopdir = $(mclibdir)/desktop-scripts
-suppbindir = $(mclibdir)/bin
-tidir = $(mclibdir)/term
confdir = $(sysconfdir)
@@ -176,5 +174,3 @@
conf_DATA = mc.global
-suppbin_SCRIPTS = mc.csh mc.sh
desktop_DATA = startup.links README.desktop
-ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
@@ -188,6 +184,5 @@
CONFIG_CLEAN_FILES = mc.ext mc.sh mc.csh
-SCRIPTS = $(noinst_SCRIPTS) $(suppbin_SCRIPTS)
+SCRIPTS = $(noinst_SCRIPTS)
-DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA) \
-$(ti_DATA)
+DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA)
@@ -340,4 +335,4 @@
-install-data-am: install-suppbinSCRIPTS install-confDATA \
- install-desktopDATA install-mclibDATA install-tiDATA
+install-data-am: install-confDATA \
+ install-desktopDATA install-mclibDATA
install-data: install-data-am
@@ -356,5 +351,4 @@
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(suppbindir) $(DESTDIR)$(confdir) \
- $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir) \
- $(DESTDIR)$(tidir)
+ $(mkinstalldirs) $(DESTDIR)$(confdir) \
+ $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir)

20
x11-fm/gnomemc/files/patch-ah
View file

@ -1,20 +0,0 @@
--- gnome/gutil.c.orig Mon Dec 6 17:50:05 1999
+++ gnome/gutil.c Sat Feb 5 10:27:43 2000
@@ -70,12 +70,17 @@
gnome_sigchld_handler (int sig)
{
char c;
+ pid_t p;
+ int s;
if (previous_sigchld.sa_handler != SIG_IGN &&
previous_sigchld.sa_handler != SIG_DFL){
(*previous_sigchld.sa_handler)(sig);
}
write (child_died_notify_handler, &c, sizeof (c));
+
+ while ((p = waitpid(-1, &s, WNOHANG)) > 0)
+ continue;
}
/*

17
x11-fm/gnomemc/files/patch-ak
View file

@ -1,7 +1,14 @@
--- idl/Makefile.in.orig Sun Mar 18 12:21:08 2001
+++ idl/Makefile.in Thu Mar 29 10:09:30 2001
@@ -159,3 +159,3 @@
-idldir = $(prefix)/share/idl $FreeBSD$
+idldir = $(datadir)/idl
--- idl/Makefile.in.orig Fri Aug 24 11:05:07 2001
+++ idl/Makefile.in Tue Sep 11 18:32:49 2001
@@ -157,7 +157,7 @@
IDLFILES = FileManager.idl
-@GNOME_TRUE@idldir = $(prefix)/share/idl
+@GNOME_TRUE@idldir = $(datadir)/idl
@GNOME_TRUE@idl_DATA = $(IDLFILES)

56
x11-fm/gnomemc/files/patch-lib::Makefile.in Normal file
View file

@ -0,0 +1,56 @@
$FreeBSD$
--- lib/Makefile.in.orig Fri Aug 24 11:05:07 2001
+++ lib/Makefile.in Tue Sep 11 18:29:09 2001
@@ -156,8 +156,6 @@
undelfs_o = @undelfs_o@
mclibdir = $(libdir)/mc
-suppbindir = $(mclibdir)/bin
-tidir = $(mclibdir)/term
confdir = $(sysconfdir)
@CHARSET_TRUE@LIBFILES_ADD = mc.charsets
@@ -181,8 +179,6 @@
noinst_SCRIPTS = tdiff
conf_DATA = mc.global
-suppbin_SCRIPTS = mc.csh mc.sh
-ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
DESKTOP_FILES = startup.links README.desktop
@GNOME_TRUE@desktopdir = $(mclibdir)/desktop-scripts
@@ -205,11 +201,10 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = mc.ext mc.sh mc.csh
-SCRIPTS = $(noinst_SCRIPTS) $(suppbin_SCRIPTS)
+SCRIPTS = $(noinst_SCRIPTS)
DIST_SOURCES =
-DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA) \
- $(ti_DATA)
+DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA)
DIST_COMMON = Makefile.am Makefile.in mc.csh.in mc.ext.in mc.sh.in
all: all-am
@@ -348,7 +343,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(suppbindir) $(DESTDIR)$(confdir) $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir) $(DESTDIR)$(tidir)
+ $(mkinstalldirs) $(DESTDIR)$(confdir) $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir)
install: install-am
install-exec: install-exec-am
@@ -389,8 +384,7 @@
info-am:
-install-data-am: install-confDATA install-desktopDATA install-mclibDATA \
- install-suppbinSCRIPTS install-tiDATA
+install-data-am: install-confDATA install-desktopDATA install-mclibDATA
install-exec-am:

9
x11-fm/gnomemc/pkg-plist
View file

@ -8,6 +8,7 @@ share/gnome/mc/cedit.menu
share/gnome/mc/desktop-scripts/README.desktop share/gnome/mc/desktop-scripts/README.desktop
share/gnome/mc/desktop-scripts/startup.links share/gnome/mc/desktop-scripts/startup.links
share/gnome/mc/edit.indent.rc share/gnome/mc/edit.indent.rc
share/gnome/mc/edit.spell.rc
share/gnome/mc/extfs/README share/gnome/mc/extfs/README
share/gnome/mc/extfs/a share/gnome/mc/extfs/a
share/gnome/mc/extfs/apt share/gnome/mc/extfs/apt
@ -36,14 +37,17 @@ share/gnome/mc/extfs/unarj.diff
share/gnome/mc/extfs/urar share/gnome/mc/extfs/urar
share/gnome/mc/extfs/uzip share/gnome/mc/extfs/uzip
share/gnome/mc/extfs/uzoo share/gnome/mc/extfs/uzoo
share/gnome/mc/layout
share/gnome/mc/mc.ext share/gnome/mc/mc.ext
share/gnome/mc/mc.hint share/gnome/mc/mc.hint
share/gnome/mc/mc.hint.cs share/gnome/mc/mc.hint.cs
share/gnome/mc/mc.hint.es share/gnome/mc/mc.hint.es
share/gnome/mc/mc.hint.it share/gnome/mc/mc.hint.it
share/gnome/mc/mc.hint.hu
share/gnome/mc/mc.hint.nl
share/gnome/mc/mc.hint.pl share/gnome/mc/mc.hint.pl
share/gnome/mc/mc.hint.ru share/gnome/mc/mc.hint.ru
share/gnome/mc/mc.hint.uk
share/gnome/mc/mc.hint.zh
share/gnome/mc/mc.hlp.hu share/gnome/mc/mc.hlp.hu
share/gnome/mc/mc.lib share/gnome/mc/mc.lib
share/gnome/mc/mc.menu share/gnome/mc/mc.menu
@ -60,10 +64,13 @@ share/gnome/mc/syntax/mail.syntax
share/gnome/mc/syntax/makefile.syntax share/gnome/mc/syntax/makefile.syntax
share/gnome/mc/syntax/ml.syntax share/gnome/mc/syntax/ml.syntax
share/gnome/mc/syntax/nroff.syntax share/gnome/mc/syntax/nroff.syntax
share/gnome/mc/syntax/octave.syntax
share/gnome/mc/syntax/pascal.syntax share/gnome/mc/syntax/pascal.syntax
share/gnome/mc/syntax/perl.syntax share/gnome/mc/syntax/perl.syntax
share/gnome/mc/syntax/po.syntax
share/gnome/mc/syntax/python.syntax share/gnome/mc/syntax/python.syntax
share/gnome/mc/syntax/sh.syntax share/gnome/mc/syntax/sh.syntax
share/gnome/mc/syntax/slang.syntax
share/gnome/mc/syntax/smalltalk.syntax share/gnome/mc/syntax/smalltalk.syntax
share/gnome/mc/syntax/swig.syntax share/gnome/mc/syntax/swig.syntax
share/gnome/mc/syntax/texinfo.syntax share/gnome/mc/syntax/texinfo.syntax