Page MenuHomeFreeBSD
Files F147506846

D23940.id69114.diff
No OneTemporary
Actions

D23940.id69114.diff
View Options

Index: devel/subversion-lts/Makefile
===================================================================
--- devel/subversion-lts/Makefile
+++ devel/subversion-lts/Makefile
@@ -20,7 +20,6 @@
DOCS \
FREEBSD_TEMPLATE\
GPG_AGENT \
- MAINTAINER_DEBUG\
NLS \
SASL \
SERF \
@@ -33,7 +32,6 @@
FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
GPG_AGENT_DESC= Enable GPG agent password store
-MAINTAINER_DEBUG_DESC= Build debug version
SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module
STATIC_DESC= Build static version (no shared libs)
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter)
Index: devel/subversion-lts/Makefile.common
===================================================================
--- devel/subversion-lts/Makefile.common
+++ devel/subversion-lts/Makefile.common
@@ -36,8 +36,6 @@
BDB_CONFIGURE_OFF= --without-berkeley-db
BDB_USES= bdb
-MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug
-
NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext
@@ -59,8 +57,8 @@
# ===============================================================
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
-WITH_DEBUG= yes
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-maintainer-mode --enable-debug
.endif
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
Index: devel/subversion/Makefile
===================================================================
--- devel/subversion/Makefile
+++ devel/subversion/Makefile
@@ -19,7 +19,6 @@
DOCS \
FREEBSD_TEMPLATE\
GPG_AGENT \
- MAINTAINER_DEBUG\
NLS \
SASL \
SERF \
@@ -32,7 +31,6 @@
FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
GPG_AGENT_DESC= Enable GPG agent password store
-MAINTAINER_DEBUG_DESC= Build debug version
SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module
STATIC_DESC= Build static version (no shared libs)
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter)
Index: devel/subversion/Makefile.common
===================================================================
--- devel/subversion/Makefile.common
+++ devel/subversion/Makefile.common
@@ -36,8 +36,6 @@
BDB_CONFIGURE_OFF= --without-berkeley-db
BDB_USES= bdb
-MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug
-
NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext
@@ -59,8 +57,8 @@
# ===============================================================
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
-WITH_DEBUG= yes
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-maintainer-mode --enable-debug
.endif
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
Index: editors/openoffice-4/Makefile
===================================================================
--- editors/openoffice-4/Makefile
+++ editors/openoffice-4/Makefile
@@ -139,9 +139,9 @@
OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \
SDK WIKI_PUBLISHER
OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER
-CRASHDUMP_DESC= Enable crashdumps, sets WITH_DEBUG
+CRASHDUMP_DESC= Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
DBGUTIL_DESC= Enable assertions, object counting. (non-production)
-DEBUG_DESC= Compile with -O0, sets WITH_DEBUG
+DEBUG_DESC= Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
GNOME_DESC= GConf + screensaver presentation control via DBUS
GNOMEVFS_DESC= GNOME Virtual File System
MMEDIA_DESC= Multimedia backend for impress
@@ -149,7 +149,6 @@
WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension
CRASHDUMP_CONFIGURE_ENABLE= crashdump
-CRASHDUMP_VARS= WITH_DEBUG=yes
CUPS_CONFIGURE_ENABLE= cups
CUPS_LIB_DEPENDS= libcups.so:print/cups
Index: editors/openoffice-devel/Makefile
===================================================================
--- editors/openoffice-devel/Makefile
+++ editors/openoffice-devel/Makefile
@@ -153,9 +153,9 @@
OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \
MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER
OPTIONS_DEFAULT= CUPS GNOME MMEDIA WIKI_PUBLISHER
-CRASHDUMP_DESC= Enable crashdumps, sets WITH_DEBUG
+CRASHDUMP_DESC= Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
DBGUTIL_DESC= Enable assertions, object counting. (non-production)
-DEBUG_DESC= Compile with -O0, sets WITH_DEBUG
+DEBUG_DESC= Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
GNOME_DESC= GConf + screensaver presentation control via DBUS
GNOMEVFS_DESC= Use GNOME Virtual File System instead of gio
MMEDIA_DESC= Multimedia backend for impress
@@ -166,7 +166,6 @@
WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension
CRASHDUMP_CONFIGURE_ENABLE= crashdump
-CRASHDUMP_VARS= WITH_DEBUG=yes
CUPS_CONFIGURE_ENABLE= cups
CUPS_LIB_DEPENDS= libcups.so:print/cups
Index: irc/irssi/Makefile
===================================================================
--- irc/irssi/Makefile
+++ irc/irssi/Makefile
@@ -19,7 +19,7 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= BOT CAPSICUM DEBUG DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC
+OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC
OPTIONS_DEFAULT= BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR
OPTIONS_SUB= yes
@@ -27,8 +27,6 @@
BOT_CONFIGURE_WITH= bot
CAPSICUM_DESC= Capsicum support
CAPSICUM_CONFIGURE_WITH= capsicum
-DEBUG_DESC= Build with debug symbols
-DEBUG_VARS= WITH_DEBUG=yes
OTR_DESC= OTR (off-the-record) support
OTR_CONFIGURE_ON= --with-otr \
--with-libotr-inc-prefix=${PREFIX}/include
Index: mail/rspamd-devel/Makefile
===================================================================
--- mail/rspamd-devel/Makefile
+++ mail/rspamd-devel/Makefile
@@ -59,7 +59,6 @@
GH_TAGNAME= 2939a82
DEBUG_FLAGS= -g -O0
-WITH_DEBUG= yes
USE_RC_SUBR= rspamd
Index: math/wxmaxima/Makefile
===================================================================
--- math/wxmaxima/Makefile
+++ math/wxmaxima/Makefile
@@ -25,11 +25,9 @@
PORTDATA= COPYING README README.md
-OPTIONS_DEFINE= DEBUG NLS
+OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
-DEBUG_VARS= WITH_DEBUG=yes
-
NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt
NLS_USES= gettext
Index: multimedia/mplayer/Makefile
===================================================================
--- multimedia/mplayer/Makefile
+++ multimedia/mplayer/Makefile
@@ -10,7 +10,7 @@
.include "${.CURDIR}/../../multimedia/mplayer/Makefile.common"
-OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \
+OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \
ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \
OPENJPEG OPUS PULSEAUDIO RTMP \
Index: multimedia/mplayer/Makefile.options
===================================================================
--- multimedia/mplayer/Makefile.options
+++ multimedia/mplayer/Makefile.options
@@ -56,8 +56,7 @@
# Extra build options for debugging
# =================================
-.if ${PORT_OPTIONS:MDEBUG}
-WITH_DEBUG= yes
+.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug=3
.endif
Index: net/libzmq4/Makefile
===================================================================
--- net/libzmq4/Makefile
+++ net/libzmq4/Makefile
@@ -23,7 +23,7 @@
INSTALL_TARGET= install-strip
TEST_TARGET= check
-OPTIONS_DEFINE= DEBUG LIBUNWIND MANPAGES
+OPTIONS_DEFINE= LIBUNWIND MANPAGES
OPTIONS_RADIO= CURVE
OPTIONS_RADIO_CURVE= SODIUM TWEETNACL
OPTIONS_GROUP= MULTICAST
@@ -39,9 +39,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
@@ -69,6 +66,11 @@
.include <bsd.port.options.mk>
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-debug
+.endif
+
+
.if !${PORT_OPTIONS:MSODIUM} && !${PORT_OPTIONS:MTWEETNACL}
CONFIGURE_ARGS+= --disable-curve
.endif
Index: net/samba410/Makefile
===================================================================
--- net/samba410/Makefile
+++ net/samba410/Makefile
@@ -303,7 +303,6 @@
DEBUG_CONFIGURE_ON= --verbose --enable-debug
DEBUG_MAKE_ARGS= --verbose
DEBUG_FLAGS= -g -ggdb3 -O0
-DEBUG_VARS= WITH_DEBUG=yes
MEMORY_DEBUG_IMPLIES= DEBUG
MEMORY_DEBUG_CONFIGURE_ENV= ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`"
Index: net/udpxy/Makefile
===================================================================
--- net/udpxy/Makefile
+++ net/udpxy/Makefile
@@ -18,10 +18,9 @@
WRKSRC_SUBDIR= chipmunk
OPTIONS_SINGLE= CONF
-OPTIONS_SINGLE_CONF= RELEASE LEAN DEBUG
+OPTIONS_SINGLE_CONF= RELEASE LEAN
RELEASE_DESC= No asserts, no debug symbols, verbose on
LEAN_DESC= No asserts, no debug symbols, verbose off
-DEBUG_DESC= Asserts, debug symbols, verbose on
OPTIONS_DEFAULT= RELEASE
PLIST_FILES= sbin/udpxy \
@@ -39,13 +38,12 @@
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MRELEASE}
+.if defined(WITH_DEBUG)
+ALL_TARGET=debug
+.elif ${PORT_OPTIONS:MRELEASE}
ALL_TARGET=release
.elif ${PORT_OPTIONS:MLEAN}
ALL_TARGET=lean
-.elif ${PORT_OPTIONS:MDEBUG}
-ALL_TARGET=debug
-WITH_DEBUG=yes
.endif
.include <bsd.port.mk>
Index: ports-mgmt/pkg-devel/Makefile
===================================================================
--- ports-mgmt/pkg-devel/Makefile
+++ ports-mgmt/pkg-devel/Makefile
@@ -15,7 +15,6 @@
GH_ACCOUNT= freebsd
GH_TAGNAME= 93c4c82e
-WITH_DEBUG= yes
CFLAGS+= -O0 -g -Wno-error
USE_LDCONFIG= ${PREFIX}/lib/compat/pkg
HAS_CONFIGURE= yes
Index: sysutils/e2fsprogs/Makefile
===================================================================
--- sysutils/e2fsprogs/Makefile
+++ sysutils/e2fsprogs/Makefile
@@ -65,7 +65,7 @@
PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space)
SLOWTESTS_DESC= Enable slow tests that are skipped by default
BASHTESTS_DESC= Enable tests that require the GNU bash shell
-LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG=yes!)
+LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
FUSEFS_CONFIGURE_ENABLE= fuse2fs

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 12, 12:33 PM (8 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29543757
Default Alt Text
D23940.id69114.diff (10 KB)

Event Timeline