diff options
-rw-r--r-- | x11/fltk13/Makefile | 7 | ||||
-rw-r--r-- | x11/fltk13/PLIST | 6 | ||||
-rw-r--r-- | x11/fltk13/distinfo | 14 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-fluid_Makefile (renamed from x11/fltk13/patches/patch-ae) | 12 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-test_Makefile | 39 |
5 files changed, 45 insertions, 33 deletions
diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile index c924163cb6b..dc960b353a5 100644 --- a/x11/fltk13/Makefile +++ b/x11/fltk13/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.27 2019/07/08 10:36:25 nia Exp $ +# $NetBSD: Makefile,v 1.28 2019/07/16 11:21:25 micha Exp $ -DISTNAME= fltk-1.3.4-source +DISTNAME= fltk-1.3.5-source PKGNAME= ${DISTNAME:S/-source//} VERS= ${DISTNAME:S/fltk-//:S/-source//} CATEGORIES= x11 MASTER_SITES= http://fltk.org/pub/fltk/${VERS}/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://www.fltk.org/ +HOMEPAGE= http://www.fltk.org/ COMMENT= Fast Light Tool Kit for graphical user interfaces LICENSE= gnu-lgpl-v2 diff --git a/x11/fltk13/PLIST b/x11/fltk13/PLIST index 98a8ce8a089..7032a20afa5 100644 --- a/x11/fltk13/PLIST +++ b/x11/fltk13/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.5 2018/07/13 04:24:39 dbj Exp $ +@comment $NetBSD: PLIST,v 1.6 2019/07/16 11:21:25 micha Exp $ bin/fltk-config bin/fluid -include/FL/abi-version.h include/FL/Enumerations.H ${PLIST.cs}include/FL/Enumerations.h include/FL/Fl.H @@ -248,6 +247,7 @@ include/FL/Fl_XBM_Image.H ${PLIST.cs}include/FL/Fl_XBM_Image.h include/FL/Fl_XPM_Image.H ${PLIST.cs}include/FL/Fl_XPM_Image.h +include/FL/abi-version.h include/FL/dirent.h include/FL/filename.H ${PLIST.cs}include/FL/filename.h @@ -278,6 +278,8 @@ include/FL/mac.H ${PLIST.cs}include/FL/mac.h include/FL/math.h include/FL/names.h +include/FL/platform.H +${PLIST.cs}include/FL/platform.h include/FL/win32.H ${PLIST.cs}include/FL/win32.h include/FL/x.H diff --git a/x11/fltk13/distinfo b/x11/fltk13/distinfo index 2b306fdafe3..5480d28dd40 100644 --- a/x11/fltk13/distinfo +++ b/x11/fltk13/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.10 2018/07/13 04:24:39 dbj Exp $ +$NetBSD: distinfo,v 1.11 2019/07/16 11:21:25 micha Exp $ -SHA1 (fltk-1.3.4-source.tar.gz) = 3c58770d2920a219d07641fa403de2c8c57bb7f0 -RMD160 (fltk-1.3.4-source.tar.gz) = a660ec3b18e89426c2edb76818bbfcec6a6f5890 -SHA512 (fltk-1.3.4-source.tar.gz) = 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2 -Size (fltk-1.3.4-source.tar.gz) = 5284217 bytes +SHA1 (fltk-1.3.5-source.tar.bz2) = 30ee0a45d0f7f8dfc3139bb237440d3d2784b8a8 +RMD160 (fltk-1.3.5-source.tar.bz2) = 09713fde1b1056633750a5b4964460a370a6cf2e +SHA512 (fltk-1.3.5-source.tar.bz2) = dee280990a5bf846c9fa44b2e1997d7829e25e17b32e36ea8cf50457c4f1008c57f1cfcdce0b582f6722b33c9aa7b39d8f23cb289e3dff9d588f1a66d7179164 +Size (fltk-1.3.5-source.tar.bz2) = 4497531 bytes SHA1 (patch-aa) = 335993d2e6b232b0539e583fb2463bafdffbb9b3 SHA1 (patch-ac) = 4ee251d11b3840f525f473fe6c320e4d16ac95e1 SHA1 (patch-ad) = 5a17f8fb46ce65b4795618d6aa22f445b55f6aa8 -SHA1 (patch-ae) = 4952426cd6ecc67921779de95f68835aa3bdaa9c SHA1 (patch-af) = 4c2b772cc8bd6729aeb94ee4e871c2d982356616 SHA1 (patch-ag) = 2339189b49551d27a8246d9efd9fed4b26732dde -SHA1 (patch-test_Makefile) = a2e47c0c21983b8906898eea3f19b19c2f09386c +SHA1 (patch-fluid_Makefile) = 28440f02095116302bf58319c397b1b9b921027d +SHA1 (patch-test_Makefile) = ff615f828ee5aac0d44023d190f26e260baf66a2 diff --git a/x11/fltk13/patches/patch-ae b/x11/fltk13/patches/patch-fluid_Makefile index 7457e85aaa2..af8f530bae0 100644 --- a/x11/fltk13/patches/patch-ae +++ b/x11/fltk13/patches/patch-fluid_Makefile @@ -1,6 +1,8 @@ -$NetBSD: patch-ae,v 1.3 2018/07/13 04:24:39 dbj Exp $ +$NetBSD: patch-fluid_Makefile,v 1.1 2019/07/16 11:21:25 micha Exp $ ---- fluid/Makefile.orig 2016-07-17 19:51:54.000000000 +0000 +Use libtool. + +--- fluid/Makefile.orig 2019-03-03 08:40:23.000000000 +0000 +++ fluid/Makefile @@ -50,7 +50,7 @@ all: $(FLUID) fluid$(EXEEXT) fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ @@ -8,10 +10,10 @@ $NetBSD: patch-ae,v 1.3 2018/07/13 04:24:39 dbj Exp $ echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) + ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) $(RM) -r -f fluid.app/Contents/MacOS + $(OSX_ONLY) mkdir fluid.app/Contents/MacOS $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS - - fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ -@@ -72,7 +72,7 @@ include makedepend +@@ -74,7 +74,7 @@ include makedepend install: all echo "Installing FLUID in $(DESTDIR)$(bindir)..." -$(INSTALL_DIR) $(DESTDIR)$(bindir) diff --git a/x11/fltk13/patches/patch-test_Makefile b/x11/fltk13/patches/patch-test_Makefile index bb670147e39..f0a093d9182 100644 --- a/x11/fltk13/patches/patch-test_Makefile +++ b/x11/fltk13/patches/patch-test_Makefile @@ -1,22 +1,27 @@ -$NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ +$NetBSD: patch-test_Makefile,v 1.5 2019/07/16 11:21:25 micha Exp $ ---- test/Makefile.orig 2016-09-03 08:14:43.000000000 +0000 +Use libtool. + +--- test/Makefile.orig 2019-03-03 08:40:23.000000000 +0000 +++ test/Makefile -@@ -308,19 +308,19 @@ buttons$(EXEEXT): buttons.o +@@ -308,14 +308,14 @@ buttons$(EXEEXT): buttons.o blocks$(EXEEXT): blocks.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS) + $(OSX_ONLY) $(RM) -r -f blocks.app/Contents/MacOS + $(OSX_ONLY) mkdir blocks.app/Contents/MacOS $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS checkers$(EXEEXT): checkers.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS) + $(OSX_ONLY) $(RM) -r -f checkers.app/Contents/MacOS + $(OSX_ONLY) mkdir checkers.app/Contents/MacOS $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS - - clock$(EXEEXT): clock.o +@@ -324,7 +324,7 @@ clock$(EXEEXT): clock.o colbrowser$(EXEEXT): colbrowser.o echo Linking $@... @@ -25,7 +30,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ $(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources $(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/ -@@ -333,21 +333,21 @@ curve$(EXEEXT): curve.o +@@ -337,21 +337,21 @@ curve$(EXEEXT): curve.o demo$(EXEEXT): demo.o echo Linking $@... @@ -50,7 +55,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ $(OSX_ONLY) cp -f ../ide/Xcode4/plists/editor-Info.plist editor.app/Contents/Info.plist -@@ -356,21 +356,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu +@@ -360,21 +360,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) echo Linking $@... @@ -75,7 +80,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ $(OSX_ONLY) mkdir -p help.app/Contents/Resources $(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/ -@@ -390,14 +390,14 @@ input_choice$(EXEEXT): input_choice.o +@@ -394,14 +394,14 @@ input_choice$(EXEEXT): input_choice.o keyboard$(EXEEXT): keyboard_ui.o keyboard.o echo Linking $@... @@ -92,7 +97,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ line_style$(EXEEXT): line_style.o -@@ -406,7 +406,7 @@ list_visuals$(EXEEXT): list_visuals.o +@@ -410,7 +410,7 @@ list_visuals$(EXEEXT): list_visuals.o mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o echo Linking $@... @@ -101,7 +106,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ mandelbrot_ui.o: mandelbrot_ui.h mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT) -@@ -419,7 +419,7 @@ minimum$(EXEEXT): minimum.o +@@ -423,7 +423,7 @@ minimum$(EXEEXT): minimum.o native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME) echo Linking $@... @@ -110,7 +115,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ navigation$(EXEEXT): navigation.o -@@ -428,7 +428,7 @@ offscreen$(EXEEXT): offscreen.o +@@ -432,7 +432,7 @@ offscreen$(EXEEXT): offscreen.o output$(EXEEXT): output.o $(FLLIBNAME) echo Linking $@... @@ -119,7 +124,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ overlay$(EXEEXT): overlay.o -@@ -439,7 +439,7 @@ pixmap$(EXEEXT): pixmap.o +@@ -443,7 +443,7 @@ pixmap$(EXEEXT): pixmap.o pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME) echo Linking $@... @@ -128,14 +133,16 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ $(OSX_ONLY) ../fltk-config --post $@ preferences$(EXEEXT): preferences.o -@@ -463,13 +463,13 @@ subwindow$(EXEEXT): subwindow.o +@@ -467,7 +467,7 @@ subwindow$(EXEEXT): subwindow.o sudoku: sudoku.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) $(RM) -r -f sudoku.app/Contents/MacOS + $(OSX_ONLY) mkdir sudoku.app/Contents/MacOS $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS - +@@ -475,7 +475,7 @@ sudoku: sudoku.o sudoku.exe: sudoku.o sudoku.rc echo Linking $@... $(RC) sudoku.rc sudokures.o @@ -144,7 +151,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ symbols$(EXEEXT): symbols.o -@@ -501,7 +501,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME) +@@ -507,7 +507,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME) # OpenGL demos... CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o echo Linking $@... @@ -153,7 +160,7 @@ $NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ CubeMain.o CubeView.o CubeViewUI.o \ $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) $(OSX_ONLY) ../fltk-config --post $@ -@@ -512,37 +512,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f +@@ -518,37 +518,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f cube$(EXEEXT): cube.o echo Linking $@... |