svn commit: r482636 - branches/2018Q4/x11-toolkits/gtk30

[Jan Beich]

Author: jbeich
Date: Sun Oct 21 02:29:24 2018
New Revision: 482636
URL: https://svnweb.freebsd.org/changeset/ports/482636

Log:
  x11-toolkits/gtk30: back out r482635 (undo MFH r482634)
  
  $ make
  make: "/usr/ports/x11-toolkits/gtk30/Makefile" line 107: Malformed conditional (${PORT_OPTIONS:MWAYLAND})
  make: Fatal errors encountered -- cannot continue
  make: stopped in /usr/ports/x11-toolkits/gtk30
  
  Approved by:	ports-secteam blanket
  Pointy hat to:	jbeich (2018Q4 lacks r482189)

Modified:
  branches/2018Q4/x11-toolkits/gtk30/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/x11-toolkits/gtk30/Makefile
==============================================================================
--- branches/2018Q4/x11-toolkits/gtk30/Makefile	Sun Oct 21 01:15:24 2018	(r482635)
+++ branches/2018Q4/x11-toolkits/gtk30/Makefile	Sun Oct 21 02:29:24 2018	(r482636)
@@ -75,9 +75,6 @@ CLOUDPRINT_LIB_DEPENDS=	librest-0.7.so:devel/librest \
 			libsoup-2.4.so:devel/libsoup \
 			libjson-glib-1.0.so:devel/json-glib
 
-# don't explicitly disable debug, this causes segfaults. See ports r437293
-DEBUG_CONFIGURE_ON=	--enable-debug=yes
-
 WAYLAND_DESC=		GDK Wayland backend
 WAYLAND_CONFIGURE_ENABLE=	wayland-backend
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols \
@@ -86,6 +83,11 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/way
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_RUN_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_USE=		GL=egl
+
+.include <bsd.port.options.mk>
+
+# don't explicitly disable debug, this causes segfaults. ports r437293
+DEBUG_CONFIGURE_ON=	--enable-debug=yes
 
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_CONFIGURE_ENABLE=	wayland-backend