CVS commit: pkgsrc/x11/hs-X11-xft

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 11 13:50:07 UTC 2020

Modified Files:
        pkgsrc/x11/hs-X11-xft: Makefile buildlink3.mk

Log Message:
Remove unnecessary .include


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/hs-X11-xft/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/hs-X11-xft/buildlink3.mk

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

Modified files:

Index: pkgsrc/x11/hs-X11-xft/Makefile
diff -u pkgsrc/x11/hs-X11-xft/Makefile:1.7 pkgsrc/x11/hs-X11-xft/Makefile:1.8
--- pkgsrc/x11/hs-X11-xft/Makefile:1.7  Thu Jan  2 16:52:57 2020
+++ pkgsrc/x11/hs-X11-xft/Makefile      Sat Jan 11 13:50:07 2020
@@ -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 @@ LICENSE=    gnu-gpl-v2
 # 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 "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../mk/haskell.mk"
+.include "../../devel/hs-utf8-string/buildlink3.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"

Index: pkgsrc/x11/hs-X11-xft/buildlink3.mk
diff -u pkgsrc/x11/hs-X11-xft/buildlink3.mk:1.5 pkgsrc/x11/hs-X11-xft/buildlink3.mk:1.6
--- pkgsrc/x11/hs-X11-xft/buildlink3.mk:1.5     Mon Mar 12 11:15:51 2018
+++ pkgsrc/x11/hs-X11-xft/buildlink3.mk Sat Jan 11 13:50:07 2020
@@ -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_API_DEPENDS.hs-X11-xft+=      hs-X1
 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