Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sc8-pr-cvs17:/tmp/cvs-serv9811
Modified Files:
fltk-x11.info fltk-x11.patch
Log Message:
move to stable
Index: fltk-x11.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/fltk-x11.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fltk-x11.patch 23 Feb 2006 17:12:25 -0000 1.2
+++ fltk-x11.patch 14 Oct 2007 17:47:55 -0000 1.3
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' fltk-1.1.6.orig/Makefile fltk-1.1.6/Makefile
---- fltk-1.1.6.orig/Makefile 2004-10-18 16:22:21.000000000 -0400
-+++ fltk-1.1.6/Makefile 2005-07-02 01:30:15.000000000 -0400
-@@ -25,7 +25,7 @@
+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
@@ -10,18 +10,18 @@
all: makeinclude
for dir in $(DIRS); do\
-diff -Nurd -x'*~' fltk-1.1.6.orig/configure fltk-1.1.6/configure
---- fltk-1.1.6.orig/configure 2004-11-23 15:35:43.000000000 -0500
-+++ fltk-1.1.6/configure 2006-02-22 23:42:39.000000000 -0500
-@@ -856,7 +856,6 @@
+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
- --enable-localpng use local PNG library, default=auto
-@@ -1388,7 +1387,7 @@
+@@ -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"
@@ -30,122 +30,40 @@
;;
SunOS* | UNIX_S*)
-@@ -1501,31 +1500,6 @@
+@@ -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
+ case $uname in
- Darwin*)
-- # Check whether --enable-quartz or --disable-quartz was given.
--if test "${enable_quartz+set}" = set; then
-- enableval="$enable_quartz"
--
--fi;
-- if test "x$enable_quartz" = "xyes"; then
-- cat >>confdefs.h <<\_ACEOF
--#define USE_QUARTZ 1
--_ACEOF
--
-- cat >>confdefs.h <<\_ACEOF
--#define __APPLE_QUARTZ__ 1
--_ACEOF
--
-- else
-- cat >>confdefs.h <<\_ACEOF
--#define __APPLE_QD__ 1
--_ACEOF
--
-- fi
-- ;;
--esac
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6700,7 +6674,17 @@
- fi
- fi
-
--HLINKS=
-+# Don't make symlinks if filesystem is not case sensitive...
-+case $uname in
-+ CYGWIN* | MINGW* | Darwin*)
-+ HLINKS="#"
-+ ;;
-+ *)
-+ HLINKS=
-+ ;;
-+esac
-+
-+
- POSTBUILD=:
- THREADS=
-
-@@ -7011,48 +6995,6 @@
- THREADS="threads.exe"
++ 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
-
-- # Don't make symlinks since Windows is not case sensitive.
-- if test "x$with_links" != xyes; then
-- HLINKS="#"
-- fi
-- ;;
--
-- Darwin*)
-- # MacOS X uses Carbon for graphics...
-- LIBS="$LIBS -framework Carbon -framework ApplicationServices"
--
-- if test x$have_pthread = xyes; then
-- cat >>confdefs.h <<\_ACEOF
--#define HAVE_PTHREAD 1
--_ACEOF
--
-- THREADS="threads"
-- fi
--
-- if test x$enable_gl != xno; then
-- cat >>confdefs.h <<\_ACEOF
--#define HAVE_GL 1
--_ACEOF
--
-- cat >>confdefs.h <<\_ACEOF
--#define HAVE_GL_GLU_H 1
--_ACEOF
--
-- GLLIB="-framework AGL -framework OpenGL"
-- else
-- LINKFLTKGL=""
-- GLLIBNAME=""
-- GLDSONAME=""
-- GLDEMOS=""
-- fi
--
-- # Don't make symlinks because HFS+ is not case sensitive...
-- if test "x$with_links" != xyes; then
-- HLINKS="#"
-- fi
--
-- # Add a postbuild step after linking applications
-- POSTBUILD="/Developer/Tools/Rez -t APPL -o"
;;
- *)
-@@ -9230,7 +9172,7 @@
- ;;
- esac
-
-- CXX="$CC"
-+ CXX="${CXX:-$CC}"
+- Darwin*)
++ Darwin_DO_NOT_GO_HERE)
+ # MacOS X uses Carbon for graphics...
+ LIBS="$LIBS -framework Carbon -framework ApplicationServices"
- # Show all standard warnings + unused variables, conversion errors,
- # and inlining problems when compiling...
-diff -Nurd -x'*~' fltk-1.1.6.orig/fluid/fluid.cxx fltk-1.1.6/fluid/fluid.cxx
---- fltk-1.1.6.orig/fluid/fluid.cxx 2004-09-08 11:42:47.000000000 -0400
-+++ fltk-1.1.6/fluid/fluid.cxx 2005-07-02 01:18:57.000000000 -0400
-@@ -617,11 +617,7 @@
+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 < 10; i ++)
+ for (i = 0; i < max_files; i ++)
-#if defined(WIN32) || defined(__APPLE__)
if (!strcasecmp(absolute, absolute_history[i])) break;
-#else
@@ -154,10 +72,31 @@
if (i == 0) return;
-diff -Nurd -x'*~' fltk-1.1.6.orig/src/Makefile fltk-1.1.6/src/Makefile
---- fltk-1.1.6.orig/src/Makefile 2004-11-19 22:19:58.000000000 -0500
-+++ fltk-1.1.6/src/Makefile 2005-07-02 01:18:57.000000000 -0400
-@@ -217,7 +217,7 @@
+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 \
@@ -166,44 +105,45 @@
$(RM) libfltk.dylib
$(LN) libfltk.1.1.dylib libfltk.dylib
-diff -Nurd -x'*~' fltk-1.1.6.orig/src/filename_absolute.cxx
fltk-1.1.6/src/filename_absolute.cxx
---- fltk-1.1.6.orig/src/filename_absolute.cxx 2004-04-11 00:38:59.000000000
-0400
-+++ fltk-1.1.6/src/filename_absolute.cxx 2005-07-02 01:18:57.000000000
-0400
-@@ -154,11 +154,7 @@
+@@ -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) != tolower(*newslash)) break;
+ 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--;
-diff -Nurd -x'*~' fltk-1.1.6.orig/test/colbrowser.cxx
fltk-1.1.6/test/colbrowser.cxx
---- fltk-1.1.6.orig/test/colbrowser.cxx 2004-04-11 00:39:01.000000000
-0400
-+++ fltk-1.1.6/test/colbrowser.cxx 2005-07-02 01:18:57.000000000 -0400
-@@ -42,21 +42,7 @@
- static int load_browser(char *);
-
- /* the RGB data file does not have a standard location on unix. */
--
--#ifdef __VMS
-- static const char *rgbfile = "SYS$MANAGER:DECW$RGB.DAT";
--#else
--#ifdef __EMX__ /* OS2 */
--#include <X11/XlibInt.h>
-- static const char *rgbfile = "/XFree86/lib/X11/rgb.txt";
--#else
--#ifdef __FreeBSD__
-- static const char *rgbfile = "/usr/X11R6/lib/X11/rgb.txt";
--#else
-- static const char *rgbfile = "/usr/lib/X11/rgb.txt";
--#endif
--#endif
--#endif
-+static const char *rgbfile = "/usr/X11R6/lib/X11/rgb.txt";
-
- typedef struct { int r, g, b; } RGBdb;
-
Index: fltk-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/fltk-x11.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fltk-x11.info 17 Aug 2006 14:20:56 -0000 1.5
+++ fltk-x11.info 14 Oct 2007 17:47:55 -0000 1.6
@@ -1,6 +1,6 @@
Package: fltk-x11
-Version: 1.1.6
-Revision: 11.1
+Version: 1.1.7
+Revision: 1002
Description: GUI toolkit
DescDetail: <<
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
@@ -41,12 +41,9 @@
Patch to show actual compiling commands, not synopses of them.
-Patch src/Makefile and makeinclude.in to link to nascent libfltk.dylib
-not an installed one.
-
-Need to use g++ to link C++ code, so don't force CXX=$CC.
-
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
@@ -65,37 +62,44 @@
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs, %n-shlibs (=
%v-%r)
BuildDepends: libjpeg, libpng3, x11, xft2, x11-dev
-Conflicts: fltk
-Replaces: fltk
+Conflicts: fltk,fltk-aqua
+Replaces: fltk,fltk-aqua
BuildDependsOnly: True
-Source: mirror:sourceforge:fltk/fltk-%v-source.tar.bz2
+#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: 95d340977d13edea12e98d787a668b32
+Source-MD5: 2e29319119adc9d63b2f26b72cae0a88
Patch: %n.patch
PatchScript: <<
#!/bin/sh -ex
- perl -pi -e 's|\.SILENT||;' \
- -e 's|(-L\.\./lib)|-L../src $1|' makeinclude.in
- perl -ni -e 's|(\$\(IMAGELIBS\)) (-L\.)|$2 $1|;' \
- -e 's|(\$\(LDLIBS\)) (-L\.)|$2 $1|;' \
- -e 'print unless /echo.*COMMAND/' src/Makefile
- perl -pi -e 's/|| break//' Makefile
+ 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='${prefix}/share/man'
+ConfigureParams: --enable-shared --with-x --enable-xft --mandir=%p/share/man
--without-links --enable-threads
CompileScript: <<
./configure %c
make FONTCONFIGLIB=-lfontconfig
<<
InstallScript: <<
- make install prefix=%i docdir=%i/share/doc/%n/html
+ make install DESTDIR=%d docdir=%p/share/doc/%n/html
ln -s html/index.html %i/share/doc/%n
- rm -r %i/share/man/cat?
-<<
-RuntimeVars: <<
- FLTK_DOCDIR: %p/share/doc/%n/html
<<
DocFiles: ANNOUNCEMENT CHANGES COPYING CREDITS README
SplitOff: <<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
