Support PREFIX properly. Also split patches one file per.

PR:		21036
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 115 insertions, 0 deletions

diff --git a/graphics/xmfract/files/patch-ac b/graphics/xmfract/files/patch-ac
new file mode 100644
index 000000000000..dc0a45b11a89
--- /dev/null
+++ b/graphics/xmfract/files/patch-ac
@@ -0,0 +1,33 @@
+--- Makefile.in.orig	Wed Jun 21 00:46:53 1995
++++ Makefile.in	Thu Aug 10 23:20:55 2000
+@@ -37,6 +37,10 @@
+ 
+ SHELL = /bin/sh
+ 
++prefix = @prefix@
++
++INSTALL_DATA = @INSTALL_DATA@
++
+ DISTFILES = Makefile.in config.h.in configure install.sh readme \
+ configure.in manifest
+ 
+@@ -48,7 +52,7 @@
+ 
+ .SUFFIXES:
+ 
+-all install uninstall: config.h Makefile
++all install uninstall:: config.h Makefile
+ 	for subdir in $(SUBDIRS); do \
+ 	  echo making $@ in $$subdir; \
+ 	  (cd $$subdir && $(MAKE) $@) || exit 1; \
+@@ -56,6 +60,10 @@
+ 
+ check:
+ installcheck:
++
++install::
++	$(INSTALL_DATA) $(srcdir)/Xmfract.ad $(prefix)/lib/X11/app-defaults/Xmfract
++	$(INSTALL_DATA) $(srcdir)/xmfract.ini $(prefix)/lib/X11/xmfract
+ 
+ $(PROGS):
+ 	cd lib && $(MAKE) all
diff --git a/graphics/xmfract/files/patch-ad b/graphics/xmfract/files/patch-ad
new file mode 100644
index 000000000000..46c8b0b9cbc5
--- /dev/null
+++ b/graphics/xmfract/files/patch-ad
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig	Wed Jun 21 00:46:55 1995
++++ src/Makefile.in	Thu Aug 10 22:22:02 2000
+@@ -41,15 +41,15 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)/bin
+-libdir = $(prefix)/xmfract
++libdir = $(prefix)/lib/X11/xmfract
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ CC = @CC@
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DXMFLACT_LIBDIR=\"$(libdir)\"
+ LIBS = @MALLOC_DEBUG_LIBS@ @X_LIBS@ @X_PRE_LIBS@ \
+-  @MOTIF_LIBS@ -lXm @MOTIF_POST_LIBS@ \
+-  @LIBXMU@ -lXt -lX11 @X_EXTRA_LIBS@ ../lib/libxmfra.a @LIBS@
++  @MOTIF_LIBS@ ${MOTIFLIB} @MOTIF_POST_LIBS@ \
++  @LIBXMU@ -lXext -lXt -lX11 @X_EXTRA_LIBS@ ../lib/libxmfra.a @LIBS@
+ CFLAGS = @MALLOC_DEBUG_INC@ @CFLAGS@ @MOTIF_CFLAGS@ @X_CFLAGS@
+ LDFLAGS = @LDFLAGS@
+ STRIP = strip
diff --git a/graphics/xmfract/files/patch-ae b/graphics/xmfract/files/patch-ae
new file mode 100644
index 000000000000..100b96e99fc0
--- /dev/null
+++ b/graphics/xmfract/files/patch-ae
@@ -0,0 +1,16 @@
+--- src/cmdfile.c.orig	Wed Jun 21 00:46:57 1995
++++ src/cmdfile.c	Thu Aug 10 22:13:02 2000
+@@ -382,9 +382,11 @@
+        */
+       tempstr = getenv("XMFRACTDIR");
+       if(tempstr == NULL) tempstr = getenv("FRACTDIR");
+-      if(tempstr != NULL)
++      if(tempstr != NULL) {
+         sprintf(fractdir, "%s", tempstr);
+-
++      } else {
++        sprintf(fractdir, XMFLACT_LIBDIR);
++      }
+       if(((ret = stat(fractdir, &st)) == -1) ||
+         ((st.st_mode & S_IFMT) != S_IFDIR))
+         {
diff --git a/graphics/xmfract/files/patch-af b/graphics/xmfract/files/patch-af
new file mode 100644
index 000000000000..1636d8c572c3
--- /dev/null
+++ b/graphics/xmfract/files/patch-af
@@ -0,0 +1,22 @@
+--- src/init_data.c.orig	Wed Jun 21 00:47:04 1995
++++ src/init_data.c	Thu Aug 10 22:13:02 2000
+@@ -332,7 +332,9 @@
+     {
+     char *tempstr = getenv("XMFRACTDIR");
+ 
+-    if (tempstr == NULL) tempstr = getenv("FRACTDIR");
++    if (tempstr == NULL) {
++      tempstr = getenv("FRACTDIR");
++    }
+ 
+     if(tempstr != NULL)
+       {
+@@ -346,7 +348,7 @@
+     }
+ 
+   if(fractdir == NULL)
+-    fractdir = getcwd(NULL, 64);
++    fractdir = XMFLACT_LIBDIR;
+ 
+   if(fractdir == NULL)
+     {
diff --git a/graphics/xmfract/files/patch-ag b/graphics/xmfract/files/patch-ag
new file mode 100644
index 000000000000..f20b24d92eb0
--- /dev/null
+++ b/graphics/xmfract/files/patch-ag
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.orig	Wed Jun 21 00:47:16 1995
++++ etc/Makefile.in	Thu Aug 10 22:13:01 2000
+@@ -28,7 +28,7 @@
+ VPATH = @srcdir@
+ 
+ prefix = @prefix@
+-libdir = $(prefix)/xmfract
++libdir = $(prefix)/lib/X11/xmfract
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ RM = rm
diff --git a/graphics/xmfract/files/patch-ah b/graphics/xmfract/files/patch-ah
new file mode 100644
index 000000000000..cbb23590c11f
--- /dev/null
+++ b/graphics/xmfract/files/patch-ah
@@ -0,0 +1,11 @@
+--- help/Makefile.in.orig	Wed Jun 21 00:47:32 1995
++++ help/Makefile.in	Thu Aug 10 22:13:01 2000
+@@ -28,7 +28,7 @@
+ VPATH = @srcdir@
+ 
+ prefix = @prefix@
+-libdir = $(prefix)/xmfract
++libdir = $(prefix)/lib/X11/xmfract
+ helpdir = $(libdir)/help
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@