diff options
author | adam <adam@pkgsrc.org> | 2008-11-10 19:03:15 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2008-11-10 19:03:15 +0000 |
commit | 489e7e05e20261a68c97cd64760e8ca0c3451196 (patch) | |
tree | 0885e1b5f5e112f7f15d2a50277f8661d30393c8 /x11/fltk | |
parent | 8ffff5e187e0e1a24ddfc2d0ad212de5600cd4c9 (diff) | |
download | pkgsrc-489e7e05e20261a68c97cd64760e8ca0c3451196.tar.gz |
Changes 1.1.9:
- Improved color contrast in secondary selection blocks of Fl_Text_Display
- Fixed regression in callback handling
- Fixed wrong relative path when absolute path has a
trailing slash in fl_filename_relative
- Fixed multiple selction of files and directories in Fl_File_Chooser
- Fixed MSWindows crash when selecting umlauts in Fl_Help_View
Changes 1.1.8:
- Documentation fixes
- Fixed library path in Makefile
- Fixed image read for partial regions on X11
- Fixed KDE/Gnome icon paths
- Fixed Tab key to wrap around menu bars
- Fixed possible timer leak in Scrollbar
- Added documentation about the potential limitations
of Fl::grab on newer operating systems
- Fixed lockout when mixing popups and alerts
- Fixed recursion crash in event handling
- Fixed missing return code in 'fltk-config'
- Fixed inconsistencies with CHANGED flags
- Fixed message sent to hidden widgets
- Fixed width calculation in Fl_Help_View
- Fixed offset bug in OS X pixmap code
- Fixed potential buffer overrun in Fl_Preferences
- More...
Diffstat (limited to 'x11/fltk')
-rw-r--r-- | x11/fltk/Makefile | 10 | ||||
-rw-r--r-- | x11/fltk/PLIST | 10 | ||||
-rw-r--r-- | x11/fltk/distinfo | 22 | ||||
-rw-r--r-- | x11/fltk/patches/patch-aa | 10 | ||||
-rw-r--r-- | x11/fltk/patches/patch-ab | 42 | ||||
-rw-r--r-- | x11/fltk/patches/patch-ac | 52 | ||||
-rw-r--r-- | x11/fltk/patches/patch-ad | 43 | ||||
-rw-r--r-- | x11/fltk/patches/patch-ae | 22 | ||||
-rw-r--r-- | x11/fltk/patches/patch-af | 72 | ||||
-rw-r--r-- | x11/fltk/patches/patch-ag | 54 |
10 files changed, 109 insertions, 228 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 4e97d5d1124..1fffe5e593e 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.65 2008/08/23 07:47:00 obache Exp $ +# $NetBSD: Makefile,v 1.66 2008/11/10 19:03:15 adam Exp $ -DISTNAME= fltk-1.1.7-source +DISTNAME= fltk-1.1.9-source PKGNAME= ${DISTNAME:S/-source//} VERS= ${DISTNAME:S/fltk-//:S/-source//} -PKGREVISION= 4 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fltk/} \ - http://ftp.easysw.com/pub/fltk/${VERS}/ \ +MASTER_SITES= 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}/ @@ -20,8 +18,8 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} USE_LANGUAGES= c c++ -USE_TOOLS+= gmake USE_LIBTOOL= yes +USE_TOOLS+= gmake TEST_TARGET= test PTHREAD_OPTS+= require diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST index 18be1f385ac..2642adfbab0 100644 --- a/x11/fltk/PLIST +++ b/x11/fltk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:14 jlam Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/11/10 19:03:15 adam Exp $ bin/fltk-config bin/fluid include/FL/Enumerations.H @@ -137,6 +137,8 @@ include/FL/Fl_Preferences.H ${PLIST.cs}include/FL/Fl_Preferences.h include/FL/Fl_Progress.H ${PLIST.cs}include/FL/Fl_Progress.h +include/FL/Fl_RGB_Image.H +${PLIST.cs}include/FL/Fl_RGB_Image.h include/FL/Fl_Radio_Button.H ${PLIST.cs}include/FL/Fl_Radio_Button.h include/FL/Fl_Radio_Light_Button.H @@ -234,12 +236,14 @@ include/FL/gl.h include/FL/gl2opengl.h include/FL/gl_draw.H ${PLIST.cs}include/FL/gl_draw.h +include/FL/glu.h include/FL/glut.H ${PLIST.cs}include/FL/glut.h include/FL/mac.H ${PLIST.cs}include/FL/mac.h include/FL/mac.r include/FL/math.h +include/FL/names.h include/FL/win32.H ${PLIST.cs}include/FL/win32.h include/FL/x.H @@ -267,6 +271,7 @@ share/doc/fltk/Fl_Check_Button.gif share/doc/fltk/Fl_Check_Button.html share/doc/fltk/Fl_Choice.html share/doc/fltk/Fl_Clock.html +share/doc/fltk/Fl_Clock_Output.html share/doc/fltk/Fl_Color_Chooser.html share/doc/fltk/Fl_Counter.html share/doc/fltk/Fl_Dial.html @@ -337,6 +342,7 @@ share/doc/fltk/Fl_Tile.gif share/doc/fltk/Fl_Tile.html share/doc/fltk/Fl_Tiled_Image.html share/doc/fltk/Fl_Timer.html +share/doc/fltk/Fl_Toggle_Button.html share/doc/fltk/Fl_Tooltip.html share/doc/fltk/Fl_Valuator.html share/doc/fltk/Fl_Value_Input.gif @@ -350,6 +356,7 @@ share/doc/fltk/Fl_Wizard.html share/doc/fltk/Fl_XBM_Image.html share/doc/fltk/Fl_XPM_Image.html share/doc/fltk/adjuster1.gif +share/doc/fltk/advanced.html share/doc/fltk/basics.html share/doc/fltk/boxtypes.gif share/doc/fltk/buttons.gif @@ -366,6 +373,7 @@ share/doc/fltk/editor.gif share/doc/fltk/editor.html share/doc/fltk/enumerations.html share/doc/fltk/events.html +share/doc/fltk/examples.html share/doc/fltk/fl_alert.gif share/doc/fltk/fl_ask.gif share/doc/fltk/fl_choice.gif diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo index c9647381a6c..b1177b2833e 100644 --- a/x11/fltk/distinfo +++ b/x11/fltk/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.16 2007/01/02 12:42:45 joerg Exp $ +$NetBSD: distinfo,v 1.17 2008/11/10 19:03:15 adam Exp $ -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) = 96eab6558675067ae5eae3e176066c653eee957d -SHA1 (patch-ae) = 2a7183e8668787c9fd79d22a10001a56c401e35a -SHA1 (patch-af) = 0f46220ebb5bfa5b87ac070036f21663dea47cb6 -SHA1 (patch-ag) = fc8986996438a87eac959ca850237cd8f473ff71 +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 (patch-aa) = 661dcac75cf50c791c2edcc14ec93e9ee83b062a +SHA1 (patch-ab) = 00032b947f47686eb8ddafde065be602fd355819 +SHA1 (patch-ac) = 0e992d6850048f4686b897b3987511c9bd8f9a9e +SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80 +SHA1 (patch-ae) = c4bfe5e5c6096babe697abe39e8ea328edb11adc +SHA1 (patch-af) = 18df280c50da04d671b1ebc77e22e670ccdaf709 +SHA1 (patch-ag) = 70f32e45b0a1e086427ffcfafe41495ffb38f6c0 diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa index b7d75c6dd83..146fa915e33 100644 --- a/x11/fltk/patches/patch-aa +++ b/x11/fltk/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.7 2006/01/22 11:11:34 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2008/11/10 19:03:15 adam Exp $ ---- Makefile.orig 2006-01-15 19:36:16.000000000 +0100 +--- Makefile.orig 2007-11-20 22:15:08.000000000 +0100 +++ Makefile @@ -27,7 +27,7 @@ @@ -9,10 +9,10 @@ $NetBSD: patch-aa,v 1.7 2006/01/22 11:11:34 wiz Exp $ -DIRS = $(IMAGEDIRS) src fluid test documentation +DIRS = $(IMAGEDIRS) src fluid documentation - all: makeinclude + all: makeinclude fltk-config for dir in $(DIRS); do\ -@@ -35,6 +35,14 @@ all: makeinclude - (cd $$dir; $(MAKE) $(MFLAGS)) || break;\ +@@ -35,6 +35,14 @@ all: makeinclude fltk-config + (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ done +test: makeinclude diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab index 949872e8bee..66415cb8a72 100644 --- a/x11/fltk/patches/patch-ab +++ b/x11/fltk/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.11 2006/01/22 11:11:34 wiz Exp $ +$NetBSD: patch-ab,v 1.12 2008/11/10 19:03:15 adam Exp $ ---- configure.in.orig 2006-01-15 18:36:16.000000000 +0000 +--- configure.in.orig 2008-04-11 18:53:01.000000000 +0200 +++ configure.in -@@ -96,6 +96,7 @@ AC_SUBST(GLLIBNAME) +@@ -104,6 +104,7 @@ AC_SUBST(GLLIBNAME) AC_SUBST(IMGLIBNAME) AC_SUBST(LIBEXT) AC_SUBST(LIBNAME) @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.11 2006/01/22 11:11:34 wiz Exp $ AC_SUBST(LINKFLTK) AC_SUBST(LINKFLTKFORMS) AC_SUBST(LINKFLTKGL) -@@ -112,6 +113,15 @@ fi +@@ -120,6 +121,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.11 2006/01/22 11:11:34 wiz Exp $ if test x$enable_shared = xyes; then PICFLAG=1 SHAREDSUFFIX="" -@@ -222,6 +232,21 @@ else +@@ -238,6 +248,21 @@ else FLUID="fluid" LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" fi @@ -47,34 +47,4 @@ $NetBSD: patch-ab,v 1.11 2006/01/22 11:11:34 wiz Exp $ + AC_SUBST(DSOCOMMAND) - AC_SUBST(DSOLINK) -@@ -757,26 +782,9 @@ AC_SUBST(INSTALL_DESKTOP) - AC_SUBST(UNINSTALL_DESKTOP) - - dnl Figure out the appropriate formatted man page extension... --case "$uname" in -- *BSD* | Darwin*) -- # *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 - - AC_SUBST(CAT1EXT) - AC_SUBST(CAT3EXT) + AC_SUBST(DSOFLAGS) diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac index b9012ec5941..53e5969c2dd 100644 --- a/x11/fltk/patches/patch-ac +++ b/x11/fltk/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.9 2006/01/22 11:11:34 wiz Exp $ +$NetBSD: patch-ac,v 1.10 2008/11/10 19:03:15 adam Exp $ ---- configure.orig 2006-01-18 02:30:52.000000000 +0000 +--- configure.orig 2008-04-27 10:28:21.000000000 +0200 +++ configure -@@ -856,6 +856,8 @@ Optional Features: +@@ -1318,6 +1319,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,10 +11,10 @@ $NetBSD: patch-ac,v 1.9 2006/01/22 11:11:34 wiz Exp $ --enable-threads enable multi-threading support --enable-quartz use Quartz instead of Quickdraw (default=no) --disable-largefile omit support for large files -@@ -1412,7 +1414,22 @@ if test "${enable_shared+set}" = set; th - enableval="$enable_shared" +@@ -1870,7 +1873,22 @@ if test "${enable_shared+set}" = set; th + enableval=$enable_shared; + fi - fi; -if test x$enable_shared = xyes; then + +# Check whether --enable-libtool or --disable-libtool was given. @@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.9 2006/01/22 11:11:34 wiz Exp $ PICFLAG=1 SHAREDSUFFIX="" FLUID="fluid-shared" -@@ -1524,8 +1541,20 @@ else +@@ -1990,8 +2008,20 @@ else LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" fi @@ -58,41 +58,3 @@ $NetBSD: patch-ac,v 1.9 2006/01/22 11:11:34 wiz Exp $ -@@ -11073,26 +11102,9 @@ esac - - - --case "$uname" in -- *BSD* | Darwin*) -- # *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 - - - -@@ -12034,6 +12048,7 @@ s,@GLLIBNAME@,$GLLIBNAME,;t t - s,@IMGLIBNAME@,$IMGLIBNAME,;t t - s,@LIBEXT@,$LIBEXT,;t t - s,@LIBNAME@,$LIBNAME,;t t -+s,@LIBTOOL@,$LIBTOOL,;t t - s,@LINKFLTK@,$LINKFLTK,;t t - s,@LINKFLTKFORMS@,$LINKFLTKFORMS,;t t - s,@LINKFLTKGL@,$LINKFLTKGL,;t t diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad index 0c4c45aa8bb..5a2f0b23351 100644 --- a/x11/fltk/patches/patch-ad +++ b/x11/fltk/patches/patch-ad @@ -1,33 +1,16 @@ -$NetBSD: patch-ad,v 1.9 2006/06/01 13:14:19 joerg Exp $ +$NetBSD: patch-ad,v 1.10 2008/11/10 19:03:15 adam Exp $ ---- documentation/Makefile.orig 2006-01-15 18:36:16.000000000 +0000 +--- documentation/Makefile.orig 2008-11-10 17:38:24.000000000 +0100 +++ documentation/Makefile -@@ -229,24 +229,16 @@ depend: - install: $(MANPAGES) - echo "Installing documentation files in $(DESTDIR)$(docdir)..." - -$(MKDIR) $(DESTDIR)$(docdir) -- $(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir) - $(CHMOD) 644 $(DESTDIR)$(docdir)/*.* +@@ -237,11 +237,6 @@ install: $(MANPAGES) + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \ + done 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 -+ $(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fluid.1 -- $(CP) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 -+ $(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fltk-config.1 - -$(MKDIR) $(DESTDIR)$(mandir)/man3 -- $(CP) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 -+ $(INSTALL_MAN) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man3/fltk.3 - - install-linux install-osx: +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 +- $(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 +- $(INSTALL_MAN) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 +- $(INSTALL_MAN) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 + $(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 + $(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 diff --git a/x11/fltk/patches/patch-ae b/x11/fltk/patches/patch-ae index d5894ab02df..869b7ca23f5 100644 --- a/x11/fltk/patches/patch-ae +++ b/x11/fltk/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.5 2006/01/22 11:11:34 wiz Exp $ +$NetBSD: patch-ae,v 1.6 2008/11/10 19:03:15 adam Exp $ ---- fluid/Makefile.orig 2006-01-15 20:26:08.000000000 +0100 +--- fluid/Makefile.orig 2008-11-10 17:29:24.000000000 +0100 +++ fluid/Makefile -@@ -80,7 +80,7 @@ include makedepend - install: all - echo "Installing FLUID in $(DESTDIR)$(bindir)..." - -$(MKDIR) $(DESTDIR)$(bindir) -- $(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) -+ $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT) +@@ -57,7 +57,7 @@ all: $(FLUID) fluid$(EXEEXT) + fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ + ../lib/$(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 + diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af index e9f680a1bf7..b94ef5fec27 100644 --- a/x11/fltk/patches/patch-af +++ b/x11/fltk/patches/patch-af @@ -1,64 +1,24 @@ -$NetBSD: patch-af,v 1.7 2006/01/22 11:11:34 wiz Exp $ +$NetBSD: patch-af,v 1.8 2008/11/10 19:03:15 adam Exp $ ---- makeinclude.in.orig 2006-01-15 18:36:16.000000000 +0000 +--- makeinclude.in.orig 2008-02-26 16:26:08.000000000 +0100 +++ makeinclude.in -@@ -49,8 +49,8 @@ SHELL = /bin/sh - STRIP = strip - - # compiler names: --CXX = @CXX@ --CC = @CC@ -+CXX = $(LIBTOOL) @CXX@ -+CC = $(LIBTOOL) @CC@ - MAKEDEPEND = @MAKEDEPEND@ - - # flags for C++ compiler: -@@ -60,6 +60,7 @@ CXXFLAGS = $(OPTIM) @LARGEFILE@ @CPPFLAG - - # program to make the archive: - LIBNAME = @LIBNAME@ -+LIBTOOL = @LIBTOOL@ - FLLIBNAME = @FLLIBNAME@ - GLLIBNAME = @GLLIBNAME@ - IMGLIBNAME = @IMGLIBNAME@ -@@ -74,7 +75,8 @@ DSOCOMMAND = @DSOCOMMAND@ - - # libraries to link with: - AUDIOLIBS = @AUDIOLIBS@ --LDLIBS = @LDFLAGS@ @LIBS@ -+#LDLIBS = @LDFLAGS@ @LIBS@ -+LDLIBS = $(GLDLIBS) - GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ - LINKFLTK = @LINKFLTK@ - LINKFLTKGL = @LINKFLTKGL@ -@@ -86,6 +88,12 @@ IMAGELIBS = -L../lib @IMAGELIBS@ - # image libraries to build... - IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@ - -+# installation programs: -+INSTALL_BIN =$(LIBTOOL) cp -+INSTALL_DATA =cp -+INSTALL_LIB =$(LIBTOOL) cp -+INSTALL_MAN =cp -+ - # The extension to use for executables... - EXEEXT = @EXEEXT@ - -@@ -114,7 +122,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ - .SILENT: - - # Build commands and filename extensions... --.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) -+.SUFFIXES: .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT) +@@ -134,16 +135,16 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ .o$(EXEEXT): echo Linking $@... -@@ -129,7 +137,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ +- $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ ++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(POSTBUILD) $@ ../FL/mac.r + + .c.o: + echo Compiling $<... +- $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< ++ ${LIBTOOL} --mode=compile $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< + + .cxx.o: echo Compiling $<... - $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< +- $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< ++ ${LIBTOOL} --mode=compile $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< --.man.0 .man.1 .man.3: -+.man.0 .man.1 .man.3 .man.6: + .man.0 .man.1 .man.3 .man.6: echo Formatting $<... - rm -f $@ - $(NROFF) -man $< >$@ diff --git a/x11/fltk/patches/patch-ag b/x11/fltk/patches/patch-ag index 2dc7cfdaa83..fead731b202 100644 --- a/x11/fltk/patches/patch-ag +++ b/x11/fltk/patches/patch-ag @@ -1,88 +1,88 @@ -$NetBSD: patch-ag,v 1.6 2007/01/02 12:42:45 joerg Exp $ +$NetBSD: patch-ag,v 1.7 2008/11/10 19:03:15 adam Exp $ ---- src/Makefile.orig 2005-08-08 02:54:30.000000000 +0200 +--- src/Makefile.orig 2008-02-27 16:00:31.000000000 +0100 +++ src/Makefile -@@ -200,6 +200,10 @@ $(LIBNAME): $(OBJECTS) +@@ -208,6 +208,10 @@ $(LIBNAME): $(OBJECTS) $(LIBCOMMAND) $@ $(OBJECTS) $(RANLIB) $@ +libfltk.la: $(OBJECTS) + echo $(CXX) $@ ... -+ $(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG ++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + libfltk.so.1.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(OBJECTS) -@@ -236,6 +240,10 @@ $(FLLIBNAME): $(FLOBJECTS) +@@ -244,6 +248,10 @@ $(FLLIBNAME): $(FLOBJECTS) $(LIBCOMMAND) $@ $(FLOBJECTS) $(RANLIB) $@ +libfltk_forms.la: $(FLOBJECTS) + echo $(CXX) $@ ... -+ $(CXX) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG ++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1 echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -@@ -272,6 +280,10 @@ $(GLLIBNAME): $(GLOBJECTS) +@@ -280,6 +288,10 @@ $(GLLIBNAME): $(GLOBJECTS) $(LIBCOMMAND) $@ $(GLOBJECTS) $(RANLIB) $@ +libfltk_gl.la: $(GLOBJECTS) + echo $(CXX) $@ ... -+ $(CXX) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG ++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1 echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -@@ -308,6 +320,10 @@ $(IMGLIBNAME): $(IMGOBJECTS) +@@ -316,6 +328,10 @@ $(IMGLIBNAME): $(IMGOBJECTS) $(LIBCOMMAND) $@ $(IMGOBJECTS) $(RANLIB) $@ +libfltk_images.la: $(IMGOBJECTS) + echo $(CXX) $@ ... -+ $(CXX) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG ++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -@@ -477,6 +493,9 @@ install: $(LIBNAME) $(DSONAME) \ +@@ -504,6 +520,9 @@ install: $(LIBNAME) $(DSONAME) \ $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \ fi $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME) + if test x$(DSONAME) = xlibfltk.la; then\ -+ $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \ ++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \ + fi if test x$(DSONAME) = xlibfltk.so.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ - $(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \ -@@ -500,6 +519,9 @@ install: $(LIBNAME) $(DSONAME) \ - $(CP) libfltk_s.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_s.a; \ + $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \ +@@ -523,6 +542,9 @@ install: $(LIBNAME) $(DSONAME) \ + $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ + $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \ fi + if test x$(FLDSONAME) = xlibfltk_forms.la; then\ -+ $(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \ ++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \ + fi if test x$(DSONAME) = xcygfltknox-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ - $(CP) $(DSONAME) $(DESTDIR)$(bindir); \ -@@ -522,6 +544,9 @@ install: $(LIBNAME) $(DSONAME) \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \ + $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ +@@ -540,6 +562,9 @@ install: $(LIBNAME) $(DSONAME) \ + $(INSTALL_LIB) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\ fi + if test x$(GLDSONAME) = xlibfltk_gl.la; then\ -+ $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \ ++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \ + fi if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ - $(CP) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \ -@@ -594,6 +619,9 @@ install: $(LIBNAME) $(DSONAME) \ - $(CP) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \ + $(INSTALL_LIB) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \ +@@ -597,6 +622,9 @@ install: $(LIBNAME) $(DSONAME) \ + $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ + $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ fi + if test x$(IMGDSONAME) = xlibfltk_images.la; then\ -+ $(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \ ++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \ + fi if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ - $(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \ + $(INSTALL_LIB) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \ |