Index: comms/limesuite/Makefile =================================================================== --- comms/limesuite/Makefile +++ comms/limesuite/Makefile @@ -40,8 +40,8 @@ ENABLE_NEW_GAIN_BEHAVIOUR \ ENABLE_PCIE_XILLYBUS -OPTIONS_DEFINE= DOCS GUI QUICKTEST OCTAVE SOAPYSDR UTILITIES DEBUG -OPTIONS_DEFAULT= GUI QUICKTEST SOAPYSDR UTILITIES DEBUG +OPTIONS_DEFINE= DOCS GUI QUICKTEST OCTAVE SOAPYSDR UTILITIES +OPTIONS_DEFAULT= GUI QUICKTEST SOAPYSDR UTILITIES OPTIONS_UNSET= DOCS OPTIONS_SUB= yes QUICKTEST_DESC= Build QuickTest Self-Test suite @@ -87,10 +87,6 @@ PLIST_SUB+= OCTAVE_M_SITE_DIR=${OCTAVE_M_SITE_DIR:sh}/ .endif -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG= yes -.endif - post-build: # N.B. COPYTREE_BIN here chmods 555 which breaks CMAKE_INSTALL in user mode! (cd ${BUILD_WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin) Index: emulators/mame/Makefile =================================================================== --- emulators/mame/Makefile +++ emulators/mame/Makefile @@ -61,10 +61,7 @@ PORTDOCS= LICENSE html/* legal/* PORTEXAMPLES= ${MSUBTARGET}.ini -DEBUG_MAKE_ENV= DEBUG=1 - -OPTIONS_DEFINE= DEBUG DOCS EXAMPLES -DEBUG_DESC= Build with debug profiling and symbols +OPTIONS_DEFINE= DOCS EXAMPLES DOCS_DESC= Install additional MAME documentation EXAMPLES_DESC= Install example ${EMULATOR}.ini configuration @@ -74,8 +71,7 @@ .include -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG= "YES" +.if defined(WITH_DEBUG) MAKE_ENV+= DEBUG="1" \ OPTIMIZE="0" \ PROFILER="1" \ @@ -122,22 +118,22 @@ (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} legal ${STAGEDIR}${DOCSDIR}) .endif -do-install-DEBUG-off: -.if ${MSUBTARGET:Mmess} +.if defined(WITH_DEBUG) +. if ${MSUBTARGET:Mmess} ${INSTALL_PROGRAM} ${WRKSRC}/${MTARGET}${MSUBTARGET} \ ${STAGEDIR}${PREFIX}/bin/${EMULATOR} -.else +. else ${INSTALL_PROGRAM} ${WRKSRC}/${MSUBTARGET} \ ${STAGEDIR}${PREFIX}/bin/${EMULATOR} -.endif - -do-install-DEBUG-on: -.if ${MSUBTARGET:Mmess} +. endif +.else +. if ${MSUBTARGET:Mmess} ${INSTALL_PROGRAM} ${WRKSRC}/${MTARGET}${MSUBTARGET}d \ ${STAGEDIR}${PREFIX}/bin/${EMULATOR} -.else +. else ${INSTALL_PROGRAM} ${WRKSRC}/${MSUBTARGET}d \ ${STAGEDIR}${PREFIX}/bin/${EMULATOR} +. endif .endif post-build: Index: emulators/virtualbox-ose/Makefile =================================================================== --- emulators/virtualbox-ose/Makefile +++ emulators/virtualbox-ose/Makefile @@ -54,7 +54,7 @@ SUB_FILES= pkg-message -OPTIONS_DEFINE= AIO ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \ +OPTIONS_DEFINE= AIO ALSA DBUS GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \ PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11 OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 # Since version 6.1.24 pulseaudio is broken at runtime, preventing @@ -63,13 +63,12 @@ OPTIONS_SUB= yes AIO_DESC= Enable Asyncronous IO support (check pkg-message) -DEBUG_DESC= Debug symbols, additional logs and assertions GUESTADDITIONS_DESC= Build with Guest Additions MANUAL_DESC= Build with user manual NLS_DESC= Native language support (requires QT5) OPUS_DESC= Use libvpx for audio recording (requires VPX) QT5_DESC= Build with QT5 frontend (requires X11) -R0LOGGING_DESC= Enable R0 logging (requires DEBUG) +R0LOGGING_DESC= Enable R0 logging (requires setting WITH_DEBUG) UDPTUNNEL_DESC= Build with UDP tunnel support VDE_DESC= Build with VDE support VNC_DESC= Build with VNC support @@ -80,7 +79,6 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib DBUS_CONFIGURE_OFF= --disable-dbus DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DEBUG_CONFIGURE_ON= --build-debug MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml MANUAL_CONFIGURE_OFF= --disable-docs NLS_IMPLIES= QT5 @@ -91,7 +89,6 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PYTHON_CONFIGURE_OFF= --disable-python QT5_IMPLIES= X11 -R0LOGGING_IMPLIES= DEBUG UDPTUNNEL_CONFIGURE_OFF= --disable-udptunnel VDE_CONFIGURE_ON= --enable-vde VDE_RUN_DEPENDS= vde_switch:net/vde2 @@ -113,6 +110,14 @@ VBOXWSUSER=${VBOXWSUSER} USE_RC_SUBR= vboxheadless vboxwatchdog +.if defined(WITH_DEBUG) +KMK_BUILDTYPE= debug +KMK_FLAGS+= BUILD_TYPE=debug +.else +KMK_BUILDTYPE= release +OPTIONS_EXCLUDE= R0LOGGING +.endif + .include .if ${SLAVE_PORT} == no @@ -126,14 +131,6 @@ _ELF32!= kldstat -q -m elf32 && echo yes || echo no .endif -.if ${PORT_OPTIONS:MDEBUG} -KMK_BUILDTYPE= debug -KMK_FLAGS+= BUILD_TYPE=debug -WITH_DEBUG= yes -.else -KMK_BUILDTYPE= release -.endif - .if ${PORT_OPTIONS:MGUESTADDITIONS} GUESTADDITIONS= VBoxGuestAdditions_${PORTVERSION}.iso LICENSE+= Additions Index: mail/opendkim/Makefile =================================================================== --- mail/opendkim/Makefile +++ mail/opendkim/Makefile @@ -100,12 +100,14 @@ .include "${.CURDIR}/Makefile.options" -.include - -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG= yes +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.else +CONFIGURE_ARGS+= --disable-debug .endif +.include + .if ${PORT_OPTIONS:MFILTER} SUB_FILES= pkg-message WITHOUT_MILTER_CFLAGS= yes Index: mail/opendkim/Makefile.options =================================================================== --- mail/opendkim/Makefile.options +++ mail/opendkim/Makefile.options @@ -3,7 +3,7 @@ OPTIONS_GROUP+= DEVELOPER DEVELOPER_DESC= Options useful for OpenDKIM development -OPTIONS_GROUP_DEVELOPER= ALLSYMBOLS CODECOVERAGE DEBUG +OPTIONS_GROUP_DEVELOPER= ALLSYMBOLS CODECOVERAGE ALLSYMBOLS_DESC= Export all internal symbols for better test coverage ALLSYMBOLS_CONFIGURE_ENABLE= allsymbols @@ -11,9 +11,6 @@ CODECOVERAGE_DESC= Enable internal code-coverage/profiling CODECOVERAGE_CONFIGURE_ENABLE= codecoverage -DEBUG_DESC= Build with debug symbols -DEBUG_CONFIGURE_ENABLE= debug - ## Please refer FEATURES file distributed with the source for details. FFR_DESC= Use features marked as For-Future-Releases Index: multimedia/vlc/Makefile =================================================================== --- multimedia/vlc/Makefile +++ multimedia/vlc/Makefile @@ -59,13 +59,10 @@ --with-kde-solid=${PREFIX}/share/solid/actions \ ac_cv_search_pthread_rwlock_init=-pthread \ BUILDCC="${CC}" -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--enable-debug -.endif CFLAGS_i386= -fomit-frame-pointer OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDREAD \ - DEBUG DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \ + DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \ GOOM HARFBUZZ JACK JPEG LIBBLURAY LIBPLACEBO LIBRSVG2 LIBSSH2 LIRC \ LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP MUSEPACK \ NCURSES NFS NLS NOTIFY OGG OGGSPOTS OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \ @@ -373,8 +370,7 @@ .include -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG=yes +.if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug --disable-optimizations CFLAGS+=-g -O0 CXXFLAGS+=-g -O0