pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/fltk Update to 1.1.7, ok jlam@:
details: https://anonhg.NetBSD.org/pkgsrc/rev/3c884581dab7
branches: trunk
changeset: 506813:3c884581dab7
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jan 22 11:11:34 2006 +0000
description:
Update to 1.1.7, ok jlam@:
FLTK 1.1.7 fixes many bugs, adds some new example programs, and
adds many new improvements to the FLUID software including
multi-level undo, syntax highlighting in all code fields, widget
alignment and sizing guides, dialog templates, widget subclasses,
and printing and testing of user interfaces within FLUID.
diffstat:
x11/fltk/Makefile | 14 +++++++-------
x11/fltk/PLIST | 9 ++++++++-
x11/fltk/distinfo | 22 +++++++++++-----------
x11/fltk/patches/patch-aa | 8 ++++----
x11/fltk/patches/patch-ab | 41 +++++++++++++++++++----------------------
x11/fltk/patches/patch-ac | 35 ++++++++++++++++-------------------
x11/fltk/patches/patch-ad | 14 +++++++-------
x11/fltk/patches/patch-ae | 6 +++---
x11/fltk/patches/patch-af | 36 +++++++++++++++++++++++++++---------
x11/fltk/patches/patch-ag | 42 +++++++++++++++++++++---------------------
10 files changed, 123 insertions(+), 104 deletions(-)
diffs (truncated from 523 to 300 lines):
diff -r ef5ef3043db6 -r 3c884581dab7 x11/fltk/Makefile
--- a/x11/fltk/Makefile Sun Jan 22 09:12:52 2006 +0000
+++ b/x11/fltk/Makefile Sun Jan 22 11:11:34 2006 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.53 2005/12/17 05:20:24 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2006/01/22 11:11:34 wiz Exp $
-DISTNAME= fltk-1.1.6-source
+DISTNAME= fltk-1.1.7-source
PKGNAME= ${DISTNAME:S/-source//}
VERS= ${DISTNAME:S/fltk-//:S/-source//}
-PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fltk/} \
- ftp://ftp.fltk.org/pub/fltk/${VERS}/ \
ftp://ftp2.easysw.com/pub/fltk/${VERS}/ \
- ftp://ftp.northamerica.net/pub/ESP/fltk/${VERS}/ \
- ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
- ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERS}/
+ ftp://ftp3.easysw.com/pub/fltk/${VERS}/ \
+ http://ftp.easysw.com/pub/fltk/${VERS}/ \
+ http://mirror.nu6.org/ftp.easysw.com/pub/fltk/${VERS}/ \
+ ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
+ ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam%pkgsrc.org@localhost
diff -r ef5ef3043db6 -r 3c884581dab7 x11/fltk/PLIST
--- a/x11/fltk/PLIST Sun Jan 22 09:12:52 2006 +0000
+++ b/x11/fltk/PLIST Sun Jan 22 11:11:34 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/08/24 19:48:18 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/01/22 11:11:34 wiz Exp $
bin/fltk-config
bin/fluid
include/FL/Enumerations.H
@@ -85,6 +85,8 @@
include/FL/Fl_Input.h
include/FL/Fl_Input_.H
include/FL/Fl_Input_.h
+include/FL/Fl_Input_Choice.H
+include/FL/Fl_Input_Choice.h
include/FL/Fl_Int_Input.H
include/FL/Fl_Int_Input.h
include/FL/Fl_JPEG_Image.H
@@ -167,6 +169,8 @@
include/FL/Fl_Single_Window.h
include/FL/Fl_Slider.H
include/FL/Fl_Slider.h
+include/FL/Fl_Spinner.H
+include/FL/Fl_Spinner.h
include/FL/Fl_Sys_Menu_Bar.H
include/FL/Fl_Sys_Menu_Bar.h
include/FL/Fl_Tabs.H
@@ -289,6 +293,7 @@
share/doc/fltk/Fl_Image.html
share/doc/fltk/Fl_Input.html
share/doc/fltk/Fl_Input_.html
+share/doc/fltk/Fl_Input_Choice.html
share/doc/fltk/Fl_Int_Input.html
share/doc/fltk/Fl_JPEG_Image.html
share/doc/fltk/Fl_Light_Button.gif
@@ -326,6 +331,7 @@
share/doc/fltk/Fl_Shared_Image.html
share/doc/fltk/Fl_Single_Window.html
share/doc/fltk/Fl_Slider.html
+share/doc/fltk/Fl_Spinner.html
share/doc/fltk/Fl_Tabs.html
share/doc/fltk/Fl_Text_Buffer.html
share/doc/fltk/Fl_Text_Display.html
@@ -390,6 +396,7 @@
share/doc/fltk/glut.html
share/doc/fltk/hello.C.gif
share/doc/fltk/index.html
+share/doc/fltk/input_choice.jpg
share/doc/fltk/intro.html
share/doc/fltk/license.html
share/doc/fltk/menu.gif
diff -r ef5ef3043db6 -r 3c884581dab7 x11/fltk/distinfo
--- a/x11/fltk/distinfo Sun Jan 22 09:12:52 2006 +0000
+++ b/x11/fltk/distinfo Sun Jan 22 11:11:34 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.13 2005/03/19 15:26:18 ben Exp $
+$NetBSD: distinfo,v 1.14 2006/01/22 11:11:34 wiz Exp $
-SHA1 (fltk-1.1.6-source.tar.bz2) = 769bc18ec5dcd771221c13760b9fc0618b0712d2
-RMD160 (fltk-1.1.6-source.tar.bz2) = 5e2e69f6416a94ff9e372ba896872cc18ea1a936
-Size (fltk-1.1.6-source.tar.bz2) = 1898966 bytes
-SHA1 (patch-aa) = 40e6cf468e2af26c27e72747bf9fba0724078081
-SHA1 (patch-ab) = a0a9762dff3cb4d51b0e3dc446fffa53031a3a0b
-SHA1 (patch-ac) = 92c7b445a630aec5df4760d46b32201adf5472cc
-SHA1 (patch-ad) = 51e2b0747229405ea919f3834ff220e353ac3c26
-SHA1 (patch-ae) = ef52b0c7e74ef9976778733983d6f13870d76ecf
-SHA1 (patch-af) = b3bd0de47e4ff1e48e3cbf70449ccdb09bd006b9
-SHA1 (patch-ag) = 498a59e099803182ac6b119492ad167bd61e957f
+SHA1 (fltk-1.1.7-source.tar.bz2) = 16b174522920403af1e4ccddd36daaefda3765c8
+RMD160 (fltk-1.1.7-source.tar.bz2) = a539a1c6bb3363e54bc82c7995037c5d8ede9dd7
+Size (fltk-1.1.7-source.tar.bz2) = 2060757 bytes
+SHA1 (patch-aa) = 5fea7f520c1b51f0d1f10d863c30f3ed18406db6
+SHA1 (patch-ab) = c4311407ec801e834e9ecfdcb9410c3179a12aa7
+SHA1 (patch-ac) = f2fee36611abc95e470a76e6596f84bd3f33523a
+SHA1 (patch-ad) = 68d48cee2366931f232f88115f79f47f3e1e8206
+SHA1 (patch-ae) = 2a7183e8668787c9fd79d22a10001a56c401e35a
+SHA1 (patch-af) = 0f46220ebb5bfa5b87ac070036f21663dea47cb6
+SHA1 (patch-ag) = 3676310862feca1feb5369cfa5d3756cfd040934
diff -r ef5ef3043db6 -r 3c884581dab7 x11/fltk/patches/patch-aa
--- a/x11/fltk/patches/patch-aa Sun Jan 22 09:12:52 2006 +0000
+++ b/x11/fltk/patches/patch-aa Sun Jan 22 11:11:34 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-aa,v 1.7 2006/01/22 11:11:34 wiz Exp $
---- Makefile.orig 2004-10-18 20:22:21.000000000 +0000
+--- Makefile.orig 2006-01-15 19:36:16.000000000 +0100
+++ Makefile
-@@ -25,7 +25,7 @@
+@@ -27,7 +27,7 @@
include makeinclude
@@ -11,7 +11,7 @@
all: makeinclude
for dir in $(DIRS); do\
-@@ -33,6 +33,14 @@ all: makeinclude
+@@ -35,6 +35,14 @@ all: makeinclude
(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
done
diff -r ef5ef3043db6 -r 3c884581dab7 x11/fltk/patches/patch-ab
--- a/x11/fltk/patches/patch-ab Sun Jan 22 09:12:52 2006 +0000
+++ b/x11/fltk/patches/patch-ab Sun Jan 22 11:11:34 2006 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.10 2005/03/19 15:26:18 ben Exp $
+$NetBSD: patch-ab,v 1.11 2006/01/22 11:11:34 wiz Exp $
---- configure.in.orig 2004-11-19 19:44:17.000000000 -0800
+--- configure.in.orig 2006-01-15 18:36:16.000000000 +0000
+++ configure.in
-@@ -95,6 +95,7 @@ AC_SUBST(GLLIBNAME)
+@@ -96,6 +96,7 @@ AC_SUBST(GLLIBNAME)
AC_SUBST(IMGLIBNAME)
AC_SUBST(LIBEXT)
AC_SUBST(LIBNAME)
+AC_SUBST(LIBTOOL)
AC_SUBST(LINKFLTK)
+ AC_SUBST(LINKFLTKFORMS)
AC_SUBST(LINKFLTKGL)
- AC_SUBST(LINKFLTKIMG)
-@@ -110,6 +111,15 @@ fi
+@@ -112,6 +113,15 @@ fi
AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [default=yes]])
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]])
@@ -26,10 +26,10 @@
if test x$enable_shared = xyes; then
PICFLAG=1
SHAREDSUFFIX=""
-@@ -209,6 +219,21 @@ else
- LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
+@@ -222,6 +232,21 @@ else
+ FLUID="fluid"
+ LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
fi
-
+if test "x$LIBTOOL" != "x"; then
+ LINKFLTK="../src/libfltk.la"
+ if test "x$LINKFLTKGL" != "x"; then
@@ -45,11 +45,11 @@
+ IMGDSONAME="libfltk_images.la"
+fi
+
+
AC_SUBST(DSOCOMMAND)
AC_SUBST(DSOLINK)
- AC_SUBST(DSONAME)
-@@ -658,23 +683,8 @@ AC_SUBST(POSTBUILD)
- AC_SUBST(THREADS)
+@@ -757,26 +782,9 @@ AC_SUBST(INSTALL_DESKTOP)
+ AC_SUBST(UNINSTALL_DESKTOP)
dnl Figure out the appropriate formatted man page extension...
-case "$uname" in
@@ -57,27 +57,24 @@
- # *BSD
- CAT1EXT=0
- CAT3EXT=0
+- CAT6EXT=0
- ;;
- IRIX*)
- # SGI IRIX
- CAT1EXT=z
- CAT3EXT=z
+- CAT6EXT=z
- ;;
- *)
- # All others
- CAT1EXT=1
- CAT3EXT=3
+- CAT1EXT=1
+- CAT3EXT=3
+- CAT6EXT=3
- ;;
-esac
++ CAT1EXT=1
++ CAT3EXT=3
++ CAT6EXT=6
AC_SUBST(CAT1EXT)
AC_SUBST(CAT3EXT)
-@@ -743,7 +753,7 @@ if test -n "$GCC"; then
- ;;
- esac
-
-- CXX="$CC"
-+# CXX="$CC"
-
- # Show all standard warnings + unused variables, conversion errors,
- # and inlining problems when compiling...
diff -r ef5ef3043db6 -r 3c884581dab7 x11/fltk/patches/patch-ac
--- a/x11/fltk/patches/patch-ac Sun Jan 22 09:12:52 2006 +0000
+++ b/x11/fltk/patches/patch-ac Sun Jan 22 11:11:34 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $
+$NetBSD: patch-ac,v 1.9 2006/01/22 11:11:34 wiz Exp $
---- configure.orig 2004-11-23 12:35:43.000000000 -0800
+--- configure.orig 2006-01-18 02:30:52.000000000 +0000
+++ configure
-@@ -855,6 +855,8 @@ Optional Features:
+@@ -856,6 +856,8 @@ Optional Features:
--enable-debug turn on debugging default=no
--enable-gl turn on OpenGL support default=yes
--enable-shared turn on shared libraries default=no
@@ -10,8 +10,8 @@
+ turn on building with libtool [default=no]
--enable-threads enable multi-threading support
--enable-quartz use Quartz instead of Quickdraw (default=no)
- --enable-localjpeg use local JPEG library, default=auto
-@@ -1377,7 +1379,22 @@ if test "${enable_shared+set}" = set; th
+ --disable-largefile omit support for large files
+@@ -1412,7 +1414,22 @@ if test "${enable_shared+set}" = set; th
enableval="$enable_shared"
fi;
@@ -35,10 +35,12 @@
PICFLAG=1
SHAREDSUFFIX=""
FLUID="fluid-shared"
-@@ -1478,6 +1495,20 @@ else
- LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
+@@ -1524,8 +1541,20 @@ else
+ LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
fi
+-
+-
+if test "x$LIBTOOL" != "x"; then
+ LINKFLTK="../src/libfltk.la"
+ if test "x$LINKFLTKGL" != "x"; then
@@ -56,7 +58,7 @@
-@@ -9148,23 +9179,8 @@ esac
+@@ -11073,26 +11102,9 @@ esac
@@ -65,37 +67,32 @@
- # *BSD
- CAT1EXT=0
- CAT3EXT=0
+- CAT6EXT=0
- ;;
- IRIX*)
- # SGI IRIX
- CAT1EXT=z
- CAT3EXT=z
+- CAT6EXT=z
- ;;
- *)
- # All others
- CAT1EXT=1
- CAT3EXT=3
+- CAT6EXT=3
- ;;
-esac
+CAT1EXT=1
+CAT3EXT=3
++CAT6EXT=6
-@@ -9230,7 +9246,7 @@ echo "${ECHO_T}yes" >&6
- ;;
- esac
-
-- CXX="$CC"
-+# CXX="$CC"
Home |
Main Index |
Thread Index |
Old Index