CVS commit: pkgsrc/sysutils

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Mar 18 00:12:23 UTC 2021

Modified Files:
        pkgsrc/sysutils/libfm: Makefile buildlink3.mk
        pkgsrc/sysutils/lxpanel: Makefile
        pkgsrc/sysutils/pcmanfm: Makefile

Log Message:
Adjust libfm bl3 to include libexif, and rev bump dependencies

Packages that depend on libfm and use libtool need to link against
libexif, so reflect that in libfm's buildlink3.mk. (This will be more
relevant when lxhotkey is added. lxpanel does not directly depend on
libexif, so that's corrected here, too.)


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/libfm/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/libfm/buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/lxpanel/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/pcmanfm/Makefile

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

Modified files:

Index: pkgsrc/sysutils/libfm/Makefile
diff -u pkgsrc/sysutils/libfm/Makefile:1.20 pkgsrc/sysutils/libfm/Makefile:1.21
--- pkgsrc/sysutils/libfm/Makefile:1.20 Fri Mar  5 11:34:03 2021
+++ pkgsrc/sysutils/libfm/Makefile      Thu Mar 18 00:12:23 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2021/03/05 11:34:03 nia Exp $
+# $NetBSD: Makefile,v 1.21 2021/03/18 00:12:23 gutteridge Exp $
 #
 
 DISTNAME=      libfm-1.3.2
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/sysutils/libfm/buildlink3.mk
diff -u pkgsrc/sysutils/libfm/buildlink3.mk:1.12 pkgsrc/sysutils/libfm/buildlink3.mk:1.13
--- pkgsrc/sysutils/libfm/buildlink3.mk:1.12    Mon Aug 17 20:17:44 2020
+++ pkgsrc/sysutils/libfm/buildlink3.mk Thu Mar 18 00:12:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2020/08/17 20:17:44 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2021/03/18 00:12:23 gutteridge Exp $
 
 BUILDLINK_TREE+=       libfm
 
@@ -6,10 +6,11 @@ BUILDLINK_TREE+=      libfm
 LIBFM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libfm+=  libfm>=1.2.3
-BUILDLINK_ABI_DEPENDS.libfm?=  libfm>=1.3.1nb5
+BUILDLINK_ABI_DEPENDS.libfm?=  libfm>=1.3.2nb1
 BUILDLINK_PKGSRCDIR.libfm?=    ../../sysutils/libfm
 
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../sysutils/menu-cache/buildlink3.mk"
 .endif # LIBFM_BUILDLINK3_MK
 

Index: pkgsrc/sysutils/lxpanel/Makefile
diff -u pkgsrc/sysutils/lxpanel/Makefile:1.22 pkgsrc/sysutils/lxpanel/Makefile:1.23
--- pkgsrc/sysutils/lxpanel/Makefile:1.22       Tue Mar  9 01:57:43 2021
+++ pkgsrc/sysutils/lxpanel/Makefile    Thu Mar 18 00:12:23 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2021/03/09 01:57:43 gutteridge Exp $
+# $NetBSD: Makefile,v 1.23 2021/03/18 00:12:23 gutteridge Exp $
 
 DISTNAME=      lxpanel-0.10.1
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lxde/}
 EXTRACT_SUFX=  .tar.xz
@@ -39,7 +40,6 @@ CONF_FILES=   ${LXDE_CONF}/default/config     
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../sysutils/menu-cache/buildlink3.mk"
-.include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
 .include "../../sysutils/libfm/buildlink3.mk"
 .include "../../sysutils/libfm-extra/buildlink3.mk"

Index: pkgsrc/sysutils/pcmanfm/Makefile
diff -u pkgsrc/sysutils/pcmanfm/Makefile:1.49 pkgsrc/sysutils/pcmanfm/Makefile:1.50
--- pkgsrc/sysutils/pcmanfm/Makefile:1.49       Fri Mar  5 10:40:36 2021
+++ pkgsrc/sysutils/pcmanfm/Makefile    Thu Mar 18 00:12:23 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2021/03/05 10:40:36 nia Exp $
+# $NetBSD: Makefile,v 1.50 2021/03/18 00:12:23 gutteridge Exp $
 #
 
 DISTNAME=      pcmanfm-1.3.2
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
 EXTRACT_SUFX=  .tar.xz