the Fink project is an effort to port
popular Unix programs to Mac OS X
Package: fltk-x11
Version: 1.1.7
Revision: 1002
Description: GUI toolkit
DescDetail: <<
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern
GUI functionality without the bloat and supports 3D graphics via
OpenGL and its built-in GLUT emulation.
FLTK also includes an excellent UI builder called FLUID that can be
used to create applications in minutes.
<<
DescUsage: <<
Documentation is available on the website, or in the installed
manpages and HTML.
<<
DescPort: <<
When `uname` is Darwin will try to link against Carbon, and use Quartz
or QuickDraw graphics. To force x11, remove case that sets Darwin
Carbon compiler flags (so fall through to unix/xll) and that sets
config.h flags to use Apple-specific graphics. HFS+ is not case
sensitive, but there is an important variable (HLINKS) involving this
that is set in the same case blocks, so factor out the setting of that
variable.
Sylvain says to undefine __APPLE__, a practice which I reluctantly
continue for now. This flag affects many features, some of which are
FS-dependent (similar to HLINKS) and others are Carbon-vs-x11 issues.
The use of -U is especially bad since this setting may propagate (via
bin/fltk-config) to programs compiled against fltk which may use that
token for other platform issues but if it doesn't then fltk headers
may give incorrect behavior (it is -D but library was built with it
-U). Actions should be made based on (tokens resulting from) specific
feature-related checks. I haven't had a chance to go through every
occurance to see what the desired behavior is in each case.
Patch Makefile to not build test programs.
Patch test/colbrowser for OS X location of rgb.txt.
Patch to show actual compiling commands, not synopses of them.
Don't continue if any make target fails.
Patch to avoid chmod +x on libraries.
<<
DescPackaging: <<
We need different packages for different XFree86 versions. If >=4.3 then
libfltk must link against libfontconfig (thanks Jerry Talkington), but
if 4.2 then there is no libfontconfig. By 10.3, we're all up to 4.3;
drop the special handling and Provides mess, just have real fltk-x11.
Installing preformatted manpages makes the package difficult to remove
cleanly (presence of man/cat? causes `man` to populate it). No need to
install them since we also install the sources.
Previously maintained by Sylvain Cuaz
<<
Homepage: http://www.fltk.org/
License: LGPL
Maintainer: Daniel Macks
Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs, %n-shlibs (= %v-%r)
BuildDepends: fink (>= 0.24.12-1), libjpeg, libpng3, x11, xft2, x11-dev
Conflicts: fltk,fltk-aqua
Replaces: fltk,fltk-aqua
BuildDependsOnly: True
#Source: mirror:sourceforge:fltk/fltk-%v-source.tar.bz2
Source: mirror:custom:fltk/%v/fltk-%v-source.tar.bz2
CustomMirror: <<
nam-US: http://ftp.easysw.com/pub
nam-US: ftp://ftp.easysw.com/pub
eur-SE: http://mirror.nu6.org//ftp.easysw.com/pub
eur-FI: http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
eur-FI: ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
eur-DE: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub
eur-DE: http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub
<<
SourceDirectory: fltk-%v
Source-MD5: 2e29319119adc9d63b2f26b72cae0a88
PatchFile: %n.patch
PatchFile-MD5: 86177a2eb593652ecabf4fd7e746b9f6
PatchScript: <<
%{default_script}
perl -ni -e 'print unless /echo.*COMMAND/' src/Makefile
perl -pi -e 's/\|\| break//' Makefile
perl -pi -e 's|rgb.txt|/usr/X11R6/lib/X11/rgb.txt|' test/colbrowser.cxx
perl -pi -e 's/ 755 / 644 / if /\/lib.*\.{a,dylib}/' src/Makefile
perl -ni -e 'print unless /mandir\)\/cat/' documentation/Makefile
perl -pi -e 's|share/doc/fltk|share/doc/%n/html|' configure
<<
SetCPPFLAGS: -U__APPLE__ -I/usr/X11R6/include
SetCXXFLAGS: -U__APPLE__ -I/usr/X11R6/include -I%p/include
SetLDFLAGS: -framework OpenGL -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
GCC: 4.0
ConfigureParams: --enable-shared --with-x --enable-xft --mandir=%p/share/man --without-links --enable-threads --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
CompileScript: <<
./configure %c
make FONTCONFIGLIB=-lfontconfig
<<
InstallScript: <<
make install DESTDIR=%d docdir=%p/share/doc/%n/html
ln -s html/index.html %i/share/doc/%n
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
SplitOff: <<
Package: %N-shlibs
Description: Runtime code for fltk-x11
Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs
Conflicts: fltk
Replaces: fltk
Files: <<
lib/libfltk.*.dylib
lib/libfltk_forms.*.dylib
lib/libfltk_gl.*.dylib
lib/libfltk_images.*.dylib
<<
Shlibs: <<
%p/lib/libfltk.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_forms.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_gl.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_images.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
<<
diff -Nurd -x'*~' fltk-1.1.7.orig/Makefile fltk-1.1.7/Makefile
--- fltk-1.1.7.orig/Makefile 2006-01-15 13:36:16.000000000 -0500
+++ fltk-1.1.7/Makefile 2007-08-03 15:40:33.000000000 -0400
@@ -27,7 +27,7 @@
include makeinclude
-DIRS = $(IMAGEDIRS) src fluid test documentation
+DIRS = $(IMAGEDIRS) src fluid documentation
all: makeinclude
for dir in $(DIRS); do\
diff -Nurd -x'*~' fltk-1.1.7.orig/configure fltk-1.1.7/configure
--- fltk-1.1.7.orig/configure 2006-01-17 21:30:52.000000000 -0500
+++ fltk-1.1.7/configure 2007-08-03 16:46:35.000000000 -0400
@@ -857,7 +857,6 @@
--enable-gl turn on OpenGL support default=yes
--enable-shared turn on shared libraries default=no
--enable-threads enable multi-threading support
- --enable-quartz use Quartz instead of Quickdraw (default=no)
--disable-largefile omit support for large files
--enable-localjpeg use local JPEG library, default=auto
--enable-localzlib use local ZLIB library, default=auto
@@ -1423,7 +1422,7 @@
FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib"
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib"
- DSOCOMMAND="\$(CC) $DSOFLAGS -dynamiclib -lc -o"
+ DSOCOMMAND="\$(CXX) $DSOFLAGS -single_module -dynamiclib -lc -o"
;;
SunOS* | UNIX_S*)
@@ -1510,7 +1509,7 @@
;;
esac
- LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
+ LINKSHARED="../src/$IMGDSONAME ../src/$FLDSONAME ../src/$DSONAME"
else
DSOCOMMAND="echo"
DSOLINK=""
@@ -1548,7 +1547,7 @@
fi;
case $uname in
- Darwin*)
+ Darwin_DO_NOT_GO_HERE)
# Check whether --enable-quartz or --disable-quartz was given.
if test "${enable_quartz+set}" = set; then
enableval="$enable_quartz"
@@ -8575,7 +8574,7 @@
fi
;;
- Darwin*)
+ Darwin_DO_NOT_GO_HERE)
# MacOS X uses Carbon for graphics...
LIBS="$LIBS -framework Carbon -framework ApplicationServices"
diff -Nurd -x'*~' fltk-1.1.7.orig/fluid/fluid.cxx fltk-1.1.7/fluid/fluid.cxx
--- fltk-1.1.7.orig/fluid/fluid.cxx 2005-11-27 09:45:48.000000000 -0500
+++ fltk-1.1.7/fluid/fluid.cxx 2007-08-03 15:39:00.000000000 -0400
@@ -1804,11 +1804,7 @@
fl_filename_absolute(absolute, sizeof(absolute), flname);
for (i = 0; i < max_files; i ++)
-#if defined(WIN32) || defined(__APPLE__)
if (!strcasecmp(absolute, absolute_history[i])) break;
-#else
- if (!strcmp(absolute, absolute_history[i])) break;
-#endif // WIN32 || __APPLE__
if (i == 0) return;
diff -Nurd -x'*~' fltk-1.1.7.orig/makeinclude.in fltk-1.1.7/makeinclude.in
--- fltk-1.1.7.orig/makeinclude.in 2006-01-15 13:36:16.000000000 -0500
+++ fltk-1.1.7/makeinclude.in 2007-08-03 16:56:49.000000000 -0400
@@ -81,7 +81,7 @@
LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@
LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS)
LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS)
-IMAGELIBS = -L../lib @IMAGELIBS@
+IMAGELIBS = @IMAGELIBS@
# image libraries to build...
IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@
@@ -111,7 +111,7 @@
UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
# Be quiet when building...
-.SILENT:
+#.SILENT:
# Build commands and filename extensions...
.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
diff -Nurd -x'*~' fltk-1.1.7.orig/src/Makefile fltk-1.1.7/src/Makefile
--- fltk-1.1.7.orig/src/Makefile 2005-08-07 20:54:30.000000000 -0400
+++ fltk-1.1.7/src/Makefile 2007-08-03 17:02:23.000000000 -0400
@@ -218,7 +218,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(OBJECTS) $(LDLIBS)
+ $(OBJECTS) $(LDLIBS) $(FONTCONFIGLIB)
$(RM) libfltk.dylib
$(LN) libfltk.1.1.dylib libfltk.dylib
@@ -254,7 +254,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(FLOBJECTS) -L. $(LDLIBS) -lfltk
+ $(FLOBJECTS) $(LDLIBS) libfltk.1.1.dylib
$(RM) libfltk_forms.dylib
$(LN) libfltk_forms.1.1.dylib libfltk_forms.dylib
@@ -290,7 +290,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(GLOBJECTS) -L. $(GLDLIBS) -lfltk
+ $(GLOBJECTS) $(GLDLIBS) libfltk.1.1.dylib
$(RM) libfltk_gl.dylib
$(LN) libfltk_gl.1.1.dylib libfltk_gl.dylib
@@ -326,7 +326,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(IMGOBJECTS) -L.$(LDLIBS) $(IMAGELIBS) -lfltk
+ $(IMGOBJECTS) $(LDLIBS) $(IMAGELIBS) libfltk.1.1.dylib
$(RM) libfltk_images.dylib
$(LN) libfltk_images.1.1.dylib libfltk_images.dylib
diff -Nurd -x'*~' fltk-1.1.7.orig/src/filename_absolute.cxx fltk-1.1.7/src/filename_absolute.cxx
--- fltk-1.1.7.orig/src/filename_absolute.cxx 2005-11-27 09:45:48.000000000 -0500
+++ fltk-1.1.7/src/filename_absolute.cxx 2007-08-03 15:40:05.000000000 -0400
@@ -161,11 +161,7 @@
*slash != '\0' && *newslash != '\0';
slash ++, newslash ++)
if (isdirsep(*slash) && isdirsep(*newslash)) continue;
-#if defined(WIN32) || defined(__EMX__) || defined(__APPLE__)
else if (tolower(*slash & 255) != tolower(*newslash & 255)) break;
-#else
- else if (*slash != *newslash) break;
-#endif // WIN32 || __EMX__ || __APPLE__
if (*newslash == '\0' && *slash != '\0' && !isdirsep(*slash))
newslash--;
Package: fltk-x11
Version: 1.1.7
Revision: 1002
Description: GUI toolkit
DescDetail: <<
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern
GUI functionality without the bloat and supports 3D graphics via
OpenGL and its built-in GLUT emulation.
FLTK also includes an excellent UI builder called FLUID that can be
used to create applications in minutes.
<<
DescUsage: <<
Documentation is available on the website, or in the installed
manpages and HTML.
<<
DescPort: <<
When `uname` is Darwin will try to link against Carbon, and use Quartz
or QuickDraw graphics. To force x11, remove case that sets Darwin
Carbon compiler flags (so fall through to unix/xll) and that sets
config.h flags to use Apple-specific graphics. HFS+ is not case
sensitive, but there is an important variable (HLINKS) involving this
that is set in the same case blocks, so factor out the setting of that
variable.
Sylvain says to undefine __APPLE__, a practice which I reluctantly
continue for now. This flag affects many features, some of which are
FS-dependent (similar to HLINKS) and others are Carbon-vs-x11 issues.
The use of -U is especially bad since this setting may propagate (via
bin/fltk-config) to programs compiled against fltk which may use that
token for other platform issues but if it doesn't then fltk headers
may give incorrect behavior (it is -D but library was built with it
-U). Actions should be made based on (tokens resulting from) specific
feature-related checks. I haven't had a chance to go through every
occurance to see what the desired behavior is in each case.
Patch Makefile to not build test programs.
Patch test/colbrowser for OS X location of rgb.txt.
Patch to show actual compiling commands, not synopses of them.
Don't continue if any make target fails.
Patch to avoid chmod +x on libraries.
<<
DescPackaging: <<
We need different packages for different XFree86 versions. If >=4.3 then
libfltk must link against libfontconfig (thanks Jerry Talkington), but
if 4.2 then there is no libfontconfig. By 10.3, we're all up to 4.3;
drop the special handling and Provides mess, just have real fltk-x11.
Installing preformatted manpages makes the package difficult to remove
cleanly (presence of man/cat? causes `man` to populate it). No need to
install them since we also install the sources.
Previously maintained by Sylvain Cuaz
<<
Homepage: http://www.fltk.org/
License: LGPL
Maintainer: Daniel Macks
Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs, %n-shlibs (= %v-%r)
BuildDepends: fink (>= 0.24.12-1), libjpeg, libpng3, x11, xft2, x11-dev
Conflicts: fltk,fltk-aqua
Replaces: fltk,fltk-aqua
BuildDependsOnly: True
#Source: mirror:sourceforge:fltk/fltk-%v-source.tar.bz2
Source: mirror:custom:fltk/%v/fltk-%v-source.tar.bz2
CustomMirror: <<
nam-US: http://ftp.easysw.com/pub
nam-US: ftp://ftp.easysw.com/pub
eur-SE: http://mirror.nu6.org//ftp.easysw.com/pub
eur-FI: http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
eur-FI: ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
eur-DE: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub
eur-DE: http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub
<<
SourceDirectory: fltk-%v
Source-MD5: 2e29319119adc9d63b2f26b72cae0a88
PatchFile: %n.patch
PatchFile-MD5: 86177a2eb593652ecabf4fd7e746b9f6
PatchScript: <<
%{default_script}
perl -ni -e 'print unless /echo.*COMMAND/' src/Makefile
perl -pi -e 's/\|\| break//' Makefile
perl -pi -e 's|rgb.txt|/usr/X11R6/lib/X11/rgb.txt|' test/colbrowser.cxx
perl -pi -e 's/ 755 / 644 / if /\/lib.*\.{a,dylib}/' src/Makefile
perl -ni -e 'print unless /mandir\)\/cat/' documentation/Makefile
perl -pi -e 's|share/doc/fltk|share/doc/%n/html|' configure
<<
SetCPPFLAGS: -U__APPLE__ -I/usr/X11R6/include
SetCXXFLAGS: -U__APPLE__ -I/usr/X11R6/include -I%p/include
SetLDFLAGS: -framework OpenGL -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
GCC: 4.0
ConfigureParams: --enable-shared --with-x --enable-xft --mandir=%p/share/man --without-links --enable-threads --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
CompileScript: <<
./configure %c
make FONTCONFIGLIB=-lfontconfig
<<
InstallScript: <<
make install DESTDIR=%d docdir=%p/share/doc/%n/html
ln -s html/index.html %i/share/doc/%n
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
SplitOff: <<
Package: %N-shlibs
Description: Runtime code for fltk-x11
Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs
Conflicts: fltk
Replaces: fltk
Files: <<
lib/libfltk.*.dylib
lib/libfltk_forms.*.dylib
lib/libfltk_gl.*.dylib
lib/libfltk_images.*.dylib
<<
Shlibs: <<
%p/lib/libfltk.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_forms.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_gl.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
%p/lib/libfltk_images.1.1.dylib 1.1.0 %n (>= 1.1.4-23)
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
<<
diff -Nurd -x'*~' fltk-1.1.7.orig/Makefile fltk-1.1.7/Makefile
--- fltk-1.1.7.orig/Makefile 2006-01-15 13:36:16.000000000 -0500
+++ fltk-1.1.7/Makefile 2007-08-03 15:40:33.000000000 -0400
@@ -27,7 +27,7 @@
include makeinclude
-DIRS = $(IMAGEDIRS) src fluid test documentation
+DIRS = $(IMAGEDIRS) src fluid documentation
all: makeinclude
for dir in $(DIRS); do\
diff -Nurd -x'*~' fltk-1.1.7.orig/configure fltk-1.1.7/configure
--- fltk-1.1.7.orig/configure 2006-01-17 21:30:52.000000000 -0500
+++ fltk-1.1.7/configure 2007-08-03 16:46:35.000000000 -0400
@@ -857,7 +857,6 @@
--enable-gl turn on OpenGL support default=yes
--enable-shared turn on shared libraries default=no
--enable-threads enable multi-threading support
- --enable-quartz use Quartz instead of Quickdraw (default=no)
--disable-largefile omit support for large files
--enable-localjpeg use local JPEG library, default=auto
--enable-localzlib use local ZLIB library, default=auto
@@ -1423,7 +1422,7 @@
FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib"
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib"
- DSOCOMMAND="\$(CC) $DSOFLAGS -dynamiclib -lc -o"
+ DSOCOMMAND="\$(CXX) $DSOFLAGS -single_module -dynamiclib -lc -o"
;;
SunOS* | UNIX_S*)
@@ -1510,7 +1509,7 @@
;;
esac
- LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
+ LINKSHARED="../src/$IMGDSONAME ../src/$FLDSONAME ../src/$DSONAME"
else
DSOCOMMAND="echo"
DSOLINK=""
@@ -1548,7 +1547,7 @@
fi;
case $uname in
- Darwin*)
+ Darwin_DO_NOT_GO_HERE)
# Check whether --enable-quartz or --disable-quartz was given.
if test "${enable_quartz+set}" = set; then
enableval="$enable_quartz"
@@ -8575,7 +8574,7 @@
fi
;;
- Darwin*)
+ Darwin_DO_NOT_GO_HERE)
# MacOS X uses Carbon for graphics...
LIBS="$LIBS -framework Carbon -framework ApplicationServices"
diff -Nurd -x'*~' fltk-1.1.7.orig/fluid/fluid.cxx fltk-1.1.7/fluid/fluid.cxx
--- fltk-1.1.7.orig/fluid/fluid.cxx 2005-11-27 09:45:48.000000000 -0500
+++ fltk-1.1.7/fluid/fluid.cxx 2007-08-03 15:39:00.000000000 -0400
@@ -1804,11 +1804,7 @@
fl_filename_absolute(absolute, sizeof(absolute), flname);
for (i = 0; i < max_files; i ++)
-#if defined(WIN32) || defined(__APPLE__)
if (!strcasecmp(absolute, absolute_history[i])) break;
-#else
- if (!strcmp(absolute, absolute_history[i])) break;
-#endif // WIN32 || __APPLE__
if (i == 0) return;
diff -Nurd -x'*~' fltk-1.1.7.orig/makeinclude.in fltk-1.1.7/makeinclude.in
--- fltk-1.1.7.orig/makeinclude.in 2006-01-15 13:36:16.000000000 -0500
+++ fltk-1.1.7/makeinclude.in 2007-08-03 16:56:49.000000000 -0400
@@ -81,7 +81,7 @@
LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@
LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS)
LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS)
-IMAGELIBS = -L../lib @IMAGELIBS@
+IMAGELIBS = @IMAGELIBS@
# image libraries to build...
IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@
@@ -111,7 +111,7 @@
UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
# Be quiet when building...
-.SILENT:
+#.SILENT:
# Build commands and filename extensions...
.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
diff -Nurd -x'*~' fltk-1.1.7.orig/src/Makefile fltk-1.1.7/src/Makefile
--- fltk-1.1.7.orig/src/Makefile 2005-08-07 20:54:30.000000000 -0400
+++ fltk-1.1.7/src/Makefile 2007-08-03 17:02:23.000000000 -0400
@@ -218,7 +218,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(OBJECTS) $(LDLIBS)
+ $(OBJECTS) $(LDLIBS) $(FONTCONFIGLIB)
$(RM) libfltk.dylib
$(LN) libfltk.1.1.dylib libfltk.dylib
@@ -254,7 +254,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(FLOBJECTS) -L. $(LDLIBS) -lfltk
+ $(FLOBJECTS) $(LDLIBS) libfltk.1.1.dylib
$(RM) libfltk_forms.dylib
$(LN) libfltk_forms.1.1.dylib libfltk_forms.dylib
@@ -290,7 +290,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(GLOBJECTS) -L. $(GLDLIBS) -lfltk
+ $(GLOBJECTS) $(GLDLIBS) libfltk.1.1.dylib
$(RM) libfltk_gl.dylib
$(LN) libfltk_gl.1.1.dylib libfltk_gl.dylib
@@ -326,7 +326,7 @@
-install_name $(libdir)/$@ \
-current_version 1.1.4 \
-compatibility_version 1.1.0 \
- $(IMGOBJECTS) -L.$(LDLIBS) $(IMAGELIBS) -lfltk
+ $(IMGOBJECTS) $(LDLIBS) $(IMAGELIBS) libfltk.1.1.dylib
$(RM) libfltk_images.dylib
$(LN) libfltk_images.1.1.dylib libfltk_images.dylib
diff -Nurd -x'*~' fltk-1.1.7.orig/src/filename_absolute.cxx fltk-1.1.7/src/filename_absolute.cxx
--- fltk-1.1.7.orig/src/filename_absolute.cxx 2005-11-27 09:45:48.000000000 -0500
+++ fltk-1.1.7/src/filename_absolute.cxx 2007-08-03 15:40:05.000000000 -0400
@@ -161,11 +161,7 @@
*slash != '\0' && *newslash != '\0';
slash ++, newslash ++)
if (isdirsep(*slash) && isdirsep(*newslash)) continue;
-#if defined(WIN32) || defined(__EMX__) || defined(__APPLE__)
else if (tolower(*slash & 255) != tolower(*newslash & 255)) break;
-#else
- else if (*slash != *newslash) break;
-#endif // WIN32 || __EMX__ || __APPLE__
if (*newslash == '\0' && *slash != '\0' && !isdirsep(*slash))
newslash--;