CVS commit: pkgsrc/x11/fltk13

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Jul  5 15:52:47 UTC 2024

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

Log Message:
x11/fltk13: Fix linking of libraries


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/fltk13/distinfo
cvs rdiff -u -r1.1 -r1.2 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/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.46 pkgsrc/x11/fltk13/Makefile:1.47
--- pkgsrc/x11/fltk13/Makefile:1.46     Wed May  8 12:49:05 2024
+++ pkgsrc/x11/fltk13/Makefile  Fri Jul  5 15:52:47 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2024/05/08 12:49:05 micha Exp $
+# $NetBSD: Makefile,v 1.47 2024/07/05 15:52:47 micha Exp $
 
 DISTNAME=      fltk-1.3.9-source
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/-source//}
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=    x11

Index: pkgsrc/x11/fltk13/distinfo
diff -u pkgsrc/x11/fltk13/distinfo:1.18 pkgsrc/x11/fltk13/distinfo:1.19
--- pkgsrc/x11/fltk13/distinfo:1.18     Wed May  8 12:49:05 2024
+++ pkgsrc/x11/fltk13/distinfo  Fri Jul  5 15:52:47 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2024/05/08 12:49:05 micha Exp $
+$NetBSD: distinfo,v 1.19 2024/07/05 15:52:47 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) = 463cc086e74fc00544f67ba8440ea48ae7e7e35a
+SHA1 (patch-src_Makefile) = ca4a5f02173d1468ea0deb085b69df8b9a6507f8
 SHA1 (patch-test_Makefile) = c41d0184eed167e1ab8261fbee6cba96595c6c16

Index: pkgsrc/x11/fltk13/patches/patch-src_Makefile
diff -u pkgsrc/x11/fltk13/patches/patch-src_Makefile:1.1 pkgsrc/x11/fltk13/patches/patch-src_Makefile:1.2
--- pkgsrc/x11/fltk13/patches/patch-src_Makefile:1.1    Mon May 17 10:38:48 2021
+++ pkgsrc/x11/fltk13/patches/patch-src_Makefile        Fri Jul  5 15:52:47 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_Makefile,v 1.1 2021/05/17 10:38:48 micha Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2024/07/05 15:52:47 micha Exp $
 
 Use libtool.
 Upstream will not merge this (libtool is listed as not acceptable).
 
---- src/Makefile.orig  2021-05-04 17:36:17.000000000 +0000
+--- src/Makefile.orig  2023-12-09 13:58:40.000000000 +0000
 +++ src/Makefile
 @@ -235,6 +235,10 @@ $(LIBNAME): $(OBJECTS)
        $(LIBCOMMAND) $@ $(OBJECTS)
@@ -22,7 +22,7 @@ Upstream will not merge this (libtool is
  
 +libfltk_forms.la: $(FLOBJECTS)
 +      echo $(CXX) $@ ...
-+      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 -L. -lfltk $(LDLIBS)
 +
  libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
        echo $(DSOCOMMAND) $@ ...
@@ -33,7 +33,7 @@ Upstream will not merge this (libtool is
  
 +libfltk_gl.la: $(GLOBJECTS)
 +      echo $(CXX) $@ ...
-+      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 -L. -lfltk $(LDLIBS) $(GLDLIBS)
 +
  libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
        echo $(DSOCOMMAND) $@ ...
@@ -44,7 +44,7 @@ Upstream will not merge this (libtool is
  
 +libfltk_images.la: $(IMGOBJECTS)
 +      echo $(CXX) $@ ...
-+      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 -L. $(IMAGELIBS) -lfltk $(LDLIBS)
 +
  libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
        echo $(DSOCOMMAND) $@ ...