pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/libfm libfm: fix hard-coded paths
details: https://anonhg.NetBSD.org/pkgsrc/rev/23a6bbda3df9
branches: trunk
changeset: 426464:23a6bbda3df9
user: gutteridge <gutteridge%pkgsrc.org@localhost>
date: Tue Mar 31 22:44:54 2020 +0000
description:
libfm: fix hard-coded paths
This package has several hard-coded paths which are incorrect from our
perspective (one of which has a typo in it, and wouldn't work anywhere)
and need adjustment. While here, also correct some issues that pkglint
noted.
diffstat:
sysutils/libfm/Makefile | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diffs (41 lines):
diff -r 12a3b65b91bf -r 23a6bbda3df9 sysutils/libfm/Makefile
--- a/sysutils/libfm/Makefile Tue Mar 31 22:38:55 2020 +0000
+++ b/sysutils/libfm/Makefile Tue Mar 31 22:44:54 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2020/03/20 11:58:21 nia Exp $
+# $NetBSD: Makefile,v 1.18 2020/03/31 22:44:54 gutteridge Exp $
#
DISTNAME= libfm-1.3.1
-PKGREVISION= 3
-CATEGORIES= devel
+PKGREVISION= 4
+CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
EXTRACT_SUFX= .tar.xz
@@ -26,12 +26,22 @@
CONF_FILES+= share/examples/libfm/libfm.conf \
${PKG_SYSCONFDIR}/libfm/libfm.conf
+SUBST_CLASSES+= prefix
+SUBST_MESSAGE.prefix= Fixing paths.
+SUBST_STAGE.prefix= pre-configure
+SUBST_FILES.prefix= src/base/fm-file-info.c
+SUBST_FILES.prefix+= src/modules/vfs-menu.c
+# Upstream has a typo in a hard-coded path of "xgd" where they mean "xdg".
+# On the next update, check vfs-menu.c, as this may be corrected to "xdg".
+SUBST_SED.prefix= -e 's,/etc/xgd,${PKG_SYSCONFDIR},g'
+SUBST_SED.prefix+= -e 's,/usr/share,${PREFIX}/share,g'
+
# XXX: walk-around bug in build wrappers
# they try to copy $PREFIX/include/libfm to work dir and there link libfm -> libfm-1.0 is resolved
# in the end a consumer of libfm cannot find nonexisting include/libfm
post-install:
- ${RUN} rm -f ${DESTDIR}${PREFIX}/include/libfm
- ${RUN} cp -r ${DESTDIR}${PREFIX}/include/libfm-1.0 ${DESTDIR}${PREFIX}/include/libfm
+ ${RUN} ${RM} -f ${DESTDIR}${PREFIX}/include/libfm
+ ${RUN} ${CP} -r ${DESTDIR}${PREFIX}/include/libfm-1.0 ${DESTDIR}${PREFIX}/include/libfm
.include "../../graphics/libexif/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Home |
Main Index |
Thread Index |
Old Index