CVS commit: pkgsrc/x11/fltk13

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed Jul 10 11:03:43 UTC 2024

Modified Files:
        pkgsrc/x11/fltk13: distinfo
        pkgsrc/x11/fltk13/patches: patch-src_Makefile

Log Message:
x11/fltk13: Fix dependencies

No bump for PKGREVISION (formerly the build failed if libs are not created
in matching order by coincidence).


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/fltk13/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/fltk13/distinfo
diff -u pkgsrc/x11/fltk13/distinfo:1.19 pkgsrc/x11/fltk13/distinfo:1.20
--- pkgsrc/x11/fltk13/distinfo:1.19     Fri Jul  5 15:52:47 2024
+++ pkgsrc/x11/fltk13/distinfo  Wed Jul 10 11:03:43 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2024/07/05 15:52:47 micha Exp $
+$NetBSD: distinfo,v 1.20 2024/07/10 11:03:43 micha Exp $
 
 BLAKE2s (fltk-1.3.9-source.tar.bz2) = 69983849a576c8adfaedcf2f9cfdbbc25463f0b157711655f8a09981e492eb84
 SHA512 (fltk-1.3.9-source.tar.bz2) = 8de8596bdc355c618cc85b8aa3a3f6aeb3650d3d252d63cec2f2c440f915b33cb3cb7cd47e22813f30a44cc7183bf808fc78c9bd6b6129f0202a07d40e46085b
@@ -8,5 +8,5 @@ SHA1 (patch-configure) = 6e5ea65207d7215
 SHA1 (patch-documentation_Makefile) = 4c0c4243311c170d6c645db41b8bb1821d053712
 SHA1 (patch-fluid_Makefile) = 6033e485a8ea7590fe68d9049645a1035326f8ce
 SHA1 (patch-makeinclude.in) = e353cdc721c856e9c8839eb6334de59981e70d90
-SHA1 (patch-src_Makefile) = ca4a5f02173d1468ea0deb085b69df8b9a6507f8
+SHA1 (patch-src_Makefile) = 13784fa633306f3a3f358d6a6600da7c3e3a3352
 SHA1 (patch-test_Makefile) = c41d0184eed167e1ab8261fbee6cba96595c6c16

Index: pkgsrc/x11/fltk13/patches/patch-src_Makefile
diff -u pkgsrc/x11/fltk13/patches/patch-src_Makefile:1.2 pkgsrc/x11/fltk13/patches/patch-src_Makefile:1.3
--- pkgsrc/x11/fltk13/patches/patch-src_Makefile:1.2    Fri Jul  5 15:52:47 2024
+++ pkgsrc/x11/fltk13/patches/patch-src_Makefile        Wed Jul 10 11:03:43 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile,v 1.2 2024/07/05 15:52:47 micha Exp $
+$NetBSD: patch-src_Makefile,v 1.3 2024/07/10 11:03:43 micha Exp $
 
 Use libtool.
 Upstream will not merge this (libtool is listed as not acceptable).
@@ -20,7 +20,7 @@ Upstream will not merge this (libtool is
        $(LIBCOMMAND) $@ $(FLOBJECTS)
        $(RANLIB) $@
  
-+libfltk_forms.la: $(FLOBJECTS)
++libfltk_forms.la: $(FLOBJECTS) libfltk.la
 +      echo $(CXX) $@ ...
 +      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 -L. -lfltk $(LDLIBS)
 +
@@ -31,7 +31,7 @@ Upstream will not merge this (libtool is
        $(LIBCOMMAND) $@ $(GLOBJECTS)
        $(RANLIB) $@
  
-+libfltk_gl.la: $(GLOBJECTS)
++libfltk_gl.la: $(GLOBJECTS) libfltk.la
 +      echo $(CXX) $@ ...
 +      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 -L. -lfltk $(LDLIBS) $(GLDLIBS)
 +
@@ -42,7 +42,7 @@ Upstream will not merge this (libtool is
        $(LIBCOMMAND) $@ $(IMGOBJECTS)
        $(RANLIB) $@
  
-+libfltk_images.la: $(IMGOBJECTS)
++libfltk_images.la: $(IMGOBJECTS) libfltk.la
 +      echo $(CXX) $@ ...
 +      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 -L. $(IMAGELIBS) -lfltk $(LDLIBS)
 +