Thu Mar 26 22:02:29 2020 UTC ()
Use a include path that actually exists.


(joerg)
diff -r1.6 -r1.7 pkgsrc/x11/tk/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/x11/tk/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/tk/options.mk 2020/03/26 13:50:27 1.6
+++ pkgsrc/x11/tk/options.mk 2020/03/26 22:02:29 1.7
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: options.mk,v 1.6 2020/03/26 13:50:27 nia Exp $ 1# $NetBSD: options.mk,v 1.7 2020/03/26 22:02:29 joerg Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tk 3PKG_OPTIONS_VAR= PKG_OPTIONS.tk
4PKG_SUPPORTED_OPTIONS= threads debug xft2 4PKG_SUPPORTED_OPTIONS= threads debug xft2
5PKG_SUGGESTED_OPTIONS= threads 5PKG_SUGGESTED_OPTIONS= threads
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PLIST_VARS+= aqua 9PLIST_VARS+= aqua
10 10
11.if ${OPSYS} != "Darwin" 11.if ${OPSYS} != "Darwin"
12PKG_SUGGESTED_OPTIONS+= xft2 12PKG_SUGGESTED_OPTIONS+= xft2
13.else 13.else
14PKG_SUPPORTED_OPTIONS+= aqua 14PKG_SUPPORTED_OPTIONS+= aqua
15.endif 15.endif
16 16
17.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
18 18
19# IMPORTANT: This option should be enabled on a system without X11. 19# IMPORTANT: This option should be enabled on a system without X11.
20# Otherwise some X11 headers are installed and will break X11 compatibility. 20# Otherwise some X11 headers are installed and will break X11 compatibility.
21.if !empty(PKG_OPTIONS:Maqua) 21.if !empty(PKG_OPTIONS:Maqua)
22CONFIGURE_ARGS+= --enable-aqua 22CONFIGURE_ARGS+= --enable-aqua
23PLIST.aqua= yes 23PLIST.aqua= yes
24.else 24.else
25.include "../../x11/libX11/buildlink3.mk" 25.include "../../x11/libX11/buildlink3.mk"
26.include "../../x11/libXext/buildlink3.mk" 26.include "../../x11/libXext/buildlink3.mk"
27.include "../../x11/libXScrnSaver/buildlink.mk" 27.include "../../x11/libXScrnSaver/buildlink3.mk"
28.endif 28.endif
29 29
30.if !empty(PKG_OPTIONS:Mdebug) 30.if !empty(PKG_OPTIONS:Mdebug)
31CONFIGURE_ARGS+= --enable-symbols 31CONFIGURE_ARGS+= --enable-symbols
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mthreads) 34.if !empty(PKG_OPTIONS:Mthreads)
35CONFIGURE_ARGS+= --enable-threads 35CONFIGURE_ARGS+= --enable-threads
36.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
37.else 37.else
38CONFIGURE_ARGS+= --disable-threads 38CONFIGURE_ARGS+= --disable-threads
39.endif 39.endif
40 40