summaryrefslogtreecommitdiff
path: root/x11/fltk
diff options
context:
space:
mode:
Diffstat (limited to 'x11/fltk')
-rw-r--r--x11/fltk/Makefile5
-rw-r--r--x11/fltk/distinfo18
-rw-r--r--x11/fltk/patches/patch-ab10
-rw-r--r--x11/fltk/patches/patch-ac10
-rw-r--r--x11/fltk/patches/patch-ae14
-rw-r--r--x11/fltk/patches/patch-af6
-rw-r--r--x11/fltk/patches/patch-ag8
7 files changed, 35 insertions, 36 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 76995dc12dc..5fac5d641e3 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2010/04/09 13:35:41 obache Exp $
-DISTNAME= fltk-1.1.9-source
-PKGREVISION= 3
+DISTNAME= fltk-1.1.10-source
PKGNAME= ${DISTNAME:S/-source//}
VERS= ${DISTNAME:S/fltk-//:S/-source//}
CATEGORIES= x11
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index a64ba8e6237..cad60897c1c 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.18 2008/11/16 07:13:36 dsainty Exp $
+$NetBSD: distinfo,v 1.19 2010/04/09 13:35:41 obache Exp $
-SHA1 (fltk-1.1.9-source.tar.bz2) = 6f21903dc53c829ec71e8e49655eb19e624c8247
-RMD160 (fltk-1.1.9-source.tar.bz2) = f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91
-Size (fltk-1.1.9-source.tar.bz2) = 2206178 bytes
+SHA1 (fltk-1.1.10-source.tar.bz2) = 0d2b34fede91fa78eeaefb893dd70282f73908a8
+RMD160 (fltk-1.1.10-source.tar.bz2) = f8fc4371811efcc0d6fc73edd0525d8ff87a4faa
+Size (fltk-1.1.10-source.tar.bz2) = 2214382 bytes
SHA1 (patch-aa) = 661dcac75cf50c791c2edcc14ec93e9ee83b062a
-SHA1 (patch-ab) = 00032b947f47686eb8ddafde065be602fd355819
-SHA1 (patch-ac) = 0e992d6850048f4686b897b3987511c9bd8f9a9e
+SHA1 (patch-ab) = cb8500a9169c899ae332adc8672e814e4ba13304
+SHA1 (patch-ac) = 65e9fd364d5154904fa864e0550cf712fae6d569
SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80
-SHA1 (patch-ae) = 80fe35839fab62672e66f5035aaf5fff7d4956e7
-SHA1 (patch-af) = 18df280c50da04d671b1ebc77e22e670ccdaf709
-SHA1 (patch-ag) = 70f32e45b0a1e086427ffcfafe41495ffb38f6c0
+SHA1 (patch-ae) = de29d1be1219c3b17707216a7c54c25a9adb746c
+SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b
+SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index 66415cb8a72..a0834d04eca 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2008/11/10 19:03:15 adam Exp $
+$NetBSD: patch-ab,v 1.13 2010/04/09 13:35:42 obache Exp $
---- configure.in.orig 2008-04-11 18:53:01.000000000 +0200
+--- configure.in.orig 2009-09-20 17:25:25.000000000 +0000
+++ configure.in
-@@ -104,6 +104,7 @@ AC_SUBST(GLLIBNAME)
+@@ -122,6 +122,7 @@ AC_SUBST(GLLIBNAME)
AC_SUBST(IMGLIBNAME)
AC_SUBST(LIBEXT)
AC_SUBST(LIBNAME)
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.12 2008/11/10 19:03:15 adam Exp $
AC_SUBST(LINKFLTK)
AC_SUBST(LINKFLTKFORMS)
AC_SUBST(LINKFLTKGL)
-@@ -120,6 +121,15 @@ fi
+@@ -143,6 +144,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,7 +26,7 @@ $NetBSD: patch-ab,v 1.12 2008/11/10 19:03:15 adam Exp $
if test x$enable_shared = xyes; then
PICFLAG=1
SHAREDSUFFIX=""
-@@ -238,6 +248,21 @@ else
+@@ -261,6 +271,21 @@ else
FLUID="fluid"
LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
fi
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
index 53e5969c2dd..ce1c1c6fe62 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2008/11/10 19:03:15 adam Exp $
+$NetBSD: patch-ac,v 1.11 2010/04/09 13:35:42 obache Exp $
---- configure.orig 2008-04-27 10:28:21.000000000 +0200
+--- configure.orig 2009-12-27 15:24:34.000000000 +0000
+++ configure
-@@ -1318,6 +1319,8 @@ Optional Features:
+@@ -1323,6 +1323,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
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.10 2008/11/10 19:03:15 adam Exp $
--enable-threads enable multi-threading support
--enable-quartz use Quartz instead of Quickdraw (default=no)
--disable-largefile omit support for large files
-@@ -1870,7 +1873,22 @@ if test "${enable_shared+set}" = set; th
+@@ -1898,7 +1900,22 @@ if test "${enable_shared+set}" = set; th
enableval=$enable_shared;
fi
@@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.10 2008/11/10 19:03:15 adam Exp $
PICFLAG=1
SHAREDSUFFIX=""
FLUID="fluid-shared"
-@@ -1990,8 +2008,20 @@ else
+@@ -2018,8 +2035,20 @@ else
LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
fi
diff --git a/x11/fltk/patches/patch-ae b/x11/fltk/patches/patch-ae
index dade286086d..706a67c895a 100644
--- a/x11/fltk/patches/patch-ae
+++ b/x11/fltk/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.7 2008/11/16 07:13:37 dsainty Exp $
+$NetBSD: patch-ae,v 1.8 2010/04/09 13:35:42 obache Exp $
---- fluid/Makefile.orig 2008-02-27 04:26:08.000000000 +1300
-+++ fluid/Makefile 2008-11-16 19:22:46.000000000 +1300
-@@ -57,7 +57,7 @@
- fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
- ../lib/$(IMGLIBNAME)
+--- fluid/Makefile.orig 2008-12-29 20:21:29.000000000 +0000
++++ fluid/Makefile
+@@ -57,7 +57,7 @@ all: $(FLUID) fluid$(EXEEXT)
+ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+ $(IMGLIBNAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
$(POSTBUILD) $@ ../FL/mac.r
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ include makedepend
install: all
echo "Installing FLUID in $(DESTDIR)$(bindir)..."
-$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af
index b94ef5fec27..67155069f05 100644
--- a/x11/fltk/patches/patch-af
+++ b/x11/fltk/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2008/11/10 19:03:15 adam Exp $
+$NetBSD: patch-af,v 1.9 2010/04/09 13:35:42 obache Exp $
---- makeinclude.in.orig 2008-02-26 16:26:08.000000000 +0100
+--- makeinclude.in.orig 2008-12-29 20:21:29.000000000 +0000
+++ makeinclude.in
-@@ -134,16 +135,16 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+@@ -139,16 +139,16 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
.o$(EXEEXT):
echo Linking $@...
diff --git a/x11/fltk/patches/patch-ag b/x11/fltk/patches/patch-ag
index fead731b202..f2ed6ade00b 100644
--- a/x11/fltk/patches/patch-ag
+++ b/x11/fltk/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.7 2008/11/10 19:03:15 adam Exp $
+$NetBSD: patch-ag,v 1.8 2010/04/09 13:35:42 obache Exp $
---- src/Makefile.orig 2008-02-27 16:00:31.000000000 +0100
+--- src/Makefile.orig 2009-07-02 09:42:17.000000000 +0000
+++ src/Makefile
@@ -208,6 +208,10 @@ $(LIBNAME): $(OBJECTS)
$(LIBCOMMAND) $@ $(OBJECTS)
@@ -47,9 +47,9 @@ $NetBSD: patch-ag,v 1.7 2008/11/10 19:03:15 adam Exp $
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
@@ -504,6 +520,9 @@ install: $(LIBNAME) $(DSONAME) \
- $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
+ $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
fi
- $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
+ $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
+ if test x$(DSONAME) = xlibfltk.la; then\
+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
+ fi
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 09:42:58 +0000