diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2005-01-31 21:09:48 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-01-31 21:09:48 +0000 |
commit | 2002ed9e65a6854fc0e1057e453829bca684320d (patch) | |
tree | 1f75ad25abcfa39ae1bacdf17436688c97faba41 /x11-toolkits/fltk/files | |
parent | cf47d4363a232adad6717505f5e81ae6c70c2c2b (diff) | |
download | ports-2002ed9e65a6854fc0e1057e453829bca684320d.tar.gz ports-2002ed9e65a6854fc0e1057e453829bca684320d.zip |
Notes
Diffstat (limited to 'x11-toolkits/fltk/files')
-rw-r--r-- | x11-toolkits/fltk/files/patch-documentation-Makefile | 43 | ||||
-rw-r--r-- | x11-toolkits/fltk/files/patch-makeinclude.in | 13 | ||||
-rw-r--r-- | x11-toolkits/fltk/files/patch-src-Makefile | 113 |
3 files changed, 84 insertions, 85 deletions
diff --git a/x11-toolkits/fltk/files/patch-documentation-Makefile b/x11-toolkits/fltk/files/patch-documentation-Makefile index a5f8a05176c1..2578751d167f 100644 --- a/x11-toolkits/fltk/files/patch-documentation-Makefile +++ b/x11-toolkits/fltk/files/patch-documentation-Makefile @@ -1,17 +1,26 @@ ---- 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 +--- 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 + + install: $(MANPAGES) +- echo "Installing documentation files in $(DESTDIR)$(docdir)..." +- -$(MKDIR) $(DESTDIR)$(docdir) +- $(CP) $(HTMLFILES) *.gif *.jpg 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)/* + echo "Installing man pages in $(DESTDIR)$(mandir)..." +- -$(MKDIR) $(DESTDIR)$(mandir)/cat1 +- $(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 +- $(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) +- $(CP) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 +- $(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) +- -$(MKDIR) $(DESTDIR)$(mandir)/cat3 +- $(CP) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 +- $(CHMOD) 644 $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) + -$(MKDIR) $(DESTDIR)$(mandir)/man1 + $(CP) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 + $(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fluid.1 diff --git a/x11-toolkits/fltk/files/patch-makeinclude.in b/x11-toolkits/fltk/files/patch-makeinclude.in deleted file mode 100644 index 9f8a4f154a07..000000000000 --- a/x11-toolkits/fltk/files/patch-makeinclude.in +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 index 4ebcf5e60aa9..7780b1d005ec 100644 --- a/x11-toolkits/fltk/files/patch-src-Makefile +++ b/x11-toolkits/fltk/files/patch-src-Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig Tue Sep 9 11:31:56 2003 -+++ src/Makefile Tue Sep 9 11:34:37 2003 -@@ -198,11 +198,11 @@ +--- src/Makefile.orig Sat Nov 20 04:19:58 2004 ++++ src/Makefile Fri Jan 28 22:57:03 2005 +@@ -199,11 +199,11 @@ $(LIBCOMMAND) $@ $(OBJECTS) $(RANLIB) $@ @@ -8,13 +8,13 @@ +libfltk.so.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(OBJECTS) - -$(RM) libfltk.so + $(RM) libfltk.so - $(LN) libfltk.so.1.1 libfltk.so + $(LN) libfltk.so.1 libfltk.so libfltk.sl.1.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... -@@ -234,11 +234,11 @@ +@@ -235,11 +235,11 @@ $(LIBCOMMAND) $@ $(FLOBJECTS) $(RANLIB) $@ @@ -22,13 +22,13 @@ +libfltk_forms.so.1: $(FLOBJECTS) libfltk.so.1 echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk - -$(RM) libfltk_forms.so + $(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) libfltk.sl.1.1 echo $(DSOCOMMAND) $@ ... -@@ -270,11 +270,11 @@ +@@ -271,11 +271,11 @@ $(LIBCOMMAND) $@ $(GLOBJECTS) $(RANLIB) $@ @@ -36,13 +36,13 @@ +libfltk_gl.so.1: $(GLOBJECTS) libfltk.so.1 echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk - -$(RM) libfltk_gl.so + $(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) libfltk.sl.1.1 echo $(DSOCOMMAND) $@ ... -@@ -306,11 +306,11 @@ +@@ -307,13 +307,13 @@ $(LIBCOMMAND) $@ $(IMGOBJECTS) $(RANLIB) $@ @@ -50,73 +50,76 @@ +libfltk_images.so.1: $(IMGOBJECTS) libfltk.so.1 echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk - -$(RM) libfltk_images.so + $(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.1: $(IMGOBJECTS) libfltk.sl.1.1 ++libfltk_images.sl.1: $(IMGOBJECTS) libfltk.sl.1 echo $(DSOCOMMAND) $@ ... -@@ -428,11 +428,11 @@ - $(RANLIB) $(libdir)/$(GLLIBNAME); \ + $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk + $(RM) libfltk_images.sl +@@ -429,11 +429,11 @@ + $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \ fi - $(RANLIB) $(libdir)/$(IMGLIBNAME) + $(RANLIB) $(DESTDIR)$(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;\ + $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ +- $(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \ +- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1.1; \ +- $(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so;\ ++ $(CP) libfltk.so.1 $(DESTDIR)$(libdir); \ ++ $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1; \ ++ $(LN) libfltk.so.1 $(DESTDIR)$(libdir)/libfltk.so;\ fi if test x$(DSONAME) = xlibfltk.sl.1.1; then\ - $(RM) $(libdir)/libfltk.sl*;\ -@@ -451,11 +451,11 @@ - $(CP) libfltk_s.a $(libdir); \ - $(CHMOD) 755 $(libdir)/libfltk_s.a; \ + $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ +@@ -452,11 +452,11 @@ + $(CP) libfltk_s.a $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(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;\ + $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ +- $(CP) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \ +- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \ +- $(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\ ++ $(CP) libfltk_forms.so.1 $(DESTDIR)$(libdir); \ ++ $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1; \ ++ $(LN) libfltk_forms.so.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\ fi if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\ - $(RM) $(libdir)/libfltk_forms.sl*;\ -@@ -474,11 +474,11 @@ - $(CP) libfltk_forms_s.a $(libdir); \ - $(CHMOD) 755 $(libdir)/libfltk_forms.a; \ + $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ +@@ -475,11 +475,11 @@ + $(CP) libfltk_forms_s.a $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(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;\ + $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ +- $(CP) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \ +- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1.1; \ +- $(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\ ++ $(CP) libfltk_gl.so.1 $(DESTDIR)$(libdir); \ ++ $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1; \ ++ $(LN) libfltk_gl.so.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\ fi if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\ - $(RM) $(libdir)/libfltk_gl.sl*;\ -@@ -497,11 +497,11 @@ - $(CP) libfltk_gl_s.a $(libdir); \ - $(CHMOD) 755 $(libdir)/libfltk_gl.a; \ + $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ +@@ -498,11 +498,11 @@ + $(CP) libfltk_gl_s.a $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(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;\ + $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ +- $(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \ +- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1.1; \ +- $(LN) libfltk_images.so.1.1 $(DESTDIR)$(libdir)/libfltk_images.so;\ ++ $(CP) libfltk_images.so.1 $(DESTDIR)$(libdir); \ ++ $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1; \ ++ $(LN) libfltk_images.so.1 $(DESTDIR)$(libdir)/libfltk_images.so;\ fi if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\ - $(RM) $(libdir)/libfltk_images.sl*;\ + $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ |