CVS commit: pkgsrc/x11/fltk13

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Jul 12 10:27:14 UTC 2024

Modified Files:
        pkgsrc/x11/fltk13: Makefile distinfo
        pkgsrc/x11/fltk13/patches: patch-makeinclude.in

Log Message:
x11/fltk13: Fix linking of libraries again

Do not link shared libraries against static libfltk.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/fltk13/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/fltk13/patches/patch-makeinclude.in

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/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.47 pkgsrc/x11/fltk13/Makefile:1.48
--- pkgsrc/x11/fltk13/Makefile:1.47     Fri Jul  5 15:52:47 2024
+++ pkgsrc/x11/fltk13/Makefile  Fri Jul 12 10:27:13 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2024/07/05 15:52:47 micha Exp $
+# $NetBSD: Makefile,v 1.48 2024/07/12 10:27:13 micha Exp $
 
 DISTNAME=      fltk-1.3.9-source
-PKGREVISION=   1
+PKGREVISION=   2
 PKGNAME=       ${DISTNAME:S/-source//}
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=    x11

Index: pkgsrc/x11/fltk13/distinfo
diff -u pkgsrc/x11/fltk13/distinfo:1.20 pkgsrc/x11/fltk13/distinfo:1.21
--- pkgsrc/x11/fltk13/distinfo:1.20     Wed Jul 10 11:03:43 2024
+++ pkgsrc/x11/fltk13/distinfo  Fri Jul 12 10:27:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2024/07/10 11:03:43 micha Exp $
+$NetBSD: distinfo,v 1.21 2024/07/12 10:27:13 micha Exp $
 
 BLAKE2s (fltk-1.3.9-source.tar.bz2) = 69983849a576c8adfaedcf2f9cfdbbc25463f0b157711655f8a09981e492eb84
 SHA512 (fltk-1.3.9-source.tar.bz2) = 8de8596bdc355c618cc85b8aa3a3f6aeb3650d3d252d63cec2f2c440f915b33cb3cb7cd47e22813f30a44cc7183bf808fc78c9bd6b6129f0202a07d40e46085b
@@ -7,6 +7,6 @@ SHA1 (patch-Makefile) = c10e99516649e8fc
 SHA1 (patch-configure) = 6e5ea65207d721552f1afaf9e13a5607ce12d288
 SHA1 (patch-documentation_Makefile) = 4c0c4243311c170d6c645db41b8bb1821d053712
 SHA1 (patch-fluid_Makefile) = 6033e485a8ea7590fe68d9049645a1035326f8ce
-SHA1 (patch-makeinclude.in) = e353cdc721c856e9c8839eb6334de59981e70d90
+SHA1 (patch-makeinclude.in) = c8edcedd4b75c8a53ef0be4a303cebd069a917ee
 SHA1 (patch-src_Makefile) = 13784fa633306f3a3f358d6a6600da7c3e3a3352
 SHA1 (patch-test_Makefile) = c41d0184eed167e1ab8261fbee6cba96595c6c16

Index: pkgsrc/x11/fltk13/patches/patch-makeinclude.in
diff -u pkgsrc/x11/fltk13/patches/patch-makeinclude.in:1.1 pkgsrc/x11/fltk13/patches/patch-makeinclude.in:1.2
--- pkgsrc/x11/fltk13/patches/patch-makeinclude.in:1.1  Mon May 17 10:38:48 2021
+++ pkgsrc/x11/fltk13/patches/patch-makeinclude.in      Fri Jul 12 10:27:14 2024
@@ -1,10 +1,20 @@
-$NetBSD: patch-makeinclude.in,v 1.1 2021/05/17 10:38:48 micha Exp $
+$NetBSD: patch-makeinclude.in,v 1.2 2024/07/12 10:27:14 micha Exp $
 
+Do not use the static libraries created in "../lib".
 Use libtool.
 Upstream will not merge this (libtool is listed as not acceptable).
 
---- makeinclude.in.orig        2021-05-04 17:36:17.000000000 +0000
+--- makeinclude.in.orig        2023-12-09 13:58:40.000000000 +0000
 +++ makeinclude.in
+@@ -100,7 +100,7 @@ LINKFLTKIMG        = @LINKFLTKIMG@ @LINKFLTK@ $
+ LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS)
+ FLTKCAIROOPTION = @FLTKCAIROOPTION@
+ LINKSHARED    = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS)
+-IMAGELIBS     = -L../lib @IMAGELIBS@
++IMAGELIBS     = @IMAGELIBS@
+ 
+ # image libraries to build...
+ IMAGEDIRS     = @JPEG@ @ZLIB@ @PNG@
 @@ -152,20 +152,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
  
  .o$(EXEEXT):