svn commit: r452147 - in head: . Mk Mk/Uses databases/qdbm databases/qdbm-plus math/msieve multimedia/vlc net/linphone net/mediastreamer ports-mgmt/pkg security/putty

Sun Oct 15 14:05:06 UTC 2017

Author: madpilot
Date: Sun Oct 15 14:05:04 2017
New Revision: 452147
URL: https://svnweb.freebsd.org/changeset/ports/452147

Log:
  Retire WITHOUT_DEBUG flag.
  
  The flag has partial support across the tree, and the same effect
  can be obtained by using ".undef WITH_DEBUG".
  
  Reviewed by:		mat, rene
  Approved by:		portmgr (rene)
  Differential Revision:	https://reviews.freebsd.org/D12548

Modified:
  head/Mk/Uses/cargo.mk
  head/Mk/bsd.port.mk
  head/UPDATING
  head/databases/qdbm-plus/Makefile
  head/databases/qdbm/Makefile
  head/math/msieve/Makefile
  head/multimedia/vlc/Makefile
  head/net/linphone/Makefile
  head/net/mediastreamer/Makefile
  head/ports-mgmt/pkg/Makefile
  head/security/putty/Makefile

Modified: head/Mk/Uses/cargo.mk
==============================================================================

--- head/Mk/Uses/cargo.mk	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/Mk/Uses/cargo.mk	Sun Oct 15 14:05:04 2017	(r452147)
@@ -103,7 +103,7 @@ CARGO_INSTALL_ARGS+=	--features='${CARGO_FEATURES}'
 CARGO_TEST_ARGS+=	--features='${CARGO_FEATURES}'
 .endif
 
-.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG)
+.if !defined(WITH_DEBUG)
 CARGO_BUILD_ARGS+=	--release
 CARGO_TEST_ARGS+=	--release
 .else

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/Mk/bsd.port.mk	Sun Oct 15 14:05:04 2017	(r452147)
@@ -337,6 +337,9 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 #                         passed to the compiler by setting DEBUG_FLAGS. It is
 #                         set to "-g" at default.
 #
+#			  NOTE: to override a globally defined WITH_DEBUG at a
+#			        later time ".undef WITH_DEBUG" can be used
+#
 # WITH_DEBUG_PORTS		- A list of origins for which WITH_DEBUG will be set
 #
 # WITHOUT_SSP	- Disable SSP.
@@ -1681,7 +1684,7 @@ CFLAGS:=	${CFLAGS:C/${_CPUCFLAGS}//}
 .endif
 
 # Reset value from bsd.own.mk.
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 .if !defined(INSTALL_STRIPPED)
 STRIP=	#none
 MAKE_ENV+=	DONTSTRIP=yes

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/UPDATING	Sun Oct 15 14:05:04 2017	(r452147)
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20171015:
+  AFFECTS: people using WITHOUT_DEBUG
+  AUTHOR: madpilot at FreeBSD.org
+
+  The WITHOUT_DEBUG flag has been retired. It's only purpose was
+  to override a global WITH_DEBUG, if that was defined, but many
+  ports were ignoring such flag even if honouring WITH_DEBUG.
+
+  The same effect can be obtained using ".undef WITH_DEBUG" without
+  any special support in port Makefiles.
+
 20171012:
   AFFECTS: users of security/openssh-portable
   AUTHOR: bdrewery at FreeBSD.org

Modified: head/databases/qdbm-plus/Makefile
==============================================================================
--- head/databases/qdbm-plus/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/databases/qdbm-plus/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -27,7 +27,7 @@ CXXFLAGS+=	-fsigned-char -fPIC
 INSTALL_TARGET=	install-strip
 
 post-patch:
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 	@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
 .endif
 

Modified: head/databases/qdbm/Makefile
==============================================================================
--- head/databases/qdbm/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/databases/qdbm/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -30,7 +30,7 @@ INSTALL_TARGET=	install-strip
 PORTDOCS=	ChangeLog NEWS
 
 post-patch:
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 	@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
 .endif
 

Modified: head/math/msieve/Makefile
==============================================================================
--- head/math/msieve/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/math/msieve/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -28,7 +28,7 @@ OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math
-.if defined(WITHOUT_DEBUG) || !defined(WITH_DEBUG)
+.if !defined(WITH_DEBUG)
 CFLAGS+=	-fomit-frame-pointer -DNDEBUG
 .endif
 .endif

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/multimedia/vlc/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -54,7 +54,7 @@ CONFIGURE_ARGS=	--enable-avcodec --enable-avformat --e
 		--disable-wasapi --disable-x26410b \
 		--with-kde-solid=${PREFIX}/share/apps/solid/actions \
 		ac_cv_search_pthread_rwlock_init=-pthread
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/net/linphone/Makefile
==============================================================================
--- head/net/linphone/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/net/linphone/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -55,7 +55,7 @@ UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 
 VIDEO_CONFIGURE_ENABLE=	video
 
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 

Modified: head/net/mediastreamer/Makefile
==============================================================================
--- head/net/mediastreamer/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/net/mediastreamer/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -84,7 +84,7 @@ VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 XVIDEO_CONFIGURE_ENABLE=x11 xv
 XVIDEO_USE=		XORG=videoproto,x11,xv
 
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/ports-mgmt/pkg/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -33,7 +33,7 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
 .endif
 

Modified: head/security/putty/Makefile
==============================================================================
--- head/security/putty/Makefile	Sun Oct 15 13:31:43 2017	(r452146)
+++ head/security/putty/Makefile	Sun Oct 15 14:05:04 2017	(r452147)
@@ -72,7 +72,7 @@ _COMPAT=		-DNO_GSSAPI
 
 _COMPAT+=	-DOMIT_UTMP
 
-.if defined(WITH_DEBUG) && ${WITH_DEBUG} != "no"
+.if defined(WITH_DEBUG)
 XFLAGS=		-DDEBUG
 .endif
 
