CVS commit: pkgsrc/lang/smalltalk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 17 21:48:02 UTC 2024

Modified Files:
        pkgsrc/lang/smalltalk: options.mk

Log Message:
smalltalk: turning off the gtk option also turns off opengl

so move the opengl section into the gtk section


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/smalltalk/options.mk

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

Modified files:

Index: pkgsrc/lang/smalltalk/options.mk
diff -u pkgsrc/lang/smalltalk/options.mk:1.3 pkgsrc/lang/smalltalk/options.mk:1.4
--- pkgsrc/lang/smalltalk/options.mk:1.3        Sun Sep  1 13:06:25 2019
+++ pkgsrc/lang/smalltalk/options.mk    Sat Aug 17 21:48:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/09/01 13:06:25 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2024/08/17 21:48:02 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.smalltalk
 PKG_SUPPORTED_OPTIONS= cairo curses expat gdbm gtk opengl readline sdl sqlite tk
@@ -48,19 +48,19 @@ PLIST.blox=         yes
 .  include "../../devel/glib2/buildlink3.mk"
 .  include "../../devel/pango/buildlink3.mk"
 .  include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-glib --without-gtk
-.endif
-
-.if !empty(PKG_OPTIONS:Mopengl)
+# turning off gtk option also turns off opengl
+.  if !empty(PKG_OPTIONS:Mopengl)
 PLIST.opengl=          yes
-.  include "../../graphics/MesaLib/buildlink3.mk"
-.  include "../../graphics/glu/buildlink3.mk"
-.  include "../../graphics/freeglut/buildlink3.mk"
-.  include "../../x11/libICE/buildlink3.mk"
-.else
+.    include "../../graphics/MesaLib/buildlink3.mk"
+.    include "../../graphics/glu/buildlink3.mk"
+.    include "../../graphics/freeglut/buildlink3.mk"
+.    include "../../x11/libICE/buildlink3.mk"
+.  else
 CONFIGURE_ARGS+=       --disable-opengl
 CONFIGURE_ARGS+=       --disable-glut
+.  endif
+.else
+CONFIGURE_ARGS+=       --without-glib --without-gtk
 .endif
 
 .if !empty(PKG_OPTIONS:Mreadline)