Index: archivers/paq/Makefile =================================================================== --- archivers/paq/Makefile +++ archivers/paq/Makefile @@ -31,7 +31,7 @@ ZPAQFLAGS= -Dunix -DNOJIT .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CXXFLAGS+= -DDEBUG .else CXXFLAGS+= -DNDEBUG Index: audio/cpige/Makefile =================================================================== --- audio/cpige/Makefile +++ audio/cpige/Makefile @@ -17,7 +17,7 @@ PLIST_FILES= bin/cpige -.ifdef(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CFLAGS+= -g -DDEBUG STRIP= .endif Index: audio/nuvolaplayer/Makefile =================================================================== --- audio/nuvolaplayer/Makefile +++ audio/nuvolaplayer/Makefile @@ -30,7 +30,7 @@ INSTALLS_ICONS= yes USE_LDCONFIG= yes -.ifdef(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--debug .else CONFIGURE_ARGS+=--no-debug Index: cad/qcad/Makefile =================================================================== --- cad/qcad/Makefile +++ cad/qcad/Makefile @@ -34,7 +34,7 @@ "" \ true -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) RESDIR= ${WRKSRC}/debug .else RESDIR= ${WRKSRC}/release Index: chinese/fcitx/Makefile =================================================================== --- chinese/fcitx/Makefile +++ chinese/fcitx/Makefile @@ -105,7 +105,7 @@ EXTRA_PATCHES+= ${FILESDIR}/tpunc-data_punc.mb.zh_CN .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_ARGS+= -DENABLE_DEBUG=ON .endif Index: converters/fribidi/Makefile =================================================================== --- converters/fribidi/Makefile +++ converters/fribidi/Makefile @@ -18,7 +18,7 @@ CONFIGURE_ARGS= --enable-static --without-glib INSTALL_TARGET= install-strip -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--disable-debug .endif Index: deskutils/fbreader/Makefile =================================================================== --- deskutils/fbreader/Makefile +++ deskutils/fbreader/Makefile @@ -21,7 +21,7 @@ GH_ACCOUNT= geometer GH_PROJECT= FBReader -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) STATUS= debug .else STATUS= release Index: devel/llvm-devel/Makefile =================================================================== --- devel/llvm-devel/Makefile +++ devel/llvm-devel/Makefile @@ -258,7 +258,7 @@ .include -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif Index: devel/llvm38/Makefile =================================================================== --- devel/llvm38/Makefile +++ devel/llvm38/Makefile @@ -88,7 +88,7 @@ GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif Index: devel/llvm39/Makefile =================================================================== --- devel/llvm39/Makefile +++ devel/llvm39/Makefile @@ -99,7 +99,7 @@ OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp-patch-bug32279 -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif Index: devel/llvm40/Makefile =================================================================== --- devel/llvm40/Makefile +++ devel/llvm40/Makefile @@ -94,7 +94,7 @@ OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp-patch-bug32279 -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif Index: devel/llvm50/Makefile =================================================================== --- devel/llvm50/Makefile +++ devel/llvm50/Makefile @@ -98,7 +98,7 @@ OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp-patch-bug32279 -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif Index: devel/tokamak/Makefile =================================================================== --- devel/tokamak/Makefile +++ devel/tokamak/Makefile @@ -31,7 +31,7 @@ .include -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) CPPFLAGS+= -DNDEBUG .endif Index: devel/yasm-devel/Makefile =================================================================== --- devel/yasm-devel/Makefile +++ devel/yasm-devel/Makefile @@ -31,7 +31,7 @@ .include -.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) CONFIGURE_ARGS+= --enable-debug .endif Index: emulators/x49gp/Makefile =================================================================== --- emulators/x49gp/Makefile +++ emulators/x49gp/Makefile @@ -43,7 +43,7 @@ SUB_FILES= hp50g.sh -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) MAKE_ENV+= DEBUGB=1 .endif Index: graphics/blender/Makefile =================================================================== --- graphics/blender/Makefile +++ graphics/blender/Makefile @@ -160,7 +160,7 @@ .include -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON .endif Index: graphics/cimg/Makefile =================================================================== --- graphics/cimg/Makefile +++ graphics/cimg/Makefile @@ -48,7 +48,7 @@ REINPLACE_ARGS= -i "" LIB_DEPENDS+= libboard.so:graphics/libboard -. if !defined(WITH_DEBUG) +. if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) LIB_DEPENDS+= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ Index: graphics/darktable/Makefile =================================================================== --- graphics/darktable/Makefile +++ graphics/darktable/Makefile @@ -124,7 +124,7 @@ CMAKE_ARGS+= -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif Index: graphics/lepton/Makefile =================================================================== --- graphics/lepton/Makefile +++ graphics/lepton/Makefile @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes TEST_TARGET= check CFLAGS+= -DBSD -DGIT_REVISION='\"${GH_TAGNAME}\"' -.ifndef WITH_DEBUG +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) CFLAGS+= -DNDEBUG .endif EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude dependencies Index: graphics/rawtherapee/Makefile =================================================================== --- graphics/rawtherapee/Makefile +++ graphics/rawtherapee/Makefile @@ -96,7 +96,7 @@ LDFLAGS+= ${OPENMP_FLAGS} .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) STRIP= .endif Index: irc/ircd-ratbox/Makefile =================================================================== --- irc/ircd-ratbox/Makefile +++ irc/ircd-ratbox/Makefile @@ -90,7 +90,7 @@ .endif post-patch: -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) ${REINPLACE_CMD} 's|@INSTALL@|@INSTALL@ -s|' ${WRKSRC}/install-mod.sh.in .endif Index: irc/kvirc/Makefile =================================================================== --- irc/kvirc/Makefile +++ irc/kvirc/Makefile @@ -45,8 +45,6 @@ PYTHON_USES= python PYTHON_CMAKE_OFF= -DWANT_PYTHON=no -DEBUG_CMAKE_ON= -DWITH_DEBUG=yes -DVERBOSE=yes - .if defined(PKGNAMESUFFIX) CONFLICTS_INSTALL= kvirc-4.* @@ -72,6 +70,12 @@ PLIST_SUB+= VER="${PORTVERSION:R}" +.include + +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) +CMAKE_FLAGS+= -DWITH_DEBUG=yes -DVERBOSE=yes +.endif + pre-fetch-PERL-on: @${ECHO_CMD} "=====================================================" @${ECHO_CMD} " Perl scripting requires perl with multiplicity" Index: lang/dmd2/Makefile =================================================================== --- lang/dmd2/Makefile +++ lang/dmd2/Makefile @@ -52,7 +52,7 @@ MODEL= 32 .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) MAKE_ARGS+= DEBUG_FLAGS=-g\ -DDEBUG=1\ -DUNITTEST BUILD=debug .endif Index: mail/batv-milter/Makefile =================================================================== --- mail/batv-milter/Makefile +++ mail/batv-milter/Makefile @@ -35,7 +35,7 @@ .include .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) SITE_SUB+= -e '\|confOPTIMIZE.*-g|s/^dnl //g' .endif @@ -49,7 +49,7 @@ ${SITE} > ${WCONF}/site.config.m4 post-install: -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/batv-filter .endif @${RM} ${MANPREFIX}/man/cat8/batv-filter.8 ${MANPREFIX}/man/cat8/batv-filter.8.gz Index: mail/dk-milter/Makefile =================================================================== --- mail/dk-milter/Makefile +++ mail/dk-milter/Makefile @@ -74,7 +74,7 @@ SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}" -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) SITE_SUB+= -e '\|confOPTIMIZE.*-g|s/^dnl //g' .endif .if !defined(WITHOUT_ARLIB) Index: mail/nmh/Makefile =================================================================== --- mail/nmh/Makefile +++ mail/nmh/Makefile @@ -64,7 +64,7 @@ USES+= ssl .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+= --enable-debug LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g Index: math/fftw3/Makefile =================================================================== --- math/fftw3/Makefile +++ math/fftw3/Makefile @@ -118,7 +118,7 @@ .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fstrict-aliasing -. if !defined(WITH_DEBUG) +. if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) CFLAGS+= -fomit-frame-pointer . endif . if ${ARCH} == "i386" && (${COMPILER_TYPE} == "gcc" || !empty(USE_GCC)) && !${PORT_OPTIONS:MOPENMPI} Index: math/pari/Makefile =================================================================== --- math/pari/Makefile +++ math/pari/Makefile @@ -34,7 +34,7 @@ PTHREADS_DESC= Enable pthread thread engine MPI_DESC= Enable MPI thread engine MPI_BUILD_ENV= CC=mpicc -.ifndef WITH_DEBUG +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) OPTIMIZED_CFLAGS_CFLAGS= -O3 -fno-strict-aliasing -fomit-frame-pointer .endif X11_CONFIGURE_ON= --graphic=X11 Index: multimedia/dirac/Makefile =================================================================== --- multimedia/dirac/Makefile +++ multimedia/dirac/Makefile @@ -20,7 +20,7 @@ HAVE_DOXYGEN=${FALSE} HAVE_DOT=${FALSE} CPPFLAGS+= -I${LOCALBASE}/include -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif Index: multimedia/mlt/Makefile =================================================================== --- multimedia/mlt/Makefile +++ multimedia/mlt/Makefile @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-gpl --enable-gpl3 --target-os=FreeBSD -.ifndef(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--disable-debug .else CONFIGURE_ARGS+=--enable-debug Index: multimedia/mplayer/Makefile.options =================================================================== --- multimedia/mplayer/Makefile.options +++ multimedia/mplayer/Makefile.options @@ -53,7 +53,7 @@ # Extra build options for debugging # ================================= -.if ${PORT_OPTIONS:MDEBUG} +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) WITH_DEBUG= yes CONFIGURE_ARGS+= --enable-debug=3 .endif Index: multimedia/xmms/Makefile =================================================================== --- multimedia/xmms/Makefile +++ multimedia/xmms/Makefile @@ -65,7 +65,7 @@ VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis VORBIS_VARS= INPUT_PLUGINS+=vorbis -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) INSTALL_TARGET= install-strip .endif Index: net-mgmt/rrdbot/Makefile =================================================================== --- net-mgmt/rrdbot/Makefile +++ net-mgmt/rrdbot/Makefile @@ -19,7 +19,7 @@ SUB_FILES= pkg-message USE_RC_SUBR= rrdbot -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif Index: net-p2p/linuxdcpp/Makefile =================================================================== --- net-p2p/linuxdcpp/Makefile +++ net-p2p/linuxdcpp/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= NOTIFY OPTIONS_DEFAULT=NOTIFY -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) MAKE_ARGS+= debug=1 .endif Index: net/libsrtp/Makefile =================================================================== --- net/libsrtp/Makefile +++ net/libsrtp/Makefile @@ -25,7 +25,7 @@ TEST_TARGET= runtest TEST_ENV= LD_LIBRARY_PATH=${WRKSRC} -.if ! defined(WITH_DEBUG) +.if ! defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--disable-debug .endif Index: net/libzmq2/Makefile =================================================================== --- net/libzmq2/Makefile +++ net/libzmq2/Makefile @@ -21,12 +21,12 @@ CONFLICTS= libzmq[^2]-[0-9]* OPTIONS_DEFINE= DEBUG -DEBUG_CONFIGURE_ON= --enable-debug .include -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG= yes +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) +CONFIGURE_FLAGS+= --enable-debug +WITH_DEBUG= yes .endif regression-test: build Index: net/libzmq3/Makefile =================================================================== --- net/libzmq3/Makefile +++ net/libzmq3/Makefile @@ -23,7 +23,6 @@ PGM_DESC= Reliable multicast transport using PGM via OpenPGM -DEBUG_CONFIGURE_ON= --enable-debug PGM_CONFIGURE_ON= --with-system-pgm PGM_LIB_DEPENDS= libpgm.so:net/openpgm PGM_USES= pkgconfig @@ -33,8 +32,9 @@ .include -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG= yes +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) +WITH_DEBUG= yes +CONFIGURE_FLAGS+= --enable-debug .endif regression-test: build Index: net/libzmq4/Makefile =================================================================== --- net/libzmq4/Makefile +++ net/libzmq4/Makefile @@ -34,9 +34,6 @@ PGM_DESC= Enable PGM transport via OpenPGM NORM_DESC= Enable NORM via NRL -DEBUG_CONFIGURE_ENABLE= debug -DEBUG_VARS= WITH_DEBUG=yes - PGM_CONFIGURE_WITH= pgm PGM_LIB_DEPENDS= libpgm.so:net/openpgm @@ -68,4 +65,11 @@ CONFIGURE_ARGS+= --disable-curve .endif +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) +CONFIGURE_FLAGS+= --enable-debug +WITH_DEBUG= yes +.else +CONFIGURE_FLAGS+= --disable-debug +.endif + .include Index: net/miniupnpc/Makefile =================================================================== --- net/miniupnpc/Makefile +++ net/miniupnpc/Makefile @@ -20,7 +20,7 @@ .include -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CFLAGS+= -DDEBUG .endif Index: net/rdesktop/Makefile =================================================================== --- net/rdesktop/Makefile +++ net/rdesktop/Makefile @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-smartcard .endif -.if ${PORT_OPTIONS:MDEBUG} +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) CONFIGURE_ARGS+= --with-debug\ --with-debug-kbd\ --with-debug-rdp5\ Index: net/samba44/Makefile =================================================================== --- net/samba44/Makefile +++ net/samba44/Makefile @@ -175,7 +175,7 @@ SUB_LIST+= NSUPDATE="@comment " .endif -.if ${PORT_OPTIONS:MDEBUG} +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) WITH_DEBUG= yes CONFIGURE_ARGS+= --verbose MAKE_ARGS+= --verbose Index: net/samba45/Makefile =================================================================== --- net/samba45/Makefile +++ net/samba45/Makefile @@ -165,10 +165,6 @@ BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate -DEBUG_CONFIGURE_ON= --verbose --enable-debug -DEBUG_MAKE_ARGS= --verbose -DEBUG_VARS= WITH_DEBUG=yes - # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 GDB_CMD?= ${LOCALBASE}/bin/gdb # https://bugzilla.samba.org/show_bug.cgi?id=8969 @@ -259,6 +255,12 @@ # !SAMBA4_SUBPORT .endif +.if ${PORT_OPTIONS:MDEBUG) || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) +CONFIGURE_FLAGS+= --verbose --enable-debug +MAKE_ARGS+= --verbose +WITH_DEBUG= yes +.endif + ############################################################################## .include ############################################################################## Index: net/samba46/Makefile =================================================================== --- net/samba46/Makefile +++ net/samba46/Makefile @@ -165,10 +165,6 @@ BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate -DEBUG_CONFIGURE_ON= --verbose --enable-debug -DEBUG_MAKE_ARGS= --verbose -DEBUG_VARS= WITH_DEBUG=yes - # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 GDB_CMD?= ${LOCALBASE}/bin/gdb # https://bugzilla.samba.org/show_bug.cgi?id=8969 @@ -259,6 +255,12 @@ # !SAMBA4_SUBPORT .endif +.if ${PORT_OPTIONS:MDEBUG) || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) +CONFIGURE_FLAGS+= --verbose --enable-debug +MAKE_ARGS+= --verbose +WITH_DEBUG= yes +.endif + ############################################################################## .include ############################################################################## Index: net/udpxy/Makefile =================================================================== --- net/udpxy/Makefile +++ net/udpxy/Makefile @@ -31,11 +31,11 @@ .include -.if ${PORT_OPTIONS:MRELEASE} +.if (${PORT_OPTIONS:MRELEASE} || defined(WITHOUT_DEBUG)) && ${PORT_OPTIONS:MLEAN} ALL_TARGET=release .elif ${PORT_OPTIONS:MLEAN} ALL_TARGET=lean -.elif ${PORT_OPTIONS:MDEBUG} +.elif ${PORT_OPTIONS:MDEBUG} && !defined(WITHOUT_DEBUG) ALL_TARGET=debug WITH_DEBUG=yes .endif Index: news/newsx/Makefile =================================================================== --- news/newsx/Makefile +++ news/newsx/Makefile @@ -48,7 +48,7 @@ @${ECHO} "*********************************************************" post-build: -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) ${STRIP_CMD} ${WRKSRC}/src/newsx .endif Index: science/ecs/Makefile =================================================================== --- science/ecs/Makefile +++ science/ecs/Makefile @@ -44,7 +44,7 @@ .include -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif Index: science/fvm/Makefile =================================================================== --- science/fvm/Makefile +++ science/fvm/Makefile @@ -38,7 +38,7 @@ USES+= fortran .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif Index: security/amavisd-milter/Makefile =================================================================== --- security/amavisd-milter/Makefile +++ security/amavisd-milter/Makefile @@ -54,7 +54,7 @@ CONFIGURE_ARGS+=--with-sendmail=${MILTERBASE} .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif Index: security/libpwstor/Makefile =================================================================== --- security/libpwstor/Makefile +++ security/libpwstor/Makefile @@ -20,7 +20,7 @@ CFLAGS+= -fPIC -DPIC .endif -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif Index: security/putty/Makefile =================================================================== --- security/putty/Makefile +++ security/putty/Makefile @@ -72,7 +72,7 @@ _COMPAT+= -DOMIT_UTMP -.if defined(WITH_DEBUG) && ${WITH_DEBUG} != "no" +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) XFLAGS= -DDEBUG .endif Index: sysutils/ipmitool/Makefile =================================================================== --- sysutils/ipmitool/Makefile +++ sysutils/ipmitool/Makefile @@ -30,7 +30,7 @@ CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CFLAGS+= -ggdb -Wall .endif Index: sysutils/rsyslog8/Makefile =================================================================== --- sysutils/rsyslog8/Makefile +++ sysutils/rsyslog8/Makefile @@ -105,7 +105,7 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -.ifdef WITH_DEBUG +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--enable-rtinst --enable-debug .endif Index: sysutils/xstow/Makefile =================================================================== --- sysutils/xstow/Makefile +++ sysutils/xstow/Makefile @@ -12,7 +12,7 @@ USES= tar:bzip2 GNU_CONFIGURE= yes -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif Index: textproc/simplexml/Makefile =================================================================== --- textproc/simplexml/Makefile +++ textproc/simplexml/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CMAKE_ARGS+= -DDEBUG_MODE:BOOL=ON .endif Index: www/apache22/Makefile =================================================================== --- www/apache22/Makefile +++ www/apache22/Makefile @@ -56,7 +56,7 @@ WITH_HTTP_PORT?= 80 WITH_SSL_PORT?= 443 -#.if !defined(WITH_DEBUG) +#.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) #EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c #.endif Index: www/apache22/Makefile.modules =================================================================== --- www/apache22/Makefile.modules +++ www/apache22/Makefile.modules @@ -72,7 +72,7 @@ .endif # debug overrides CFLAGS -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) DEBUG_FLAGS?= -O0 -g -ggdb3 CFLAGS= ${DEBUG_FLAGS} CONFIGURE_ARGS+= --enable-maintainer-mode Index: www/apache24/Makefile =================================================================== --- www/apache24/Makefile +++ www/apache24/Makefile @@ -53,7 +53,7 @@ WITH_HTTP_PORT?= 80 WITH_SSL_PORT?= 443 -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c .endif Index: www/apache24/Makefile.modules =================================================================== --- www/apache24/Makefile.modules +++ www/apache24/Makefile.modules @@ -57,7 +57,7 @@ .endif # debug overrides CFLAGS -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) DEBUG_FLAGS?= -O0 -g -ggdb3 CFLAGS= ${DEBUG_FLAGS} CONFIGURE_ARGS+= --enable-maintainer-mode Index: www/dillo2/Makefile =================================================================== --- www/dillo2/Makefile +++ www/dillo2/Makefile @@ -41,7 +41,7 @@ .include -.ifdef(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+= --enable-gprof --enable-rtfl .else CONFIGURE_ARGS+= --disable-gprof --disable-rtfl Index: www/gatling/Makefile =================================================================== --- www/gatling/Makefile +++ www/gatling/Makefile @@ -54,7 +54,7 @@ MAKE_ENV+= BENCHMARKS=1 .endif -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && !defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && (!defined(WITH_DEBUG) || defined(WITHOUT_DEBUG)) CFLAGS+= -O2 -fomit-frame-pointer .endif @@ -76,7 +76,7 @@ MAKE_ENV+= ZLIB=1 .endif -.if ${PORT_OPTIONS:MDEBUG} +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) MAKE_ENV+= DEBUG=1 STRIP= .endif Index: www/mod_flickr/Makefile =================================================================== --- www/mod_flickr/Makefile +++ www/mod_flickr/Makefile @@ -17,7 +17,7 @@ AP_INC= ${LOCALBASE}/include AP_LIB= ${LOCALBASE}/lib -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) XTRA_FLAGS+= -DDEBUG .endif Index: www/squid-devel/Makefile =================================================================== --- www/squid-devel/Makefile +++ www/squid-devel/Makefile @@ -273,7 +273,7 @@ # Other options set via 'make config': -.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) CONFIGURE_ARGS+= --disable-optimizations --enable-debug-cbdata WITH_DEBUG?= yes .endif Index: www/squid/Makefile =================================================================== --- www/squid/Makefile +++ www/squid/Makefile @@ -265,7 +265,7 @@ # Other options set via 'make config': -.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} || (defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)) CONFIGURE_ARGS+= --disable-optimizations --enable-debug-cbdata WITH_DEBUG?= yes .endif Index: www/suphp/Makefile =================================================================== --- www/suphp/Makefile +++ www/suphp/Makefile @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --with-apr=${LOCALBASE} post-install: -.if !defined(WITH_DEBUG) +.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp .endif ${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \ Index: x11-toolkits/diorite/Makefile =================================================================== --- x11-toolkits/diorite/Makefile +++ x11-toolkits/diorite/Makefile @@ -26,7 +26,7 @@ MAKE_ARGS= --no-ldconfig USE_LDCONFIG= yes -.ifdef(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--debug .else CONFIGURE_ARGS+=--no-debug Index: x11/gdm/Makefile =================================================================== --- x11/gdm/Makefile +++ x11/gdm/Makefile @@ -98,7 +98,7 @@ .include -.if defined(WITH_DEBUG) +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif