pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/hs-X11-xft Remove unnecessary .include
details: https://anonhg.NetBSD.org/pkgsrc/rev/4a8462143d86
branches: trunk
changeset: 347453:4a8462143d86
user: pho <pho%pkgsrc.org@localhost>
date: Sat Jan 11 13:50:07 2020 +0000
description:
Remove unnecessary .include
diffstat:
x11/hs-X11-xft/Makefile | 9 +++------
x11/hs-X11-xft/buildlink3.mk | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
diffs (45 lines):
diff -r e850313b27b5 -r 4a8462143d86 x11/hs-X11-xft/Makefile
--- a/x11/hs-X11-xft/Makefile Sat Jan 11 13:45:37 2020 +0000
+++ b/x11/hs-X11-xft/Makefile Sat Jan 11 13:50:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/02 16:52:57 pho Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/11 13:50:07 pho Exp $
DISTNAME= X11-xft-0.3.1
PKGREVISION= 4
@@ -11,13 +11,10 @@
# Work around a Cabal bug. It ignores "ld-options" in
# {package}.buildinfo while linking shared libraries:
# https://github.com/haskell/cabal/issues/4925
-HASKELL_ENABLE_SHARED_LIBRARY= no
+HASKELL_ENABLE_SHARED_LIBRARY= no
+.include "../../mk/haskell.mk"
.include "../../devel/hs-utf8-string/buildlink3.mk"
-.include "../../mk/haskell.mk"
.include "../../x11/hs-X11/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e850313b27b5 -r 4a8462143d86 x11/hs-X11-xft/buildlink3.mk
--- a/x11/hs-X11-xft/buildlink3.mk Sat Jan 11 13:45:37 2020 +0000
+++ b/x11/hs-X11-xft/buildlink3.mk Sat Jan 11 13:50:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/03/12 11:15:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2020/01/11 13:50:07 pho Exp $
BUILDLINK_TREE+= hs-X11-xft
@@ -9,9 +9,9 @@
BUILDLINK_ABI_DEPENDS.hs-X11-xft+= hs-X11-xft>=0.3.1nb4
BUILDLINK_PKGSRCDIR.hs-X11-xft?= ../../x11/hs-X11-xft
-.include "../../x11/libXft/buildlink3.mk"
.include "../../devel/hs-utf8-string/buildlink3.mk"
.include "../../x11/hs-X11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
.endif # HS_X11_XFT_BUILDLINK3_MK
BUILDLINK_TREE+= -hs-X11-xft
Home |
Main Index |
Thread Index |
Old Index