Respect hier(7)

5 files changed, 108 insertions, 32 deletions

diff --git a/misc/mc-light/files/patch-Make.common.in b/misc/mc-light/files/patch-Make.common.in
new file mode 100644
index 000000000000..0af995d89d25
--- /dev/null
+++ b/misc/mc-light/files/patch-Make.common.in
@@ -0,0 +1,30 @@
+
+$FreeBSD$
+
+--- Make.common.in.orig	Sun Aug 22 15:03:08 2004
++++ Make.common.in	Fri Sep  3 14:37:46 2004
+@@ -18,11 +18,11 @@
+ builddir   = @builddir@
+ bindir     = $(exec_prefix)/bin
+ libdir     = $(exec_prefix)/lib/mc
+-suppbindir = $(libdir)/bin
+-tidir      = $(libdir)/term
+-extfsdir   = $(libdir)/extfs
++suppbindir = $(datadir)/bin
++tidir      = $(datadir)/term
++extfsdir   = $(datadir)/extfs
+ mandir     = $(prefix)/man/man1
+-datadir    = $(prefix)/share
++datadir    = $(prefix)/share/mc
+ localedir  = $(datadir)/locale
+ manext     = 1
+ man8dir    = $(prefix)/man/man8
+@@ -49,7 +49,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)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DWANT_PARSE
++XCPPFLAGS = @CPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(datadir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DWANT_PARSE
+ XLDFLAGS = @LDFLAGS@
+ XDEFS = @DEFS@
+ XLIBS = @LIBS@
diff --git a/misc/mc-light/files/patch-Makefile.in b/misc/mc-light/files/patch-Makefile.in
index d51283fff9d3..7677a50bda09 100644
--- a/misc/mc-light/files/patch-Makefile.in
+++ b/misc/mc-light/files/patch-Makefile.in
@@ -1,19 +1,24 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Tue Aug 31 16:11:30 2004
-+++ Makefile.in	Tue Aug 31 16:13:20 2004
-@@ -43,7 +43,7 @@
+--- Makefile.in.orig	Sun Jun  1 21:51:10 2003
++++ Makefile.in	Fri Sep  3 14:27:33 2004
+@@ -42,20 +42,20 @@
+ 
  install: installdirs @vcs@
  	@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)$(libdir)/FAQ
 -	$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
++	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(datadir)/FAQ
 +	$(INSTALL_DATA) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
  	chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
- 	@cp -r PowerPack/syntax $(DESTDIR)$(libdir)/
- 	@cp -r PowerPack/codepages $(DESTDIR)$(libdir)/
-@@ -51,7 +51,7 @@
- 	@echo "set in the mc.ext file in $(libdir)"
+-	@cp -r PowerPack/syntax $(DESTDIR)$(libdir)/
+-	@cp -r PowerPack/codepages $(DESTDIR)$(libdir)/
++	@cp -r PowerPack/syntax $(DESTDIR)$(datadir)/
++	@cp -r PowerPack/codepages $(DESTDIR)$(datadir)/
+ 	@echo "Please verify that the configuration values are correctly"
+-	@echo "set in the mc.ext file in $(libdir)"
++	@echo "set in the mc.ext file in $(datadir)"
  
  install.create_vcs:
 -	$(INSTALL_PROGRAM) $(srcdir)/create_vcs $(DESTDIR)$(suppbindir)/create_vcs
@@ -21,3 +26,8 @@ $FreeBSD$
  	if test x$(DESTDIR) = x; then $(SHELL) $(srcdir)/create_vcs; fi
  
  installdirs:
+-	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
++	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)
+ 	$(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
+ 	$(mcsrcdir)/xmkdir $(DESTDIR)$(suppbindir)
+ 	$(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
diff --git a/misc/mc-light/files/patch-lib_Makefile.in b/misc/mc-light/files/patch-lib_Makefile.in
new file mode 100644
index 000000000000..f7c81a30b75b
--- /dev/null
+++ b/misc/mc-light/files/patch-lib_Makefile.in
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- lib/Makefile.in.orig	Mon May 25 12:16:05 1998
++++ lib/Makefile.in	Fri Sep  3 14:52:08 2004
+@@ -34,10 +34,10 @@
+ 	$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
+ 
+ install:
+-	$(INSTALL_DATA) mc.ext $(DESTDIR)$(libdir)/mc.ext
+-	$(INSTALL_DATA) $(srcdir)/mc.menu $(DESTDIR)$(libdir)/mc.menu
+-	$(INSTALL_DATA) $(srcdir)/mc.hint $(DESTDIR)$(libdir)/mc.hint
+-	$(INSTALL_DATA) $(srcdir)/mc.lib $(DESTDIR)$(libdir)/mc.lib
++	$(INSTALL_DATA) mc.ext $(DESTDIR)$(datadir)/mc.ext
++	$(INSTALL_DATA) $(srcdir)/mc.menu $(DESTDIR)$(datadir)/mc.menu
++	$(INSTALL_DATA) $(srcdir)/mc.hint $(DESTDIR)$(datadir)/mc.hint
++	$(INSTALL_DATA) $(srcdir)/mc.lib $(DESTDIR)$(datadir)/mc.lib
+ 	$(INSTALL_DATA) $(srcdir)/ansi.ti $(DESTDIR)$(tidir)/ansi.ti
+ 	$(INSTALL_DATA) $(srcdir)/linux.ti $(DESTDIR)$(tidir)/linux.ti
+ 	$(INSTALL_DATA) $(srcdir)/vt100.ti $(DESTDIR)$(tidir)/vt100.ti
diff --git a/misc/mc-light/files/patch-src_Makefile.in b/misc/mc-light/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..5f04c2046a82
--- /dev/null
+++ b/misc/mc-light/files/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Wed Aug 18 23:32:30 2004
++++ src/Makefile.in	Fri Sep  3 14:47:25 2004
+@@ -135,7 +135,7 @@
+ install: mc mfmt @saver@
+ 	$(INSTALL_PROGRAM) mc     $(DESTDIR)$(bindir)/$(binprefix)mc
+ 	$(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt
+-	$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(libdir)/$(libprefix)mc.hlp 
++	$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(datadir)/mc.hlp
+ 
+ install.saver: cons.saver
+ 	$(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver
diff --git a/misc/mc-light/files/patch-vfs_Makefile.in b/misc/mc-light/files/patch-vfs_Makefile.in
index 1b89fedf6f2a..3338251f18df 100644
--- a/misc/mc-light/files/patch-vfs_Makefile.in
+++ b/misc/mc-light/files/patch-vfs_Makefile.in
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- vfs/Makefile.in.orig	Tue Aug 31 16:13:45 2004
-+++ vfs/Makefile.in	Tue Aug 31 16:14:48 2004
+--- vfs/Makefile.in.orig	Sun Aug 29 23:20:18 2004
++++ vfs/Makefile.in	Fri Sep  3 14:33:38 2004
 @@ -95,34 +95,34 @@
  
  install: @mcserv@ install.extfs
@@ -12,16 +12,18 @@ $FreeBSD$
  	fi)
  
  install.extfs:
- 	$(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
- 	$(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
+-	$(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_DATA) $(srcdir)/extfs/README $(DESTDIR)$(datadir)/extfs/README
++	$(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(datadir)/extfs/extfs.ini
++	$(INSTALL_DATA) $(srcdir)/extfs/a $(DESTDIR)$(datadir)/extfs/a
++	$(INSTALL_DATA) $(srcdir)/extfs/arfs $(DESTDIR)$(datadir)/extfs/arfs
++	$(INSTALL_DATA) $(srcdir)/extfs/rpm  $(DESTDIR)$(datadir)/extfs/rpm
++	$(INSTALL_DATA) $(srcdir)/extfs/hp48  $(DESTDIR)$(datadir)/extfs/hp48
  	
 -	$(INSTALL_PROGRAM) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
 -	$(INSTALL_PROGRAM) extfs/deb  $(DESTDIR)$(libdir)/extfs/deb
@@ -33,16 +35,16 @@ $FreeBSD$
 -	$(INSTALL_PROGRAM) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
 -	$(INSTALL_PROGRAM) extfs/esp $(DESTDIR)$(libdir)/extfs/esp
 -	$(INSTALL_PROGRAM) extfs/iso $(DESTDIR)$(libdir)/extfs/iso
-+	$(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
-+	$(INSTALL_DATA) extfs/esp $(DESTDIR)$(libdir)/extfs/esp
-+	$(INSTALL_DATA) extfs/iso $(DESTDIR)$(libdir)/extfs/iso
++	$(INSTALL_DATA) extfs/cpio $(DESTDIR)$(datadir)/extfs/cpio
++	$(INSTALL_DATA) extfs/deb  $(DESTDIR)$(datadir)/extfs/deb
++	$(INSTALL_DATA) extfs/ftplist $(DESTDIR)$(datadir)/extfs/ftplist
++	$(INSTALL_DATA) extfs/lslR $(DESTDIR)$(datadir)/extfs/lslR
++	$(INSTALL_DATA) extfs/lha $(DESTDIR)$(datadir)/extfs/lha
++	$(INSTALL_DATA) extfs/rar $(DESTDIR)$(datadir)/extfs/rar
++	$(INSTALL_DATA) extfs/zip $(DESTDIR)$(datadir)/extfs/zip
++	$(INSTALL_DATA) extfs/zoo $(DESTDIR)$(datadir)/extfs/zoo
++	$(INSTALL_DATA) extfs/esp $(DESTDIR)$(datadir)/extfs/esp
++	$(INSTALL_DATA) extfs/iso $(DESTDIR)$(datadir)/extfs/iso
  	
 -	$(INSTALL_PROGRAM) extfs/uarj $(DESTDIR)$(libdir)/extfs/uarj                            
 -	$(INSTALL_PROGRAM) extfs/uha $(DESTDIR)$(libdir)/extfs/uha                              
@@ -50,12 +52,12 @@ $FreeBSD$
 -	$(INSTALL_PROGRAM) extfs/mailfs $(DESTDIR)$(libdir)/extfs/mailfs                        
 -	$(INSTALL_PROGRAM) extfs/audio $(DESTDIR)$(libdir)/extfs/audio
 -	$(INSTALL_PROGRAM) extfs/patchfs $(DESTDIR)$(libdir)/extfs/patchfs
-+	$(INSTALL_DATA) extfs/uarj $(DESTDIR)$(libdir)/extfs/uarj                            
-+	$(INSTALL_DATA) extfs/uha $(DESTDIR)$(libdir)/extfs/uha                              
-+	$(INSTALL_DATA) extfs/trpm $(DESTDIR)$(libdir)/extfs/trpm                            
-+	$(INSTALL_DATA) extfs/mailfs $(DESTDIR)$(libdir)/extfs/mailfs                        
-+	$(INSTALL_DATA) extfs/audio $(DESTDIR)$(libdir)/extfs/audio
-+	$(INSTALL_DATA) extfs/patchfs $(DESTDIR)$(libdir)/extfs/patchfs
++	$(INSTALL_DATA) extfs/uarj $(DESTDIR)$(datadir)/extfs/uarj                            
++	$(INSTALL_DATA) extfs/uha $(DESTDIR)$(datadir)/extfs/uha                              
++	$(INSTALL_DATA) extfs/trpm $(DESTDIR)$(datadir)/extfs/trpm                            
++	$(INSTALL_DATA) extfs/mailfs $(DESTDIR)$(datadir)/extfs/mailfs                        
++	$(INSTALL_DATA) extfs/audio $(DESTDIR)$(datadir)/extfs/audio
++	$(INSTALL_DATA) extfs/patchfs $(DESTDIR)$(datadir)/extfs/patchfs
  
  uninstall:
  	-$(RMF) $(DESTDIR)$(libdir)/extfs/rpm