- Add staging support, strip binary files

- Respect CFLAGS during build
- Use REINPLACE_CMD, SUB_FILES to simplify substitutions
- Rename patches to proper names
- Break lines around 80 characters

9 files changed, 61 insertions, 68 deletions

diff --git a/editors/thoteditor/files/patch-ae b/editors/thoteditor/files/patch-Makefile.in
index f3dd5e2e2bcb..e636093a458d 100644
--- a/editors/thoteditor/files/patch-ae
+++ b/editors/thoteditor/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- ../Makefile.in.orig	Wed Oct  8 04:13:58 1997
-+++ ../Makefile.in	Sun Oct  3 23:44:16 1999
+--- ../Makefile.in.orig	1997-10-08 10:13:58.000000000 +0200
++++ ../Makefile.in	2014-05-08 10:31:05.418730130 +0200
 @@ -17,6 +17,7 @@
  
  SUBDIRS	= tools tablelib thotlib batch drawlib indexlib thot amaya
@@ -12,8 +12,8 @@
  	  do if test -d $$dir ; then cd $$dir ; \
  	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" install ; \
  	  cd .. ; fi ;done )
-+	@(set -x;for file in $(BINS);\
-+	  do $(INSTALL_BIN) $$file ${bindir}; done )
++	(for file in $(BINS);\
++	  do $(BSD_INSTALL_PROGRAM) $$file $(DESTDIR)${bindir}; done )
  
  uninstall : 
  	@(for dir in $(SUBDIRS) ;\
diff --git a/editors/thoteditor/files/patch-ab b/editors/thoteditor/files/patch-ab
deleted file mode 100644
index 03bf5bfd09c5..000000000000
--- a/editors/thoteditor/files/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../batch/Makefile.in.orig	Sat Sep 25 11:11:53 1999
-+++ ../batch/Makefile.in	Sat Sep 25 11:26:34 1999
-@@ -202,14 +202,14 @@
- 	$(RM) -f *.o dns_daemon
- 
- install : all
--	@(if test ! -d $(datadir) ; then $(MKDIR) $(datadir) ; fi)
--	@(if test ! -d $(datadir)/thot ; then $(MKDIR) $(datadir)/thot ; fi)
--	@(if test ! -d $(datadir)/thot/batch ; then $(MKDIR) $(datadir)/thot/batch ; fi)
--	@(if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi)
--	@(if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi)
--	@(for i in $(COMPILERS) ; do \
-+	@(set -x;if test ! -d $(datadir) ; then $(MKDIR) $(datadir) ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot ; then $(MKDIR) $(datadir)/thot ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/batch ; then $(MKDIR) $(datadir)/thot/batch ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi)
-+	@(set -x;for i in $(COMPILERS) ; do \
- 	  $(INSTALL_BIN) $$i $(datadir)/thot/applis/bin ; done)
--	(for i in $(LANGUAGES) ; do \
-+	@(set -x;for i in $(LANGUAGES) ; do \
- 	  for file in `$(ECHO) $(THOTDIR)/batch/$$i` ; do \
- 	    $(INSTALL_DATA) $$file $(datadir)/thot/batch ; \
- 	  done ; done)
diff --git a/editors/thoteditor/files/patch-af b/editors/thoteditor/files/patch-af
deleted file mode 100644
index fa722a3de559..000000000000
--- a/editors/thoteditor/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../thotlib/include/sysdep.h.orig	Sat Sep 25 15:08:35 1999
-+++ ../thotlib/include/sysdep.h	Sat Sep 25 15:10:04 1999
-@@ -1239,7 +1239,7 @@
-  */
- #ifndef CACHE_FILE_PREFIX
- #ifdef unix
--#define CACHE_FILE_PREFIX  "/usr/wsrc/"
-+#define CACHE_FILE_PREFIX  "/usr/tmp/"
- #endif
- #endif
- /*
diff --git a/editors/thoteditor/files/patch-batch-Makefile.in b/editors/thoteditor/files/patch-batch-Makefile.in
new file mode 100644
index 000000000000..b6f398c8481e
--- /dev/null
+++ b/editors/thoteditor/files/patch-batch-Makefile.in
@@ -0,0 +1,27 @@
+--- ../batch/Makefile.in.orig	1997-11-14 18:09:14.000000000 +0100
++++ ../batch/Makefile.in	2014-05-08 10:17:15.785699396 +0200
+@@ -202,16 +202,16 @@
+ 	$(RM) -f *.o dns_daemon
+ 
+ install : all
+-	@(if test ! -d $(datadir) ; then $(MKDIR) $(datadir) ; fi)
+-	@(if test ! -d $(datadir)/thot ; then $(MKDIR) $(datadir)/thot ; fi)
+-	@(if test ! -d $(datadir)/thot/batch ; then $(MKDIR) $(datadir)/thot/batch ; fi)
+-	@(if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi)
+-	@(if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi)
+-	@(for i in $(COMPILERS) ; do \
+-	  $(INSTALL_BIN) $$i $(datadir)/thot/applis/bin ; done)
++	(if test ! -d $(DESTDIR)$(datadir) ; then $(MKDIR) $(DESTDIR)$(datadir) ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot ; then $(MKDIR) $(DESTDIR)$(datadir)/thot ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/batch ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/batch ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/applis ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/applis/bin ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis/bin ; fi)
++	(for i in $(COMPILERS) ; do \
++	  $(BSD_INSTALL_PROGRAM) $$i $(DESTDIR)$(datadir)/thot/applis/bin ; done)
+ 	(for i in $(LANGUAGES) ; do \
+ 	  for file in `$(ECHO) $(THOTDIR)/batch/$$i` ; do \
+-	    $(INSTALL_DATA) $$file $(datadir)/thot/batch ; \
++	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/batch ; \
+ 	  done ; done)
+ 
+ uninstall :
diff --git a/editors/thoteditor/files/patch-aa b/editors/thoteditor/files/patch-configure
index a79a5de4d766..a79a5de4d766 100644
--- a/editors/thoteditor/files/patch-aa
+++ b/editors/thoteditor/files/patch-configure
diff --git a/editors/thoteditor/files/patch-ac b/editors/thoteditor/files/patch-thot-Makefile.in
index 4c1723124691..9bd21dafd49c 100644
--- a/editors/thoteditor/files/patch-ac
+++ b/editors/thoteditor/files/patch-thot-Makefile.in
@@ -1,11 +1,11 @@
---- ../thot/Makefile.in.orig	Wed Nov 19 05:41:49 1997
-+++ ../thot/Makefile.in	Sun Oct  3 23:42:28 1999
+--- ../thot/Makefile.in.orig	1997-11-19 11:41:49.000000000 +0100
++++ ../thot/Makefile.in	2014-05-08 10:28:49.671753071 +0200
 @@ -14,7 +14,7 @@
            -I@top_srcdir@/drawlib -I@top_srcdir@/drawlib/f
  LDFLAGS = @LDFLAGS@ -L../indexlib -L../drawlib -L../tablelib -L../thotlib -L..
  LIBS	= -lThotIndex -lThotDraw -lThotTable -lThotEditor @IMGLIBS@ \
 -          $(MOTIF_LIBRARIES) -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \
-+          %%MOTIFLIB%% -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \
++          %%MOTIFLIB%% -lXm -lXp -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \
  	  -lX11 $(X_EXTRA_LIBS) @LIBS@ @EXTRA_LIBS@ -lm
  
  prefix = @prefix@
@@ -17,7 +17,7 @@
      en-drawdialogue  en-grmdialogue  en-inddialogue  en-itfdialogue \
      en-libdialogue  en-printdialogue  en-prsdialogue  en-strdialogue \
      en-thotdialogue  en-thotmessage  en-thotversion  en-transdialogue \
-@@ -54,30 +55,32 @@
+@@ -54,31 +55,33 @@
  	$(RM) *.o EDITORAPP.c EDITOR.A
  
  install : all
@@ -31,39 +31,40 @@
 -	@(if test ! -d $(datadir)/schemas ; then $(MKDIR) $(datadir)/schemas ; fi)
 -	$(INSTALL_BIN) ../bin/thot $(datadir)/thot/applis/bin
 -	$(INSTALL_BIN) ../bin/print $(datadir)/thot/applis/bin
--	(for i in $(SCHEMAS) ; do \
-+	@(set -x;if test ! -d $(datadir) ; then $(MKDIR) $(datadir) ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot ; then $(MKDIR) $(datadir)/thot ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/config ; then $(MKDIR) $(datadir)/thot/config ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/fonts ; then $(MKDIR) $(datadir)/thot/fonts ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/dicopar ; then $(MKDIR) $(datadir)/thot/dicopar ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi)
-+	@(set -x;if test ! -d $(datadir)/thot/schemas ; then $(MKDIR) $(datadir)/thot/schemas ; fi)
-+	@$(INSTALL_BIN) ../bin/thot $(datadir)/thot/applis/bin
-+	@$(INSTALL_BIN) ../bin/print $(datadir)/thot/applis/bin
-+	@$(INSTALL_DATA) EDITOR.h $(THOTDIR)/schemas
-+	@$(INSTALL_DATA) ExtCss.h $(THOTDIR)/schemas
-+	@(set -x;for i in $(SCHEMAS) ; do \
++	(if test ! -d $(DESTDIR)$(datadir) ; then $(MKDIR) $(DESTDIR)$(datadir) ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot ; then $(MKDIR) $(DESTDIR)$(datadir)/thot ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/config ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/config ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/fonts ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/fonts ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/dicopar ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/dicopar ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/applis ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/applis/bin ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis/bin ; fi)
++	(if test ! -d $(DESTDIR)$(datadir)/thot/schemas ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/schemas ; fi)
++	$(BSD_INSTALL_PROGRAM) ../bin/thot $(DESTDIR)$(datadir)/thot/applis/bin
++	$(BSD_INSTALL_PROGRAM) ../bin/print $(DESTDIR)$(datadir)/thot/applis/bin
++	$(INSTALL_DATA) EDITOR.h $(DESTDIR)$(datadir)/thot/schemas
++	$(INSTALL_DATA) ExtCss.h $(DESTDIR)$(datadir)/thot/schemas
+ 	(for i in $(SCHEMAS) ; do \
  	  for file in `$(ECHO) $(THOTDIR)/schemas/$$i` ; do \
- 	    $(INSTALL_DATA) $$file $(datadir)/thot/schemas ; \
+-	    $(INSTALL_DATA) $$file $(datadir)/thot/schemas ; \
++	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/schemas ; \
  	  done ; done)
--	(for i in $(CONFIGFILES) ; do \
+ 	(for i in $(CONFIGFILES) ; do \
 -	  for file in `$(ECHO) $(THOTDIR)/thot/config/$$i` ; do \
-+	@(set -x;for i in $(CONFIGFILES) ; do \
+-	    $(INSTALL_DATA) $$file $(datadir)/thot/config ; \
 +	  for file in `$(ECHO) $(THOTDIR)/config/$$i` ; do \
- 	    $(INSTALL_DATA) $$file $(datadir)/thot/config ; \
++	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/config ; \
  	  done ; done)
--	(for i in $(DICOFILES) ; do \
+ 	(for i in $(DICOFILES) ; do \
 -	  for file in `$(ECHO) $(THOTDIR)/thot/dicopar/$$i` ; do \
-+	@(set -x;for i in $(DICOFILES) ; do \
+-	    $(INSTALL_DATA) $$file $(datadir)/thot/dicopar ; \
 +	  for file in `$(ECHO) $(THOTDIR)/dicopar/$$i` ; do \
- 	    $(INSTALL_DATA) $$file $(datadir)/thot/dicopar ; \
++	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/dicopar ; \
  	  done ; done)
--	(for i in $(FONTSFILES) ; do \
+ 	(for i in $(FONTSFILES) ; do \
 -	  for file in `$(ECHO) $(THOTDIR)/thot/fonts/$$i` ; do \
-+	@(set -x;for i in $(FONTSFILES) ; do \
+-	    $(INSTALL_DATA) $$file $(datadir)/thot/fonts ; \
 +	  for file in `$(ECHO) $(THOTDIR)/fonts/$$i` ; do \
- 	    $(INSTALL_DATA) $$file $(datadir)/thot/fonts ; \
++	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/fonts ; \
  	  done ; done)
  
+ uninstall :
diff --git a/editors/thoteditor/files/patch-ag b/editors/thoteditor/files/patch-thotlib-base-registry.c
index b935d6ed5c2a..e3fff2c9ae4d 100644
--- a/editors/thoteditor/files/patch-ag
+++ b/editors/thoteditor/files/patch-thotlib-base-registry.c
@@ -23,7 +23,7 @@
  	strcat (filename, THOT_RC_FILENAME);
 +	if (!TtaFileExist (&filename[0]))
 +	{
-+		sprintf(homecmd,"/bin/cp /usr/local/share/thot/config/thot.ini %s%s.thotrc\n",home_dir,DIR_STR);
++		sprintf(homecmd,"/bin/cp %%PREFIX%%/share/thot/config/thot.ini %s%s.thotrc\n",home_dir,DIR_STR);
 +		fprintf(stderr,"Copying system thot.ini into ~/.thotrc.\n");
 +		system(homecmd);
 +		sprintf(homecmd,"/bin/chmod u+w %s%s.thotrc\n",home_dir,DIR_STR);
diff --git a/editors/thoteditor/files/patch-ad b/editors/thoteditor/files/patch-tools-Makefile.in
index c0cd3600e5a1..c0cd3600e5a1 100644
--- a/editors/thoteditor/files/patch-ad
+++ b/editors/thoteditor/files/patch-tools-Makefile.in
diff --git a/editors/thoteditor/files/thoteditor b/editors/thoteditor/files/thoteditor.in
index 4b5268f64bb7..4b5268f64bb7 100644
--- a/editors/thoteditor/files/thoteditor
+++ b/editors/thoteditor/files/thoteditor.in