Update to 1.1.7

PR:		106146
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 42 insertions, 37 deletions

diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab
index 053b1619f870..56bf3ab9692d 100644
--- a/x11-toolkits/fltk/files/patch-ab
+++ b/x11-toolkits/fltk/files/patch-ab
@@ -1,15 +1,15 @@
---- configure.orig	Mon Nov 25 17:38:38 2002
-+++ configure	Sun Jan  5 15:03:00 2003
-@@ -1212,7 +1212,7 @@
+--- configure.orig	Wed Jan 18 11:30:52 2006
++++ configure	Mon Nov 20 23:18:10 2006
+@@ -1326,7 +1326,7 @@
+ FL_MAJOR_VERSION=1
  FL_MINOR_VERSION=1
- FL_PATCH_VERSION=2
- FL_RELEASE_VERSION=
+ FL_PATCH_VERSION=7
 -FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
 +FL_API_VERSION=${FL_MAJOR_VERSION}
  
  
  
-@@ -2045,13 +2045,13 @@
+@@ -2227,13 +2227,13 @@
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -25,7 +25,7 @@
    else
      CFLAGS=
    fi
-@@ -2395,13 +2395,13 @@
+@@ -2734,13 +2734,13 @@
    CXXFLAGS=$ac_save_CXXFLAGS
  elif test $ac_cv_prog_cxx_g = yes; then
    if test "$GXX" = yes; then
diff --git a/x11-toolkits/fltk/files/patch-documentation-Makefile b/x11-toolkits/fltk/files/patch-documentation-Makefile
index 2578751d167f..6fb2ad92a129 100644
--- a/x11-toolkits/fltk/files/patch-documentation-Makefile
+++ b/x11-toolkits/fltk/files/patch-documentation-Makefile
@@ -1,17 +1,17 @@
---- documentation/Makefile.orig	Mon Oct 18 22:22:22 2004
-+++ documentation/Makefile	Fri Jan 28 23:16:46 2005
-@@ -225,19 +225,11 @@
- docdir = $(datadir)/doc/fltk
+--- documentation/Makefile.orig	Mon Jan 16 03:36:16 2006
++++ documentation/Makefile	Mon Nov 20 23:20:57 2006
+@@ -227,19 +227,11 @@
+ depend:
  
  install: $(MANPAGES)
 -	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
 -	-$(MKDIR) $(DESTDIR)$(docdir)
--	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
--	$(CHMOD) 644 $(DESTDIR)$(docdir)/*
+-	$(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir)
+-	$(CHMOD) 644 $(DESTDIR)$(docdir)/*.*
 +%%DOCS%%	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
 +%%DOCS%%	-$(MKDIR) $(DESTDIR)$(docdir)
-+%%DOCS%%	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
-+%%DOCS%%	$(CHMOD) 644 $(DESTDIR)$(docdir)/*
++%%DOCS%%	$(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir)
++%%DOCS%%	$(CHMOD) 644 $(DESTDIR)$(docdir)/*.*
  	echo "Installing man pages in $(DESTDIR)$(mandir)..."
 -	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
 -	$(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
diff --git a/x11-toolkits/fltk/files/patch-src-Makefile b/x11-toolkits/fltk/files/patch-src-Makefile
index 7780b1d005ec..6bc178e804de 100644
--- a/x11-toolkits/fltk/files/patch-src-Makefile
+++ b/x11-toolkits/fltk/files/patch-src-Makefile
@@ -1,6 +1,6 @@
---- src/Makefile.orig	Sat Nov 20 04:19:58 2004
-+++ src/Makefile	Fri Jan 28 22:57:03 2005
-@@ -199,11 +199,11 @@
+--- src/Makefile.orig	Mon Aug  8 09:54:30 2005
++++ src/Makefile	Mon Nov 20 23:26:04 2006
+@@ -200,17 +200,17 @@
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
  
@@ -12,9 +12,17 @@
 -	$(LN) libfltk.so.1.1 libfltk.so
 +	$(LN) libfltk.so.1 libfltk.so
  
- libfltk.sl.1.1: $(OBJECTS)
+-libfltk.sl.1.1: $(OBJECTS)
++libfltk.sl.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
-@@ -235,11 +235,11 @@
+ 	$(DSOCOMMAND) $@ $(OBJECTS)
+ 	$(RM) libfltk.sl
+-	$(LN) libfltk.sl.1.1 libfltk.sl
++	$(LN) libfltk.sl.1 libfltk.sl
+ 
+ libfltk.1.1.dylib: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+@@ -236,11 +236,11 @@
  	$(LIBCOMMAND) $@ $(FLOBJECTS)
  	$(RANLIB) $@
  
@@ -28,7 +36,7 @@
  
  libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -271,11 +271,11 @@
+@@ -272,11 +272,11 @@
  	$(LIBCOMMAND) $@ $(GLOBJECTS)
  	$(RANLIB) $@
  
@@ -42,24 +50,21 @@
  
  libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -307,13 +307,13 @@
+@@ -308,11 +308,11 @@
  	$(LIBCOMMAND) $@ $(IMGOBJECTS)
  	$(RANLIB) $@
  
 -libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
 +libfltk_images.so.1: $(IMGOBJECTS) libfltk.so.1
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
  	$(RM) libfltk_images.so
 -	$(LN) libfltk_images.so.1.1 libfltk_images.so
 +	$(LN) libfltk_images.so.1 libfltk_images.so
  
--libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
-+libfltk_images.sl.1: $(IMGOBJECTS) libfltk.sl.1
+ libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
- 	$(RM) libfltk_images.sl
-@@ -429,11 +429,11 @@
+@@ -477,11 +477,11 @@
  		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
  	fi
  	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
@@ -75,9 +80,9 @@
  	fi
  	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
-@@ -452,11 +452,11 @@
- 		$(CP) libfltk_s.a $(DESTDIR)$(libdir); \
- 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_s.a; \
+@@ -516,11 +516,11 @@
+ 		$(CP) libfltk.dll.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.dll.a; \
  	fi
 -	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
 +	if test x$(FLDSONAME) = xlibfltk_forms.so.1; then\
@@ -91,9 +96,9 @@
  	fi
  	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
-@@ -475,11 +475,11 @@
- 		$(CP) libfltk_forms_s.a $(DESTDIR)$(libdir); \
- 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.a; \
+@@ -555,11 +555,11 @@
+ 		$(CP) libfltk_forms.dll.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.dll.a; \
  	fi
 -	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
 +	if test x$(GLDSONAME) = xlibfltk_gl.so.1; then\
@@ -107,9 +112,9 @@
  	fi
  	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
-@@ -498,11 +498,11 @@
- 		$(CP) libfltk_gl_s.a $(DESTDIR)$(libdir); \
- 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.a; \
+@@ -594,11 +594,11 @@
+ 		$(CP) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \
  	fi
 -	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
 +	if test x$(IMGDSONAME) = xlibfltk_images.so.1; then\