diff options
Diffstat (limited to 'x11-toolkits/fltk/files')
-rw-r--r-- | x11-toolkits/fltk/files/patch-ab | 40 | ||||
-rw-r--r-- | x11-toolkits/fltk/files/patch-documentation-Makefile | 17 | ||||
-rw-r--r-- | x11-toolkits/fltk/files/patch-makeinclude.in | 13 | ||||
-rw-r--r-- | x11-toolkits/fltk/files/patch-src-Makefile | 122 |
4 files changed, 171 insertions, 21 deletions
diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab index 400c6d108c96..053b1619f870 100644 --- a/x11-toolkits/fltk/files/patch-ab +++ b/x11-toolkits/fltk/files/patch-ab @@ -1,45 +1,43 @@ ---- configure.orig Sat Dec 9 07:00:06 2000 -+++ configure Sat Feb 24 16:02:38 2001 -@@ -837,13 +837,13 @@ - CFLAGS="$ac_save_CFLAGS" +--- configure.orig Mon Nov 25 17:38:38 2002 ++++ configure Sun Jan 5 15:03:00 2003 +@@ -1212,7 +1212,7 @@ + FL_MINOR_VERSION=1 + FL_PATCH_VERSION=2 + FL_RELEASE_VERSION= +-FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} ++FL_API_VERSION=${FL_MAJOR_VERSION} + + + +@@ -2045,13 +2045,13 @@ + CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then - CFLAGS="-g -O2" -+ CFLAGS="-g" ++# CFLAGS="-g -O2" else CFLAGS="-g" fi else if test "$GCC" = yes; then - CFLAGS="-O2" -+ CFLAGS="" ++# CFLAGS="-O2" else CFLAGS= fi -@@ -980,13 +980,13 @@ - CXXFLAGS="$ac_save_CXXFLAGS" +@@ -2395,13 +2395,13 @@ + CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then - CXXFLAGS="-g -O2" -+ CXXFLAGS="-g" ++# CXXFLAGS="-g -O2" else CXXFLAGS="-g" fi else if test "$GXX" = yes; then - CXXFLAGS="-O2" -+ CXXFLAGS="" ++# CXXFLAGS="-O2" else CXXFLAGS= fi -@@ -2750,8 +2750,8 @@ - # WAS: I removed the -fforce-mem, -fforce-addr, -fcaller-saves - # They all seemed to make either no difference or enlarged - # the code by a few hundred bytes. -- CFLAGS="-O2 $CFLAGS" -- CXXFLAGS="-O2 $CXXFLAGS" -+# CFLAGS="-O2 $CFLAGS" -+# CXXFLAGS="-O2 $CXXFLAGS" - fi - if test $PICFLAG = 1; then - CFLAGS="-fPIC $CFLAGS" diff --git a/x11-toolkits/fltk/files/patch-documentation-Makefile b/x11-toolkits/fltk/files/patch-documentation-Makefile new file mode 100644 index 000000000000..a5f8a05176c1 --- /dev/null +++ b/x11-toolkits/fltk/files/patch-documentation-Makefile @@ -0,0 +1,17 @@ +--- documentation/Makefile.orig Sun Jan 5 15:43:13 2003 ++++ documentation/Makefile Sun Jan 5 15:43:32 2003 +@@ -230,14 +230,6 @@ + $(CP) $(HTMLFILES) *.gif *.jpg index.html $(docdir) + $(CHMOD) 644 $(docdir)/* + echo "Installing man pages in $(mandir)..." +- -$(MKDIR) $(mandir)/cat1 +- $(CP) fluid.$(CAT1EXT) $(mandir)/cat1 +- $(CHMOD) 644 $(mandir)/cat1/fluid.$(CAT1EXT) +- $(CP) fltk-config.$(CAT1EXT) $(mandir)/cat1 +- $(CHMOD) 644 $(mandir)/cat1/fltk-config.$(CAT1EXT) +- -$(MKDIR) $(mandir)/cat3 +- $(CP) fltk.$(CAT3EXT) $(mandir)/cat3 +- $(CHMOD) 644 $(mandir)/cat3/fltk.$(CAT3EXT) + -$(MKDIR) $(mandir)/man1 + $(CP) fluid.man $(mandir)/man1/fluid.1 + $(CHMOD) 644 $(mandir)/man1/fluid.1 diff --git a/x11-toolkits/fltk/files/patch-makeinclude.in b/x11-toolkits/fltk/files/patch-makeinclude.in new file mode 100644 index 000000000000..9f8a4f154a07 --- /dev/null +++ b/x11-toolkits/fltk/files/patch-makeinclude.in @@ -0,0 +1,13 @@ +--- makeinclude.in.orig Sun Jan 5 14:57:05 2003 ++++ makeinclude.in Sun Jan 5 14:57:31 2003 +@@ -53,8 +53,8 @@ + + # flags for C++ compiler: + OPTIM = @OPTIM@ +-CFLAGS = $(OPTIM) @CFLAGS@ +-CXXFLAGS = $(OPTIM) @CXXFLAGS@ ++CFLAGS = $(OPTIM) @CFLAGS@ @CPPFLAGS@ ++CXXFLAGS = $(OPTIM) @CXXFLAGS@ @CPPFLAGS@ + + # program to make the archive: + LIBNAME = @LIBNAME@ diff --git a/x11-toolkits/fltk/files/patch-src-Makefile b/x11-toolkits/fltk/files/patch-src-Makefile new file mode 100644 index 000000000000..cd71693cbf75 --- /dev/null +++ b/x11-toolkits/fltk/files/patch-src-Makefile @@ -0,0 +1,122 @@ +--- src/Makefile.orig Sun Jan 5 15:08:13 2003 ++++ src/Makefile Sun Jan 5 15:11:01 2003 +@@ -198,11 +198,11 @@ + $(LIBCOMMAND) $@ $(OBJECTS) + $(RANLIB) $@ + +-libfltk.so.1.1: $(OBJECTS) ++libfltk.so.1: $(OBJECTS) + echo $(DSOCOMMAND) $@ ... + $(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS) + -$(RM) libfltk.so +- $(LN) libfltk.so.1.1 libfltk.so ++ $(LN) libfltk.so.1 libfltk.so + + libfltk.sl.1.1: $(OBJECTS) + echo $(DSOCOMMAND) $@ ... +@@ -230,11 +230,11 @@ + $(LIBCOMMAND) $@ $(FLOBJECTS) + $(RANLIB) $@ + +-libfltk_forms.so.1.1: $(FLOBJECTS) ++libfltk_forms.so.1: $(FLOBJECTS) + echo $(DSOCOMMAND) $@ ... + $(DSOCOMMAND) $@ $(FLOBJECTS) + -$(RM) libfltk_forms.so +- $(LN) libfltk_forms.so.1.1 libfltk_forms.so ++ $(LN) libfltk_forms.so.1 libfltk_forms.so + + libfltk_forms.sl.1.1: $(FLOBJECTS) + echo $(DSOCOMMAND) $@ ... +@@ -262,11 +262,11 @@ + $(LIBCOMMAND) $@ $(GLOBJECTS) + $(RANLIB) $@ + +-libfltk_gl.so.1.1: $(GLOBJECTS) ++libfltk_gl.so.1: $(GLOBJECTS) + echo $(DSOCOMMAND) $@ ... + $(DSOCOMMAND) $@ $(GLOBJECTS) + -$(RM) libfltk_gl.so +- $(LN) libfltk_gl.so.1.1 libfltk_gl.so ++ $(LN) libfltk_gl.so.1 libfltk_gl.so + + libfltk_gl.sl.1.1: $(GLOBJECTS) + echo $(DSOCOMMAND) $@ ... +@@ -294,11 +294,11 @@ + $(LIBCOMMAND) $@ $(IMGOBJECTS) + $(RANLIB) $@ + +-libfltk_images.so.1.1: $(IMGOBJECTS) ++libfltk_images.so.1: $(IMGOBJECTS) + echo $(DSOCOMMAND) $@ ... + $(DSOCOMMAND) $@ $(IMGOBJECTS) + -$(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) + echo $(DSOCOMMAND) $@ ... +@@ -411,11 +411,11 @@ + $(RANLIB) $(libdir)/$(GLLIBNAME); \ + fi + $(RANLIB) $(libdir)/$(IMGLIBNAME) +- if test x$(DSONAME) = xlibfltk.so.1.1; then\ ++ if test x$(DSONAME) = xlibfltk.so.1; then\ + $(RM) $(libdir)/libfltk.so*;\ +- $(CP) libfltk.so.1.1 $(libdir); \ +- $(CHMOD) 755 $(libdir)/libfltk.so.1.1; \ +- $(LN) libfltk.so.1.1 $(libdir)/libfltk.so;\ ++ $(CP) libfltk.so.1 $(libdir); \ ++ $(CHMOD) 755 $(libdir)/libfltk.so.1; \ ++ $(LN) libfltk.so.1 $(libdir)/libfltk.so;\ + fi + if test x$(DSONAME) = xlibfltk.sl.1.1; then\ + $(RM) $(libdir)/libfltk.sl*;\ +@@ -434,11 +434,11 @@ + $(CP) libfltk_s.a $(libdir); \ + $(CHMOD) 755 $(libdir)/libfltk_s.a; \ + fi +- if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\ ++ if test x$(FLDSONAME) = xlibfltk_forms.so.1; then\ + $(RM) $(libdir)/libfltk_forms.so*;\ +- $(CP) libfltk_forms.so.1.1 $(libdir); \ +- $(CHMOD) 755 $(libdir)/libfltk_forms.so.1.1; \ +- $(LN) libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\ ++ $(CP) libfltk_forms.so.1 $(libdir); \ ++ $(CHMOD) 755 $(libdir)/libfltk_forms.so.1; \ ++ $(LN) libfltk_forms.so.1 $(libdir)/libfltk_forms.so;\ + fi + if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\ + $(RM) $(libdir)/libfltk_forms.sl*;\ +@@ -457,11 +457,11 @@ + $(CP) libfltk_forms_s.a $(libdir); \ + $(CHMOD) 755 $(libdir)/libfltk_forms.a; \ + fi +- if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\ ++ if test x$(GLDSONAME) = xlibfltk_gl.so.1; then\ + $(RM) $(libdir)/libfltk_gl.so*;\ +- $(CP) libfltk_gl.so.1.1 $(libdir); \ +- $(CHMOD) 755 $(libdir)/libfltk_gl.so.1.1; \ +- $(LN) libfltk_gl.so.1.1 $(libdir)/libfltk_gl.so;\ ++ $(CP) libfltk_gl.so.1 $(libdir); \ ++ $(CHMOD) 755 $(libdir)/libfltk_gl.so.1; \ ++ $(LN) libfltk_gl.so.1 $(libdir)/libfltk_gl.so;\ + fi + if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\ + $(RM) $(libdir)/libfltk_gl.sl*;\ +@@ -480,11 +480,11 @@ + $(CP) libfltk_gl_s.a $(libdir); \ + $(CHMOD) 755 $(libdir)/libfltk_gl.a; \ + fi +- if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\ ++ if test x$(IMGDSONAME) = xlibfltk_images.so.1; then\ + $(RM) $(libdir)/libfltk_images.so*;\ +- $(CP) libfltk_images.so.1.1 $(libdir); \ +- $(CHMOD) 755 $(libdir)/libfltk_images.so.1.1; \ +- $(LN) libfltk_images.so.1.1 $(libdir)/libfltk_images.so;\ ++ $(CP) libfltk_images.so.1 $(libdir); \ ++ $(CHMOD) 755 $(libdir)/libfltk_images.so.1; \ ++ $(LN) libfltk_images.so.1 $(libdir)/libfltk_images.so;\ + fi + if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\ + $(RM) $(libdir)/libfltk_images.sl*;\ |