CVS commit: pkgsrc/x11/fltk13

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Mar 15 22:41:05 UTC 2020

Modified Files:
        pkgsrc/x11/fltk13: Makefile buildlink3.mk

Log Message:
x11/fltk13: remove redundant includes


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/fltk13/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/fltk13/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.32 pkgsrc/x11/fltk13/Makefile:1.33
--- pkgsrc/x11/fltk13/Makefile:1.32     Sun Nov  3 09:14:08 2019
+++ pkgsrc/x11/fltk13/Makefile  Sun Mar 15 22:41:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/11/03 09:14:08 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2020/03/15 22:41:05 rillig Exp $
 
 DISTNAME=      fltk-1.3.5-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -24,7 +24,6 @@ PKG_SUGGESTED_OPTIONS=        opengl # cairo
 #PLIST_VARS+=          cairo
 PLIST_VARS+=           opengl
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
 PTHREAD_OPTS+=         require

Index: pkgsrc/x11/fltk13/buildlink3.mk
diff -u pkgsrc/x11/fltk13/buildlink3.mk:1.13 pkgsrc/x11/fltk13/buildlink3.mk:1.14
--- pkgsrc/x11/fltk13/buildlink3.mk:1.13        Sun Nov  3 09:14:08 2019
+++ pkgsrc/x11/fltk13/buildlink3.mk     Sun Mar 15 22:41:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2019/11/03 09:14:08 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2020/03/15 22:41:05 rillig Exp $
 
 BUILDLINK_TREE+=       fltk
 
@@ -11,11 +11,10 @@ BUILDLINK_PKGSRCDIR.fltk?=  ../../x11/flt
 BUILDLINK_FILES.fltk+=         include/Fl/*
 
 pkgbase := fltk
-.include "../../mk/bsd.fast.prefs.mk"
 .include "../../mk/pkg-build-options.mk"
 
 # For "opengl" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mopengl)
+.if ${PKG_BUILD_OPTIONS.fltk:Mopengl}
 .  if ${OPSYS} != "Darwin"
 .    include "../../graphics/MesaLib/buildlink3.mk"
 .    include "../../graphics/glu/buildlink3.mk"