aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2011-11-09 23:26:04 +0800
committermiwi <miwi@FreeBSD.org>2011-11-09 23:26:04 +0800
commitb227b572d808bc9da030a9f4a079976d44caca94 (patch)
tree1659ecc733f98dafc1d82c17de03ecbfa967a0c3
parent5dda718fe934220c0f5af5544f2af8ccbe900563 (diff)
downloadfreebsd-ports-gnome-b227b572d808bc9da030a9f4a079976d44caca94.tar.gz
freebsd-ports-gnome-b227b572d808bc9da030a9f4a079976d44caca94.tar.zst
freebsd-ports-gnome-b227b572d808bc9da030a9f4a079976d44caca94.zip
- Remove WITH_FBSD10_FIX, is no longer needed
-rw-r--r--accessibility/atkmm/Makefile1
-rw-r--r--accessibility/gnome-speech/Makefile1
-rw-r--r--archivers/libarchive/Makefile1
-rw-r--r--archivers/libpar2/Makefile2
-rw-r--r--archivers/snappy/Makefile1
-rw-r--r--archivers/squeeze/Makefile1
-rw-r--r--archivers/tardy/Makefile1
-rw-r--r--audio/alsa-lib/Makefile1
-rw-r--r--audio/audiere/Makefile1
-rw-r--r--audio/celt/Makefile1
-rw-r--r--audio/libcddb/Makefile1
-rw-r--r--audio/libid3tag/Makefile1
-rw-r--r--audio/liblo/Makefile1
-rw-r--r--audio/liblscp/Makefile1
-rw-r--r--audio/libmodplug/Makefile1
-rw-r--r--audio/libmpd/Makefile1
-rw-r--r--audio/libmpdclient/Makefile1
-rw-r--r--audio/libmtp/Makefile1
-rw-r--r--audio/libmusicbrainz/Makefile1
-rw-r--r--audio/libogg/Makefile1
-rw-r--r--audio/libopenspc/Makefile1
-rw-r--r--audio/libshout2/Makefile1
-rw-r--r--audio/libsndfile/Makefile1
-rw-r--r--audio/opencore-amr/Makefile1
-rw-r--r--audio/portaudio2/Makefile1
-rw-r--r--audio/soundtouch/Makefile1
-rw-r--r--audio/vo-aacenc/Makefile1
-rw-r--r--audio/wavpack/Makefile1
-rw-r--r--biology/iolib/Makefile1
-rw-r--r--chinese/cconv/Makefile1
-rw-r--r--chinese/libchewing/Makefile1
-rw-r--r--comms/openobex/Makefile1
-rw-r--r--converters/fribidi/Makefile1
-rw-r--r--databases/libmemcached/Makefile1
-rw-r--r--databases/mysql50-server/Makefile1
-rw-r--r--databases/mysql51-server/Makefile1
-rw-r--r--databases/sqlite3/Makefile2
-rw-r--r--databases/unixODBC/Makefile1
-rw-r--r--devel/ORBit/Makefile1
-rw-r--r--devel/bennugd-core/Makefile1
-rw-r--r--devel/boehm-gc/Makefile1
-rw-r--r--devel/commoncpp/Makefile1
-rw-r--r--devel/eggdbus/Makefile1
-rw-r--r--devel/eina/Makefile1
-rw-r--r--devel/gio-fam-backend/Makefile1
-rw-r--r--devel/googletest/Makefile1
-rw-r--r--devel/gvfs/Makefile1
-rw-r--r--devel/libIDL/Makefile1
-rw-r--r--devel/libbonobo/Makefile1
-rw-r--r--devel/libburn/Makefile1
-rw-r--r--devel/libcheck/Makefile1
-rw-r--r--devel/libevent/Makefile1
-rw-r--r--devel/libevent2/Makefile1
-rw-r--r--devel/libffi/Makefile1
-rw-r--r--devel/libgee/Makefile1
-rw-r--r--devel/libglade2/Makefile1
-rw-r--r--devel/liboobs/Makefile1
-rw-r--r--devel/libpciaccess/Makefile1
-rw-r--r--devel/libpthread-stubs/Makefile1
-rw-r--r--devel/libtool/Makefile1
-rw-r--r--devel/oniguruma5/Makefile1
-rw-r--r--devel/pcre/Makefile1
-rw-r--r--devel/pcsc-lite/Makefile1
-rw-r--r--devel/pth/Makefile1
-rw-r--r--devel/py-gobject/Makefile1
-rw-r--r--devel/py-orbit/Makefile1
-rw-r--r--devel/readline/Makefile1
-rw-r--r--devel/subversion/Makefile.common1
-rw-r--r--dns/c-ares/Makefile1
-rw-r--r--dns/libidn/Makefile1
-rw-r--r--ftp/curl/Makefile1
-rw-r--r--graphics/ImageMagick/Makefile1
-rw-r--r--graphics/djvulibre-nox11/Makefile1
-rw-r--r--graphics/exiv2/Makefile1
-rw-r--r--graphics/frei0r/Makefile1
-rw-r--r--graphics/jbig2dec/Makefile1
-rw-r--r--graphics/lcms/Makefile1
-rw-r--r--graphics/lcms2/Makefile1
-rw-r--r--graphics/libdrm/Makefile1
-rw-r--r--graphics/liblqr-1/Makefile1
-rw-r--r--graphics/libqrencode/Makefile1
-rw-r--r--graphics/libspiro/Makefile1
-rw-r--r--graphics/proj/Makefile1
-rw-r--r--graphics/py-cairo/Makefile1
-rw-r--r--graphics/sane-backends/Makefile1
-rw-r--r--graphics/webp/Makefile1
-rw-r--r--japanese/zinnia/Makefile1
-rw-r--r--lang/embryo/Makefile1
-rw-r--r--lang/guile/Makefile1
-rw-r--r--lang/php5/Makefile.ext1
-rw-r--r--lang/php52/Makefile.ext1
-rw-r--r--lang/php53/Makefile.ext1
-rw-r--r--lang/python26/Makefile1
-rw-r--r--lang/python27/Makefile1
-rw-r--r--lang/python31/Makefile1
-rw-r--r--lang/python32/Makefile1
-rw-r--r--lang/vala/Makefile1
-rw-r--r--math/fftw3/Makefile1
-rw-r--r--math/glpk/Makefile1
-rw-r--r--math/gmp/Makefile1
-rw-r--r--math/gsl/Makefile1
-rw-r--r--math/mpc/Makefile1
-rw-r--r--math/wfmath/Makefile1
-rw-r--r--misc/chmlib/Makefile1
-rw-r--r--misc/sword/Makefile1
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile1
-rw-r--r--multimedia/libdca/Makefile1
-rw-r--r--multimedia/libdv/Makefile1
-rw-r--r--multimedia/libkate/Makefile1
-rw-r--r--multimedia/mp4v2/Makefile1
-rw-r--r--multimedia/py-gstreamer/Makefile1
-rw-r--r--multimedia/schroedinger/Makefile1
-rw-r--r--net-im/folks/Makefile1
-rw-r--r--net-im/telepathy-gabble/Makefile1
-rw-r--r--net-mgmt/net-snmp/Makefile1
-rw-r--r--net/GeoIP/Makefile1
-rw-r--r--net/glib-networking/Makefile1
-rw-r--r--net/libdnet/Makefile1
-rw-r--r--net/libexosip2/Makefile1
-rw-r--r--net/radiusclient/Makefile1
-rw-r--r--palm/pilot-link/Makefile1
-rw-r--r--ports-mgmt/packagekit/Makefile1
-rw-r--r--print/pdflib/Makefile1
-rw-r--r--print/xfce4-print/Makefile1
-rw-r--r--science/bft/Makefile1
-rw-r--r--science/hdf5-18/Makefile1
-rw-r--r--science/libint/Makefile1
-rw-r--r--science/netcdf/Makefile1
-rw-r--r--science/openbabel/Makefile1
-rw-r--r--security/gnupg1/Makefile1
-rw-r--r--security/gnutls/Makefile1
-rw-r--r--security/libksba/Makefile1
-rw-r--r--security/libssh2/Makefile1
-rw-r--r--security/libtasn1/Makefile1
-rw-r--r--security/mhash/Makefile1
-rw-r--r--security/sudo/Makefile1
-rw-r--r--sysutils/consolekit/Makefile1
-rw-r--r--sysutils/fusefs-libs/Makefile1
-rw-r--r--sysutils/libcdio/Makefile1
-rw-r--r--sysutils/policykit-gnome/Makefile1
-rw-r--r--sysutils/policykit/Makefile1
-rw-r--r--sysutils/polkit-gnome/Makefile1
-rw-r--r--sysutils/polkit/Makefile1
-rw-r--r--sysutils/sg3_utils/Makefile1
-rw-r--r--textproc/aspell/Makefile1
-rw-r--r--textproc/augeas/Makefile1
-rw-r--r--textproc/expat2/Makefile1
-rw-r--r--textproc/hunspell/Makefile1
-rw-r--r--textproc/libnxml/Makefile1
-rw-r--r--textproc/libwpd08/Makefile1
-rw-r--r--textproc/libxml++26/Makefile1
-rw-r--r--textproc/libxml2/Makefile1
-rw-r--r--textproc/libxslt/Makefile1
-rw-r--r--textproc/opensp/Makefile1
-rw-r--r--textproc/raptor/Makefile1
-rw-r--r--textproc/raptor2/Makefile1
-rw-r--r--textproc/rarian/Makefile1
-rw-r--r--textproc/senna/Makefile1
-rw-r--r--textproc/tidyp/Makefile1
-rw-r--r--textproc/xerces-c3/Makefile1
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile1
-rw-r--r--x11-drivers/xf86-input-egalax/Makefile1
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile1
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile1
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile1
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile1
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile1
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile1
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile1
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile1
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile1
-rw-r--r--x11-drivers/xf86-input-void/Makefile1
-rw-r--r--x11-drivers/xf86-video-apm/Makefile1
-rw-r--r--x11-drivers/xf86-video-ark/Makefile1
-rw-r--r--x11-drivers/xf86-video-ati/Makefile1
-rw-r--r--x11-drivers/xf86-video-ati613/Makefile1
-rw-r--r--x11-drivers/xf86-video-chips/Makefile1
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile1
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile1
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile1
-rw-r--r--x11-drivers/xf86-video-glint/Makefile1
-rw-r--r--x11-drivers/xf86-video-i128/Makefile1
-rw-r--r--x11-drivers/xf86-video-i740/Makefile1
-rw-r--r--x11-drivers/xf86-video-intel/Makefile1
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile1
-rw-r--r--x11-drivers/xf86-video-mga/Makefile1
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile1
-rw-r--r--x11-drivers/xf86-video-newport/Makefile1
-rw-r--r--x11-drivers/xf86-video-nouveau/Makefile1
-rw-r--r--x11-drivers/xf86-video-nv/Makefile1
-rw-r--r--x11-drivers/xf86-video-openchrome/Makefile1
-rw-r--r--x11-drivers/xf86-video-r128/Makefile1
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/Makefile1
-rw-r--r--x11-drivers/xf86-video-radeonhd/Makefile1
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile1
-rw-r--r--x11-drivers/xf86-video-s3/Makefile1
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile1
-rw-r--r--x11-drivers/xf86-video-savage/Makefile1
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile1
-rw-r--r--x11-drivers/xf86-video-sis/Makefile1
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile1
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile1
-rw-r--r--x11-drivers/xf86-video-tga/Makefile1
-rw-r--r--x11-drivers/xf86-video-trident/Makefile1
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile1
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile1
-rw-r--r--x11-drivers/xf86-video-via/Makefile1
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile1
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile1
-rw-r--r--x11-fm/thunar/Makefile1
-rw-r--r--x11-fonts/libXfont/Makefile1
-rw-r--r--x11-fonts/libXfontcache/Makefile1
-rw-r--r--x11-fonts/libXft/Makefile1
-rw-r--r--x11-fonts/libfontenc/Makefile1
-rw-r--r--x11-servers/driglide/Makefile1
-rw-r--r--x11-servers/mga_hal/Makefile1
-rw-r--r--x11-servers/xorg-server/Makefile1
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile1
-rw-r--r--x11-toolkits/gtkimageview/Makefile1
-rw-r--r--x11-toolkits/libXaw/Makefile1
-rw-r--r--x11-toolkits/libXmu/Makefile1
-rw-r--r--x11-toolkits/libXt/Makefile1
-rw-r--r--x11-toolkits/pangomm/Makefile1
-rw-r--r--x11-toolkits/py-gtk2/Makefile1
-rw-r--r--x11/libICE/Makefile1
-rw-r--r--x11/libSM/Makefile1
-rw-r--r--x11/libX11/Makefile1
-rw-r--r--x11/libXScrnSaver/Makefile1
-rw-r--r--x11/libXau/Makefile1
-rw-r--r--x11/libXcomposite/Makefile1
-rw-r--r--x11/libXcursor/Makefile1
-rw-r--r--x11/libXdamage/Makefile1
-rw-r--r--x11/libXdmcp/Makefile1
-rw-r--r--x11/libXevie/Makefile1
-rw-r--r--x11/libXext/Makefile1
-rw-r--r--x11/libXfixes/Makefile1
-rw-r--r--x11/libXi/Makefile1
-rw-r--r--x11/libXpm/Makefile1
-rw-r--r--x11/libXrandr/Makefile1
-rw-r--r--x11/libXrender/Makefile1
-rw-r--r--x11/libXres/Makefile1
-rw-r--r--x11/libXv/Makefile1
-rw-r--r--x11/libXxf86dga/Makefile1
-rw-r--r--x11/libXxf86misc/Makefile1
-rw-r--r--x11/libXxf86vm/Makefile1
-rw-r--r--x11/libdmx/Makefile1
-rw-r--r--x11/libexo/Makefile1
-rw-r--r--x11/libxcb/Makefile1
-rw-r--r--x11/libxkbfile/Makefile1
-rw-r--r--x11/libxkbui/Makefile1
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
251 files changed, 0 insertions, 254 deletions
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
index 4e7bb2e20386..34a9448cf6f6 100644
--- a/accessibility/atkmm/Makefile
+++ b/accessibility/atkmm/Makefile
@@ -21,7 +21,6 @@ USE_LDCONFIG= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_GNOME= gnomehack atk
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 601fa5574aab..70e217980fbf 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -19,7 +19,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libbonobo
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index f6f59d40ec74..f23844b61b3c 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -17,7 +17,6 @@ COMMENT= Library to create and read several streaming archive formats
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack libxml2
-WITH_FBSD10_FIX=yes
PLIST_FILES= bin/bsdcpio \
bin/bsdtar \
diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile
index aa1954e80266..fdf4159c37b4 100644
--- a/archivers/libpar2/Makefile
+++ b/archivers/libpar2/Makefile
@@ -22,8 +22,6 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
-
OPTIONS= ENABLECANCEL "Enable graceful cancellation of repairs" On
diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
index 16514196f28e..55d39d68a637 100644
--- a/archivers/snappy/Makefile
+++ b/archivers/snappy/Makefile
@@ -17,7 +17,6 @@ COMMENT= A fast compressor/decompressor library
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
post-patch:
.if defined(NOPORTDOCS)
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index 1df50b94dd3f..63ad8555da54 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -23,7 +23,6 @@ LICENSE= GPLv2
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-WITH_FBSD10_FIX=yes
USE_XFCE= configenv panel thunar thunarvfs
USE_XORG= x11
USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index e3d328f52c15..0598c09ff28d 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
LIB_DEPENDS= explain.45:${PORTSDIR}/devel/libexplain
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
MAKE_JOBS_UNSAFE= yes
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 532c6fcaaa7f..dc5be0b72db7 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -16,7 +16,6 @@ MASTER_SITES= ftp://ftp.silug.org/pub/alsa/lib/ \
MAINTAINER= aragon@phat.za.net
COMMENT= ALSA compatibility library
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/audiere/Makefile b/audio/audiere/Makefile
index 313130c1c845..834fbe1f8f26 100644
--- a/audio/audiere/Makefile
+++ b/audio/audiere/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= High-level audio API
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
WANT_WX= yes
diff --git a/audio/celt/Makefile b/audio/celt/Makefile
index d681566fc5a2..1affe48d5d00 100644
--- a/audio/celt/Makefile
+++ b/audio/celt/Makefile
@@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ogg=${LOCALBASE}
USE_GMAKE= yes
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index 49ea20eb8e4c..41a7afd0f493 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A library to access data on a CDDB server
-WITH_FBSD10_FIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index 2d42af4a354c..4a697ad667f6 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -17,7 +17,6 @@ COMMENT= ID3 tags library (part of MAD project)
LICENSE= GPLv2
-WITH_FBSD10_FIX=yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/liblo/Makefile b/audio/liblo/Makefile
index 246df153e902..659d75a16a91 100644
--- a/audio/liblo/Makefile
+++ b/audio/liblo/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight Open Sound Control implementation
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/audio/liblscp/Makefile b/audio/liblscp/Makefile
index 60b1830af58c..036fcdab4338 100644
--- a/audio/liblscp/Makefile
+++ b/audio/liblscp/Makefile
@@ -16,7 +16,6 @@ COMMENT= Wrapper around the LSCP network protocol
LICENSE= LGPL21
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index e8d7c3183c9e..0be13587e584 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= SF/modplug-xmms/${PORTNAME}/${PORTVERSION} CRITICAL
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= ModPlug mod-like music shared libraries
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 1105ea840399..2c19db713cfb 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -18,7 +18,6 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig glib20 gnomehack
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
post-patch:
@${REINPLACE_CMD} -e 's,libmpd-1.0\/libmpd,libmpd,' \
diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile
index 332f3011cea9..58ff3656e377 100644
--- a/audio/libmpdclient/Makefile
+++ b/audio/libmpdclient/Makefile
@@ -18,6 +18,5 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
.include <bsd.port.mk>
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index 5016a949ef60..ecd8c00e43b4 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -15,7 +15,6 @@ COMMENT= Media Transfer Protocol (MTP) library
LICENSE= LGPL21
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile
index a7e0b9083f95..760b240ece34 100644
--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
CONFLICTS= musicbrainz-1.*
-WITH_FBSD10_FIX=yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 7cd033819431..1e049d0e2bfa 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://downloads.xiph.org/releases/ogg/
MAINTAINER= naddy@FreeBSD.org
COMMENT= Ogg bitstream library
-WITH_FBSD10_FIX= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
diff --git a/audio/libopenspc/Makefile b/audio/libopenspc/Makefile
index 6eb2d63fb692..4605dfbe528d 100644
--- a/audio/libopenspc/Makefile
+++ b/audio/libopenspc/Makefile
@@ -16,7 +16,6 @@ COMMENT= Library for playing SPC (SNES audio) files
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 5792c643ebd4..e4c99fc531f0 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
theora.0:${PORTSDIR}/multimedia/libtheora \
vorbis.4:${PORTSDIR}/audio/libvorbis
-WITH_FBSD10_FIX=yes
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
USE_LDCONFIG= yes
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 171cb931bf82..6681e86175a3 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -16,7 +16,6 @@ COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF)
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-WITH_FBSD10_FIX= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/opencore-amr/Makefile b/audio/opencore-amr/Makefile
index 4a6bd6b28c48..22e958b9cf88 100644
--- a/audio/opencore-amr/Makefile
+++ b/audio/opencore-amr/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= SF
MAINTAINER= gslin@gslin.org
COMMENT= OpenCORE implementation of AMR Narrowband & Wideband speech codec
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
diff --git a/audio/portaudio2/Makefile b/audio/portaudio2/Makefile
index 5634cd8e4753..a99747650b1f 100644
--- a/audio/portaudio2/Makefile
+++ b/audio/portaudio2/Makefile
@@ -14,7 +14,6 @@ DISTNAME= pa_stable_v${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable cross-platform Audio API
-WITH_FBSD10_FIX=yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-alsa \
diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index e5c67994d754..33c7bb9782d0 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -15,7 +15,6 @@ COMMENT= An open-source audio processing library
LICENSE= LGPL21
-WITH_FBSD10_FIX=yes
WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared=yes
diff --git a/audio/vo-aacenc/Makefile b/audio/vo-aacenc/Makefile
index a3116d6711a3..8f4bbd00f9cc 100644
--- a/audio/vo-aacenc/Makefile
+++ b/audio/vo-aacenc/Makefile
@@ -18,7 +18,6 @@ LICENSE= ASL
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
post-patch:
@${REINPLACE_CMD} -E -e \
diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
index b9031ca4303e..33c18584a16a 100644
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@@ -14,7 +14,6 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= Audio codec for lossless, lossy and hybrid compression
USE_BZIP2= yes
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack pkgconfig
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/biology/iolib/Makefile b/biology/iolib/Makefile
index 774170ae4b5c..7bc6b647d5ec 100644
--- a/biology/iolib/Makefile
+++ b/biology/iolib/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-WITH_FBSD10_FIX=yes
USE_AUTOTOOLS= libtool:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/chinese/cconv/Makefile b/chinese/cconv/Makefile
index d762f760f119..d386b2c16372 100644
--- a/chinese/cconv/Makefile
+++ b/chinese/cconv/Makefile
@@ -15,7 +15,6 @@ MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Simplified-Traditional Chinese conversion tool
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index dbd245305034..d8d29b011d31 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -15,7 +15,6 @@ COMMENT= The Chewing intelligent phonetic input method library
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
USE_BZIP2= yes
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 3e735ca2f1aa..58daa3ff4074 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -17,7 +17,6 @@ COMMENT= Open source implementation of the OBEX protocol
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack
MAKE_JOBS_SAFE= yes
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile
index 198274898e4c..cddc460eec93 100644
--- a/converters/fribidi/Makefile
+++ b/converters/fribidi/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES= http://fribidi.org/download/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A Free Implementation of the Unicode Bidirectional Algorithm
-WITH_FBSD10_FIX=yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
USE_LDCONFIG= yes
diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index be952dcecabf..b18d75fb8034 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -18,7 +18,6 @@ FETCH_ARGS?= -pRr
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack pkgconfig
CONFIGURE_ARGS= --with-memcached=no --disable-libevent --without-libevent-prefix
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 8af75fe754ca..50dfb0e8c669 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -18,7 +18,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-client databases/mysql50-scripts
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 158bb11f7bb8..8757e53fbdc1 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -19,7 +19,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql51-client databases/mysql51-scripts
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 6213d0bcd471..70168a3c2ea9 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -58,8 +58,6 @@ OPTIONS= \
.include <bsd.port.options.mk>
-WITH_FBSD10_FIX= yes
-
PLIST_FILES= bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \
lib/libsqlite3.a lib/libsqlite3.la lib/libsqlite3.so \
lib/libsqlite3.so.8 libdata/pkgconfig/sqlite3.pc
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 7d6d4d4f41c2..62694ded0e9f 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -18,7 +18,6 @@ CONFLICTS= libiodbc-[0-9]* virtuoso-*
USE_ICONV= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ARGS= --enable-static --enable-shared \
--with-libiconv-prefix=${LOCALBASE}
USE_LDCONFIG= yes
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 21d02d8f5665..a55537f7f8d0 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -15,7 +15,6 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= High-performance CORBA ORB with support for the C language
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= glib12
diff --git a/devel/bennugd-core/Makefile b/devel/bennugd-core/Makefile
index f2f11372c465..b924b3a61467 100644
--- a/devel/bennugd-core/Makefile
+++ b/devel/bennugd-core/Makefile
@@ -20,7 +20,6 @@ MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --bindir="${PREFIX}/libexec"
SUB_FILES= bgdc bgdi
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
ONLY_FOR_ARCHS= i386
ONLY_FOR_ARCHS_REASON= Segfaults on !i386
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index e9884a774531..931200dc3d54 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -15,7 +15,6 @@ DISTNAME= gc-${PORTVERSION:S/.a/alpha/}
MAINTAINER= ports@FreeBSD.org
COMMENT= Garbage collection and memory leak detection for C and C++
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index 0b4f01423a03..05bfa6089db0 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME:S/$/2/}-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= GNU project portable class framework for C++
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack
USE_GMAKE= yes
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index ae9efbc95166..cb883bb58ee1 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -17,7 +17,6 @@ COMMENT= D-Bus bindings for GObject
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-WITH_FBSD10_FIX= yes
USE_GNOME= pkgconfig glib20 gnomehack
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/devel/eina/Makefile b/devel/eina/Makefile
index a43e18edde45..fac9f59acaf7 100644
--- a/devel/eina/Makefile
+++ b/devel/eina/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://download.enlightenment.org/releases/ \
MAINTAINER= magik@roorback.net
COMMENT= Enlightenment API for data types
-WITH_FBSD10_FIX=yes
LICENSE= LGPL21
DIST_SUBDIR= e17
USE_BZIP2= yes
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 1545979ccd11..c3a0cb764176 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -26,7 +26,6 @@ COMMENT= FAM backend for GLib\'s GIO library
USE_XZ= yes
BUILD_WRKSRC= ${WRKSRC}/gio/fam
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack pkgconfig _glib20
USE_FAM= yes
diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index 98f9184d20c7..1ffc25daf002 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -14,7 +14,6 @@ DISTNAME= gtest-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= A framework for writing C++ tests on a variety of platforms
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_PYTHON_BUILD= yes
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index ce6830c9cf7f..b05b9c286751 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \
soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gnomeprefix intlhack gconf2
USE_GMAKE= yes
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index f7a636729222..832c9f3119b2 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -16,7 +16,6 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A library for creating trees of CORBA IDL files
-WITH_FBSD10_FIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 17f2ccc496be..21bb9cb5e720 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -27,7 +27,6 @@ USE_BISON= build
USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_PERL5= yes
USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/libburn/Makefile b/devel/libburn/Makefile
index c33b2995debe..5a0db9f31318 100644
--- a/devel/libburn/Makefile
+++ b/devel/libburn/Makefile
@@ -14,7 +14,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.pl01
MAINTAINER= shuvaev@physik.uni-wuerzburg.de
COMMENT= Libburnia library to read/write optical discs
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/libcheck/Makefile b/devel/libcheck/Makefile
index 5fc71c1db0d7..ef3b1eb0e517 100644
--- a/devel/libcheck/Makefile
+++ b/devel/libcheck/Makefile
@@ -15,7 +15,6 @@ MAINTAINER= sunpoet@FreeBSD.org
COMMENT= A unit test framework for C
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX= yes
PLIST_SUB= CHECK_VERSION=${PORTVERSION}
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 1712bac8e6a5..1a3bf95d1920 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -17,7 +17,6 @@ COMMENT= Provides an API to execute callback functions on certain events
LICENSE= BSD
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libevent2/Makefile b/devel/libevent2/Makefile
index ed461030d7b9..c92511b3c56a 100644
--- a/devel/libevent2/Makefile
+++ b/devel/libevent2/Makefile
@@ -17,7 +17,6 @@ COMMENT= API for executing callback functions on events or timeouts
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
-WITH_FBSD10_FIX=yes
USE_GNOME= lthack
GNU_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/event2
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index c1b5bae2739d..0df6d579f8db 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= ftp://sourceware.org/pub/libffi/
MAINTAINER= bkoenig@alpha-tierchen.de
COMMENT= Foreign Function Interface
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 5a99adff1ab4..e44734eddb93 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -15,7 +15,6 @@ COMMENT= GObject collection library
BUILD_DEPENDS= gobject-introspection>=0.9.0:${PORTSDIR}/devel/gobject-introspection
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-introspection=yes
USE_GMAKE= yes
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index a2bca674b33a..63a66c6f6f16 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -18,7 +18,6 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME glade library
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index e8f5af1cbbd5..f7c4a99435a4 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackend
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --with-hal
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index 4682840475ff..3954d510716c 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
CONFIGURE_ARGS+= --with-pciids-path=${LOCALBASE}/share/pciids
-WITH_FBSD10_FIX=yes
XORG_CAT= lib
.include <bsd.port.mk>
diff --git a/devel/libpthread-stubs/Makefile b/devel/libpthread-stubs/Makefile
index aa4eac192a08..2c9dfaa4fc76 100644
--- a/devel/libpthread-stubs/Makefile
+++ b/devel/libpthread-stubs/Makefile
@@ -18,7 +18,6 @@ USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 09cc073a343a..10897389c896 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -21,7 +21,6 @@ LICENSE_FILE?= ${WRKSRC}/COPYING
CONFLICTS= libtool-fixed-[0-9]*
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS?= --disable-ltdl-install
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile
index 7fa198b7e1af..efba9dd9e3df 100644
--- a/devel/oniguruma5/Makefile
+++ b/devel/oniguruma5/Makefile
@@ -15,7 +15,6 @@ DIST_SUBDIR= ruby
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A BSDL Regular Expressions library compatible with POSIX/GNU/Perl
-WITH_FBSD10_FIX=yes
CONFLICTS= oniguruma-2.*
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index e4a5341f555a..0c94d2c052b9 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -21,7 +21,6 @@ LICENSE_FILE= ${WRKSRC}/LICENCE
OPTIONS= JIT "Enable Just-In-Time compiling support" on
-WITH_FBSD10_FIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 8d20e51534c6..10d429fe50b8 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -17,7 +17,6 @@ COMMENT= A smartcard development library
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 27279b060828..5ed43b6bed95 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -17,7 +17,6 @@ COMMENT= GNU Portable Threads
MAKE_JOBS_UNSAFE= yes
-WITH_FBSD10_FIX= yes
USE_LDCONFIG= ${PREFIX}/lib/pth
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-optimize \
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 975950b3a5b1..41e2ca5bc366 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -30,7 +30,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack glib20
USE_PYTHON= 2.5+
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-docs
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index f6399f8be654..c11841eb56cb 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -25,7 +25,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack orbit2
USE_PYTHON= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config
LDFLAGS+= ${PTHREAD_LIBS}
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 62e9a50b4b45..c592a5f889a9 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= eadler@FreeBSD.org
COMMENT= A library for editing command lines as they are typed
-WITH_FBSD10_FIX=yes
LICENCE= GPLv3
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 600ac89fa709..37a323befd0e 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -15,7 +15,6 @@ DIST_SUBDIR= subversion17
MASTER_SITE_SUBDIR=subversion/:main
MAKE_JOBS_SAFE= yes
-WITH_FBSD10_FIX= yes
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
diff --git a/dns/c-ares/Makefile b/dns/c-ares/Makefile
index 79280115b3c4..bbaf70f96599 100644
--- a/dns/c-ares/Makefile
+++ b/dns/c-ares/Makefile
@@ -23,7 +23,6 @@ OPTIONS= CONFIG_INFO "Add the ares_config_info patch" ON \
CONFLICTS= ares-1.*
MAKE_JOBS_UNSAFE= yes
-WITH_FBSD10_FIX= yes
.include <bsd.port.pre.mk>
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index e7d1d6cb8ca8..75af052a6a8b 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gaod@hychen.org
COMMENT= Internationalized Domain Names command line tool
-WITH_FBSD10_FIX= yes
USE_GNOME= gnomehack pkgconfig
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 59e054877ea2..bc437ae9c503 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -53,7 +53,6 @@ PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
USE_PERL5_BUILD= yes
USE_BZIP2= yes
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-pop3 --enable-smtp --enable-imap --enable-rtsp \
--disable-threaded-resolver --disable-werror
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index eeb7f4fd28e1..58ffa3631c32 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -20,7 +20,6 @@ USE_XZ= yes
USE_PERL5= yes
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libltdl
-WITH_FBSD10_FIX=yes
# For some reason, using our libtool breaks the build into pieces:
#USE_AUTOTOOLS+= libtool
GNU_CONFIGURE= yes
diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile
index 4d0e93c26426..7bd5102d81cb 100644
--- a/graphics/djvulibre-nox11/Makefile
+++ b/graphics/djvulibre-nox11/Makefile
@@ -20,7 +20,6 @@ LICENSE= GPLv2
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
-WITH_FBSD10_FIX=yes
USE_ICONV= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 340895e7fd29..a0dcaa9b67b1 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -16,7 +16,6 @@ COMMENT= Exif and Iptc metadata manipulation library and tools
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index f2bf9e889b03..abae0cab5ad1 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -19,7 +19,6 @@ COMMENT?= Minimalistic plugin API for video effects
.if !defined(BUILDING_FREI0R_METAPORT)
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack pkgconfig
MAKE_JOBS_SAFE= yes
diff --git a/graphics/jbig2dec/Makefile b/graphics/jbig2dec/Makefile
index c64f30f3e72c..ccdfcef54ec1 100644
--- a/graphics/jbig2dec/Makefile
+++ b/graphics/jbig2dec/Makefile
@@ -19,7 +19,6 @@ USE_XZ= yes:src
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-WITH_FBSD10_FIX= yes
OPTIONS= PNG "Enable png support" On \
TESTS "Download and use test-images for post-build testing" Off
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 3a6206b71be9..27360cbe547a 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -22,7 +22,6 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
WRKSRC= ${WRKDIR}/lcms-1.19
OPTIONS= TIFFICC "Build color profile applier for tiff" off \
diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile
index 3cc1475c2053..66b26a90811d 100644
--- a/graphics/lcms2/Makefile
+++ b/graphics/lcms2/Makefile
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
OPTIONS= TIFFICC "Build color profile applier for TIFF" off \
JPEGICC "Build color profile applier for JPEG" off
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 83324cd7a420..823d49d21513 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -17,7 +17,6 @@ COMMENT= Userspace interface to kernel Direct Rendering Module services
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
-WITH_FBSD10_FIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 191f33f63042..9a3794bd489b 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES= http://liblqr.wdfiles.com/local--files/en:download-page/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= An easy to use C/C++ seam carving library
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile
index 30b180400569..3e75027c56eb 100644
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@@ -18,7 +18,6 @@ COMMENT= A C library for encoding data in a QR Code symbol
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/libspiro/Makefile b/graphics/libspiro/Makefile
index c353eb59e4a4..96a27cedaf5f 100644
--- a/graphics/libspiro/Makefile
+++ b/graphics/libspiro/Makefile
@@ -14,7 +14,6 @@ DISTNAME= ${PORTNAME}_src-${PORTVERSION}
MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= Library to convert clothoid splines into bezier splines
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index db73f9e3169d..840c4c0b6ba6 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -19,7 +19,6 @@ CONFLICTS= proj4-[0-9]*
DATUM_GRID_FILES= proj-datumgrid-1.5.zip
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 31cb72ad38ae..95ea87c16036 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -23,7 +23,6 @@ USE_PYTHON= 2.6-2.7
USE_GMAKE= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 3ac1eb5abb93..449a2a884e9d 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \
--disable-locking \
--enable-pthread
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
MAKE_JOBS_UNSAFE= yes
USE_RC_SUBR= saned
diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index 31458934f5d3..1761752dde92 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -17,7 +17,6 @@ COMMENT= Google WebP image format conversion tool
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png
-WITH_FBSD10_FIX= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/japanese/zinnia/Makefile b/japanese/zinnia/Makefile
index 8bd7c2f55fb3..d8d54a7d775a 100644
--- a/japanese/zinnia/Makefile
+++ b/japanese/zinnia/Makefile
@@ -17,7 +17,6 @@ COMMENT= A simple, customizable and portable online hand recognition system
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
-WITH_FBSD10_FIX=ye
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index 4eb3b212025f..5258bb4b02bf 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES= http://download.enlightenment.org/releases/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A C like scripting language used in Enlightenment
-WITH_FBSD10_FIX=yes
LICENSE= BSD
DIST_SUBDIR= e17
USE_BZIP2= yes
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index d1ca8fa7748c..5baa2e20959d 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -16,7 +16,6 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
-WITH_FBSD10_FIX=yes
USE_AUTOTOOLS= autoconf libltdl
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 8711e674292a..e57f760adcae 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -5,7 +5,6 @@ USE_PHPEXT= yes
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
DEFAULT_PHP_VER=5
IGNORE_WITH_PHP=4 52
-WITH_FBSD10_FIX=yes
EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME}
WRKSRC= ${WRKDIR}/${EXTSUBDIR}
diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext
index 49f1252b38da..03658932796b 100644
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@@ -1,6 +1,5 @@
COMMENT= The ${PHP_MODNAME} shared extension for php
-WITH_FBSD10_FIX=yes
USE_PHP= yes
USE_PHPEXT= yes
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index 8711e674292a..e57f760adcae 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -5,7 +5,6 @@ USE_PHPEXT= yes
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
DEFAULT_PHP_VER=5
IGNORE_WITH_PHP=4 52
-WITH_FBSD10_FIX=yes
EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME}
WRKSRC= ${WRKDIR}/${EXTSUBDIR}
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index ae8aee22b92e..9cf3a9ba3883 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -24,7 +24,6 @@ CONFIGURE_SCRIPT= ../configure # must be relative
CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
MAKE_JOBS_SAFE= yes
INSTALL_TARGET= altinstall
MAN1= ${PYTHON_VERSION}.1
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 28ba9bd0c3a4..384423adf231 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-WITH_FBSD10_FIX= yes
INSTALL_TARGET= altinstall
MAN1= ${PYTHON_VERSION}.1
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 2ebcea9b19c4..f4b9260ca7f1 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
INSTALL_TARGET= altinstall
MAN1= ${PYTHON_VERSION}.1
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index f7650d9e1f1a..7b4b52a1f6bf 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
INSTALL_TARGET= altinstall
MAN1= ${PYTHON_VERSION}.1
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 104178b61364..f899439a5fbb 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -24,7 +24,6 @@ CPPFLAGS+= -I${LOCALBASE}
LDFLAGS+= -L${LOCALBASE}/lib
USE_BISON= build
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
MAN1?= valac.1 valac-0.12.1
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index b6996e180516..6a7899696b14 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -17,7 +17,6 @@ DISTNAME= fftw-${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT?= Fast C routines to compute the Discrete Fourier Transform
-WITH_FBSD10_FIX= yes
# current flavors: default, float, and long
FFTW3_FLAVOR?= default
FFTW3_SUFX=
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index e63c8ee4fcb7..51f40cf375a0 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -21,7 +21,6 @@ LICENSE= GPLv3
OPTIONS= IODBC "Enable MathProg iodbc support" Off \
MYSQL "Enable MathProg mysql support" Off
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 97214aab4216..54f108c9ffb0 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -31,7 +31,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--enable-cxx
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
INFO= gmp
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index b0b5c59742d0..92e7277b3925 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -25,7 +25,6 @@ LICENSE= GPLv3
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= MAKEINFO='makeinfo --no-split'
-WITH_FBSD10_FIX=yes
MAN1= gsl-config.1 gsl-randist.1 gsl-histogram.1
MAN3= gsl.3
diff --git a/math/mpc/Makefile b/math/mpc/Makefile
index 89ab899ab909..0022e795a57e 100644
--- a/math/mpc/Makefile
+++ b/math/mpc/Makefile
@@ -21,7 +21,6 @@ CONFIGURE_ARGS= --with-gmp=${LOCALBASE} \
--with-mpfr=${LOCALBASE}
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
INFO= mpc
PLIST_FILES= include/mpc.h \
lib/libmpc.a lib/libmpc.la lib/libmpc.so lib/libmpc.so.2
diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile
index 0f369d3be4af..eaad8d14208e 100644
--- a/math/wfmath/Makefile
+++ b/math/wfmath/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= SF/worldforge/${PORTNAME}%20%28math%20lib%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Worldforge math library
-WITH_FBSD10_FIX=yes
USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
USE_LDCONFIG= yes
diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index bc8f2abcc681..c3a50dd9166c 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://www.jedrea.com/chmlib/
MAINTAINER= fluffy@FreeBSD.org
COMMENT= A library for dealing with Microsoft ITSS/CHM format files
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-io64 --disable-pread --exec-prefix=${PREFIX} --disable-static --enable-examples
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 584f12b0aa51..749ac5265ca4 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -24,7 +24,6 @@ MAKE_JOBS_SAFE= yes
USE_GNOME= pkgconfig
USE_GMAKE= yes
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake autoconf
CONFIGURE_ARGS+= --without-conf --without-clucene --with-zlib --without-icu
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index b58c31b81602..5ef43de0d572 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
FFMPEG_CONFIG= --cc=${CC} \
--enable-runtime-cpudetect \
--enable-pic
diff --git a/multimedia/libdca/Makefile b/multimedia/libdca/Makefile
index 03e62f7eb7d3..e8e73c039a06 100644
--- a/multimedia/libdca/Makefile
+++ b/multimedia/libdca/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSIO
MAINTAINER= pav@FreeBSD.org
COMMENT= Free DTS Coherent Acoustics decoder
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= pkgconfig gnomehack
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index e26d7799573a..1c1e62598263 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -19,7 +19,6 @@ LICENSE= LGPL21
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
popt.0:${PORTSDIR}/devel/popt
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-gtk
CONFIGURE_ENV= PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index c100667a596f..9bba0bd27314 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg \
png.6:${PORTSDIR}/graphics/png
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index 103818703f12..d0ea09df47eb 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Library and tools to read, create, and modify mp4 files
-WITH_FBSD10_FIX=yes
CONFLICTS= mpeg4ip-libmp4v2-[0-9.]*
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index dfb49c775ec6..a294b09b4217 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -28,7 +28,6 @@ USE_GMAKE= yes
USE_GNOME= pygobject gnomehack pkgconfig
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
PLIST_SUB= VERSION="${GST_VERSION}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE} ${PTHREAD_LIBS}
diff --git a/multimedia/schroedinger/Makefile b/multimedia/schroedinger/Makefile
index 88f7cce3ac56..6b06342a2891 100644
--- a/multimedia/schroedinger/Makefile
+++ b/multimedia/schroedinger/Makefile
@@ -24,7 +24,6 @@ LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL
LIB_DEPENDS= orc-0.4:${PORTSDIR}/devel/orc
BUILD_DEPENDS= orc>=0.4.10:${PORTSDIR}/devel/orc
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index eb3511d0edab..fec8de126d2c 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -25,7 +25,6 @@ USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index c06031855d23..038b3f80ee36 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -28,7 +28,6 @@ LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ARGS= --disable-Werror
LDFLAGS+= ${PTHREAD_LIBS}
USE_GMAKE= yes
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 1b435b1d8839..25d973c9ab85 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -31,7 +31,6 @@ GNU_CONFIGURE= yes
USE_RC_SUBR= snmpd.sh snmptrapd.sh
USE_OPENSSL= yes
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
WANT_PERL= yes
CONFIGURE_ENV+= PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}"
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 0857b07326b5..3470bc233b57 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -19,7 +19,6 @@ CONFIGURE_ARGS= CC="${CC}" PATH="${PATH}" \
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
MAN1= geoiplookup.1 geoipupdate.1 geoiplookup6.1
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index b9bbb04797ed..05b7be98d09e 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -25,7 +25,6 @@ LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls \
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack pkgconfig glib20 intltool
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index a49c947a4746..b3a252e548cf 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -15,7 +15,6 @@ MAINTAINER?= onatan@gmail.com
COMMENT= A simple interface to low level networking routines
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_GMAKE= yes
.if !defined(LIBDNET_SLAVE)
diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile
index d7621bc89fb2..fa0043ff1e1f 100644
--- a/net/libexosip2/Makefile
+++ b/net/libexosip2/Makefile
@@ -16,7 +16,6 @@ COMMENT= GPL library that extends the capability of the oSIP library
LIB_DEPENDS= osip2:${PORTSDIR}/net/libosip
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-tools --disable-debug --disable-trace
USE_LDCONFIG= yes
diff --git a/net/radiusclient/Makefile b/net/radiusclient/Makefile
index 3ff4daea1cf8..b0746f42b4ea 100644
--- a/net/radiusclient/Makefile
+++ b/net/radiusclient/Makefile
@@ -19,6 +19,5 @@ COMMENT= Client library and basic utilities for RADIUS AAA
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
.include <bsd.port.mk>
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 16427367c636..f3e70de5ecf5 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -17,7 +17,6 @@ COMMENT= Suite of tools used to connect and sync your Palm handled
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_ICONV= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index f50f7a291783..367516bc4a19 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -32,7 +32,6 @@ USE_ICONV= yes
USE_LDCONFIG= yes
USE_PYTHON_BUILD= 2.5+
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
CONFIGURE_ARGS+=--with-security-framework=polkit \
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 9ecbdfd99999..6b1e8105cb3f 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -16,7 +16,6 @@ COMMENT= A C library for dynamically generating PDF
RESTRICTED= many odd restrictions on usage and distribution
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 338b4f0dad51..58a4998300df 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -17,7 +17,6 @@ DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= Xfce 4 graphical frontend for printing
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/science/bft/Makefile b/science/bft/Makefile
index 05f7bd1c1d33..bdd24b49ebab 100644
--- a/science/bft/Makefile
+++ b/science/bft/Makefile
@@ -17,7 +17,6 @@ COMMENT= Code_Saturne Base Functions and Types library
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index be6029ef0888..f7694f8f5812 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -17,7 +17,6 @@ COMMENT= Hierarchical Data Format library (from NCSA)
CONFLICTS= hdf-4.* hdf5-1.6.*
NO_LATEST_LINK= yes
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/science/libint/Makefile b/science/libint/Makefile
index 21aa568fd074..2b7319f49e3b 100644
--- a/science/libint/Makefile
+++ b/science/libint/Makefile
@@ -18,7 +18,6 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
ALL_TARGET= # empty
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index da1deb33912a..b3cf850f4c33 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -19,7 +19,6 @@ COMMENT?= Library for machine-independent, array-oriented data access
CONFLICTS= hdf-4.* netcdf-4.*
PORTSCOUT= limit:^3\.
-WITH_FBSD10_FIX=yes
CONFIGURE_ARGS= --enable-shared
CPPFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC
GNU_CONFIGURE= yes
diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index e8c5c5b72204..99c80626a1a3 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -16,7 +16,6 @@ COMMENT= Chemistry file translation program
LIB_DEPENDS= boost_python.4:${PORTSDIR}/devel/boost-python-libs
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack libxml2
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 77d148d20922..d9c5cbe0f55a 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -16,7 +16,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= The GNU Privacy Guard
-WITH_FBSD10_FIX=yes
USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 656ad2121e62..857b8580df65 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= nettle.4:${PORTSDIR}/security/nettle \
CONFLICTS= gnutls-devel-[0-9]*
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_ICONV= yes
USE_GNOME= pkgconfig ltverhack gnomehack
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index a42dbd5e85c4..ec5b7a910e80 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -23,7 +23,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-static
USE_LDCONFIG= yes
USE_PERL5_BUILD=yes
-WITH_FBSD10_FIX=yes
INFO= ksba
diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index 05312ec83501..5b280f5a6442 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -18,7 +18,6 @@ COMMENT= A library implementing the SSH2 protocol
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
-WITH_FBSD10_FIX=yes
USE_OPENSSL= yes
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 6423c5f9150e..1a01e97ed050 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR= libtasn1
MAINTAINER= novel@FreeBSD.org
COMMENT= ASN.1 structure parser library
-WITH_FBSD10_FIX= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 658f66b15503..e2712b7c36ca 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -17,7 +17,6 @@ COMMENT= An easy-to-use library for strong hashes such as MD5 and SHA1
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ARGS+= --enable-static --with-gnu-ld
MAN3= mhash.3
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 0b1b530311e1..ce15688d2e70 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -44,7 +44,6 @@ COMMENT= Allow others to run commands as root
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-ignore-dot \
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index cca829a2ed4f..ccb0bbfb4f0c 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -17,7 +17,6 @@ COMMENT= Framework for defining and tracking users
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
-WITH_FBSD10_FIX=yes
WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION}
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index c6c157d690dd..a6a40c725191 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= FUSE allows filesystem implementation in userspace
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin
CFLAGS+= ${PTHREAD_CFLAGS}
USE_GNOME= pkgconfig
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index 84ca7a11080c..e0b198fbb88d 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -33,7 +33,6 @@ USE_PERL5_BUILD=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -liconv
MAN1= cd-drive.1 cd-info.1 iso-read.1 iso-info.1 cd-read.1
-WITH_FBSD10_FIX=yes
INFO= libcdio
diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile
index 276cc0b226b2..1b6c7d0ec83c 100644
--- a/sysutils/policykit-gnome/Makefile
+++ b/sysutils/policykit-gnome/Makefile
@@ -18,7 +18,6 @@ COMMENT= GNOME frontend to the PolicKit framework
LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index db5f9071a84c..fe5ca3891d73 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
USERS= polkit
GROUPS= polkit
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack glib20 intlhack
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 83357190733d..b10e0ea57ff6 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -16,7 +16,6 @@ COMMENT= GNOME frontend to the PolicKit framework
LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 11672fb71b38..3408391bfee3 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= eggdbus-1.0:${PORTSDIR}/devel/eggdbus \
expat.6:${PORTSDIR}/textproc/expat2
RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-WITH_FBSD10_FIX= yes
USE_GNOME= gnomehack glib20 intlhack
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/sysutils/sg3_utils/Makefile b/sysutils/sg3_utils/Makefile
index f3aa9b717e59..d5c806a782fe 100644
--- a/sysutils/sg3_utils/Makefile
+++ b/sysutils/sg3_utils/Makefile
@@ -17,7 +17,6 @@ COMMENT= Set of utilities that send SCSI commands to devices
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
MAN8= scsi_readcap.8 scsi_ready.8 scsi_start.8 scsi_stop.8 \
sg3_utils.8 sg_format.8 sg_get_config.8 sg_get_lba_status.8 \
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 3eb723063052..7aae8fd2b923 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -33,7 +33,6 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_PERL5_BUILD= yes
USE_LDCONFIG= yes
-WITH_FBSD10_FIX= yes
SLAVEDIRS= textproc/aspell-without-dicten
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 202d443c1e26..9ad2f4bd0d41 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -21,7 +21,6 @@ USE_AUTOTOOLS= autoconf aclocal autoheader automake libtool
ACLOCAL_ARGS= -I . -I gnulib/m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_LDCONFIG= yes
-WITH_FBSD10_FIX=yes
MAN1= augparse.1 augtool.1
MANCOMPRESSED= no
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 8c5d2437b250..045e00876628 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= SF
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= XML 1.0 parser written in C
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
ALL_TARGET= default
USE_LDCONFIG= yes
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index 21fa50029c67..587e63e115c6 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -20,7 +20,6 @@ LICENSE_COMB= dual
CONFIGURE_ARGS= --disable-nls --with-readline --with-ui \
--with-libiconv-prefix=${LOCALBASE}
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
MAKE_JOBS_SAFE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index 92d4174092c6..61a963f0e5e2 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -18,7 +18,6 @@ COMMENT= A C library for writing XML 1.0/1.1 files or streams
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 761572b68d13..efd093ab9b08 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -18,7 +18,6 @@ LATEST_LINK= ${PORTNAME}08
LICENSE= LGPL21
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack libgsf
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index e7076c79d6c6..8c6daeb60a71 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -30,7 +30,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
USE_GNOME= gnomehack libxml2 pkgconfig
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static --disable-documentation
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index ae151bd6d170..22d5e8666e87 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -32,7 +32,6 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
USE_GNOME?= gnomehack pkgconfig
USE_LDCONFIG= yes
-#WITH_FBSD10_FIX=yes
CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
--with-html-dir=${PREFIX}/share/doc \
--with-html-subdir=${PORTNAME} \
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 7d1b1caf15c9..6b93f871d1ba 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -27,7 +27,6 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--without-python
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-WITH_FBSD10_FIX= yes
.if defined(MASTERDIR)
_SLAVE_PORT= yes
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index d269c0becd6e..118e9064595f 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -18,7 +18,6 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_PERL5= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
--datadir=${PREFIX}/share/sgml/openjade \
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index b9cde6b444ba..77cbeac5ca5e 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -17,7 +17,6 @@ COMMENT= RDF Parser Toolkit for Redland
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index f0b84800c374..9509d75ffcbf 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
CONFLICTS= raptor-1.4.1[0-9]* raptor-1.4.21
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 302079bd713e..403f488b9dd0 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -28,7 +28,6 @@ DOCBOOK_VERSION=4.2
CONFLICTS= scrollkeeper-[0-9]*
-WITH_FBSD10_FIX=yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehier gnomehack libxslt
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index ea71dce2296e..1183c312dce2 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= senna/33763
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Embeddable Fulltext Search Engine
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_LDCONFIG= YES
diff --git a/textproc/tidyp/Makefile b/textproc/tidyp/Makefile
index b993b4199c7e..ec374f00aae5 100644
--- a/textproc/tidyp/Makefile
+++ b/textproc/tidyp/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://cloud.github.com/downloads/petdance/tidyp/ \
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= A library and program to validate and fix HTML
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/textproc/xerces-c3/Makefile b/textproc/xerces-c3/Makefile
index cc7a2ceedc61..1cc2c19d1488 100644
--- a/textproc/xerces-c3/Makefile
+++ b/textproc/xerces-c3/Makefile
@@ -17,7 +17,6 @@ COMMENT= Validating XML parser from the Apache XML Project
CONFLICTS= xerces_c-[0-9]* xerces-c2-[0-9]*
-WITH_FBSD10_FIX=yes
USE_GMAKE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 1347cdbde2eb..6282853bd8e8 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org acecad input driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
MAN4= acecad.4x
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
index 87b857ce8347..b58b18315b81 100644
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -15,7 +15,6 @@ COMMENT= eGalax touch screen input driver for X.Org
LICENSE= BSD
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
MAN4= egalax.4x
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index d31f64feac68..48901c312f8c 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org elographics input driver
-WITH_FBSD10_FIX= yes
XORG_CAT= driver
MAN4= elographics.4x
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index 703267742e1d..5a13b5284dc8 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org hyperpen input driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index d1712a63b2ff..d533a872b1f9 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -14,7 +14,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org joystick input driver
XORG_CAT= driver
-WITH_FBSD10_FIX=yes
MAN4= joystick.4x
post-patch:
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 51a6e4bf9979..3a5205df7340 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org keyboard input driver
-WITH_FBSD10_FIX= yes
XORG_CAT= driver
USE_XORG= kbproto
MAN4= kbd.4x
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 90e1a4699544..319e96c8dd86 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org mouse input driver
-WITH_FBSD10_FIX= yes
XORG_CAT= driver
MAN4= mousedrv.4x
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index 8ef80feddba9..de568328ec74 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org mutouch input driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
MAN4= mutouch.4x
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 1ce3edf18375..d67d1c7a7215 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org penmount input driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
MAN4= penmount.4x
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index d5ef9422d0ba..b251bd51b857 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -15,7 +15,6 @@ COMMENT= X.Org synaptics input driver
CONFLICTS= synaptics-[0-9]*
-WITH_FBSD10_FIX=yes
USE_GNOME= gnomehack
USE_XORG= x11
XORG_CAT= driver
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 55b4e2308463..78cc5c02c74e 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vmmouse input driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
USE_GMAKE= yes
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 8bb0cf91dd64..530f563a8515 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org void input driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
MAN4= void.4x
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 26e51a7705ba..5eaddccbec44 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org apm display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= apm.4x
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 930a3042e9f2..b3e381ae2169 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org ark display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xextproto
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 03b0f2bfea58..fc420fb913c6 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -13,7 +13,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org ati display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
MAN4= ati.4x radeon.4x
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index 9b98b309a276..78c6c7c63a77 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -15,7 +15,6 @@ COMMENT= X.Org ati display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
MAN4= ati.4x radeon.4x
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 76b36bf4f361..2de3dc72e873 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org chips display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= chips.4x
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 44b852abf26b..1def9f85551a 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org cirrus display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= cirrus.4x
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index e93df287a18c..9b0f1474aed2 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org dummy display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xf86dgaproto
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 370a31c5251e..5573b32c332f 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org fbdev display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto
MAN4= fbdev.4x
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index be07e736dcd1..fe6678ebc269 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -14,7 +14,6 @@ COMMENT= X.Org glint display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto xf86dgaproto glproto
MAN4= glint.4x
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 8b1809938654..3c61786b42b2 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i128 display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= i128.4x
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 950aeded59d3..7320b92768e3 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i740 display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= i740.4x
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 184772fe6215..fbabd24c2808 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -15,7 +15,6 @@ COMMENT= Driver for Intel integrated graphics chipsets
CONFLICTS= xf86-video-i810-[0-9]*
-WITH_FBSD10_FIX=yes
ONLY_FOR_ARCHS= amd64 i386
USE_GL= gl
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 044c401e5755..2d6ae32d81bb 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -14,7 +14,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org mach64 display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index e11f3cdca43e..8ffe2ccff5f6 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -15,7 +15,6 @@ COMMENT= X.Org mga display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto glproto
MAN4= mga.4x
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 329069269f65..17a2a42b3b79 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org neomagic display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto xf86dgaproto
MAN4= neomagic.4x
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 8420c8fa306a..7d8e3627dfd5 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org newport display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto
MAN4= newport.4x
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 1c360dc2cbb1..0b4dac78c3d6 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/
MAINTAINER= x11@FreeBSD.org
COMMENT= Free nouveau display driver for nvidia-based cards
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto xf86driproto glproto
MAN4= nouveau.4x
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 2941190ed5e7..7a3dd9c60c3d 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org nv display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= nv.4x
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 9a7898c31a2e..b3e4d076eeb5 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -16,7 +16,6 @@ COMMENT= X.Org openChrome display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xf86driproto xextproto xvmc glproto
MAN4= openchrome.4x
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index a39ccf61f636..e5aa4aa2014f 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -14,7 +14,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org r128 display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
MAN4= r128.4x
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 4d4b4b9d5e35..296a5dfa3a15 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS= pciaccess.0:${PORTSDIR}/devel/libpciaccess
XORG_CAT= driver
USE_XORG= damageproto glproto videoproto xextproto xf86driproto
USE_AUTOTOOLS= automake:env aclocal:env autoconf libtool
-WITH_FBSD10_FIX=yes
CONFLICTS= xf86-video-radeonhd-[0-9]*
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index fa02e1a5fa28..ab8364509771 100644
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ b/x11-drivers/xf86-video-radeonhd/Makefile
@@ -18,7 +18,6 @@ OPTIONS= UTILS "Install rhd_conntest and rhd_dump utilities" off
XORG_CAT= driver
USE_XORG= damageproto glproto videoproto xextproto xf86driproto
CONFIGURE_ARGS= --enable-exa
-WITH_FBSD10_FIX=yes
CONFLICTS= xf86-video-radeonhd-devel-[0-9]*
MAN4= radeonhd.4x
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index bca1a5acafab..8fc96d2825b2 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org rendition display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xextproto
MAN4= rendition.4x
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index d2d85d4177ee..5397647eaeb4 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org s3 display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= s3.4x
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 5e4afb39e0f6..bd879ee46402 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org s3virge display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= s3virge.4x
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 0e82c6b9f287..2cad8e1b3344 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -14,7 +14,6 @@ COMMENT= X.Org savage display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto glproto
MAN4= savage.4x
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index ef6b71e22045..cfa486f576bd 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org siliconmotion display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= siliconmotion.4x
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 86d54d7886c5..8140572d303b 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -17,7 +17,6 @@ CONFLICTS= xf86-video-sis-intel-[0-9]*
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
MAN4= sis.4x
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index ace3dd082ca3..6cc72846aba3 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -15,7 +15,6 @@ COMMENT= X.Org sunffb display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86driproto xextproto glproto
MAN4= sunffb.4x
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 98c15a9f940c..9e80c3b636ab 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -15,7 +15,6 @@ COMMENT= X.Org tdfx display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto glproto
MAN4= tdfx.4x
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 8d22a2646ac9..5acd2d113ab1 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org tga display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto xf86dgaproto
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index fc08ce106753..f768d3c8b92d 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org trident display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto xf86dgaproto
MAN4= trident.4x
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index fa430e84d60e..06ee4272b1ce 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org tseng display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= tseng.4x
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index f8575257c7be..a2fccafde091 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vesa display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xextproto
MAN4= vesa.4x
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index e7ca84ee6da3..c769d950997e 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -15,7 +15,6 @@ COMMENT= X.Org via display driver
IGNORE= requires pciVideoPtr typedef
-WITH_FBSD10_FIX=yes
USE_GL= gl
XORG_CAT= driver
USE_XORG= xvmc xf86driproto xextproto x11 glproto
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index cde97195a922..f3376257ef01 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vmware display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xextproto xineramaproto videoproto
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 92bb5e365ab9..86eef10a10d1 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -12,7 +12,6 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org voodoo display driver
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
USE_XORG= xf86dgaproto xextproto
MAN4= voodoo.4x
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 8368ba34763d..d59ed7216355 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -26,7 +26,6 @@ USE_GNOME= desktopfileutils gnomehack gtk20 intltool intlhack pkgconfig gdkpixbu
USE_LDCONFIG= yes
USE_XFCE= configenv libexo libmenu libutil
USE_XORG= sm x11
-WITH_FBSD10_FIX=yes
OPTIONS= DBUS "Enable D-BUS support" on \
NLS "Enable Native Language Support" on \
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index ed8ac0f5722b..12f4a06c16ad 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -15,7 +15,6 @@ COMMENT= X font libary
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= xproto:both xtrans fontsproto:both fontenc
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index 2afac573bf9c..19974c04aa83 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -14,7 +14,6 @@ COMMENT= The Xfontcache library
XORG_CAT= lib
USE_XORG= fontcacheproto:both x11 xext xextproto
-WITH_FBSD10_FIX= yes
MAN3= FontCacheChangeCacheSettings.3 \
FontCacheQueryExtension.3 \
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 9a53b1958340..696f58073d65 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -16,7 +16,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= xproto:both xrender
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index 1bdd79f59af7..41c3c2966460 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -14,6 +14,5 @@ COMMENT= The fontenc Library
XORG_CAT= lib
USE_XORG= xproto
-WITH_FBSD10_FIX= yes
.include <bsd.port.mk>
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index fb961096e111..9adc85cc767e 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= anholt/driglide/
MAINTAINER= ports@FreeBSD.org
COMMENT= Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI
-WITH_FBSD10_FIX=yes
USE_XORG= xxf86vm xxf86dga
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile
index 134378d10e1a..cf56a40d12cb 100644
--- a/x11-servers/mga_hal/Makefile
+++ b/x11-servers/mga_hal/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= Module for additional features with X.Org/XFree86 Matrox driver
RESTRICTED= Matrox drivers may not be distributed.
-WITH_FBSD10_FIX=yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 8bb9d9d352f6..02fe10c85733 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard
XORG_CAT= xserver
-WITH_FBSD10_FIX=yes
USE_GMAKE= yes
USE_GL= gl
USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 935ed769cfc9..c40e5cc49e9c 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -15,7 +15,6 @@ DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= An Xfce engine for GTK 2.0
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gtk20 pkgconfig
diff --git a/x11-toolkits/gtkimageview/Makefile b/x11-toolkits/gtkimageview/Makefile
index 396a5d7ade64..ecc7786e89b4 100644
--- a/x11-toolkits/gtkimageview/Makefile
+++ b/x11-toolkits/gtkimageview/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES= LOCAL/kwm
MAINTAINER= kwm@FreeBSD.org
COMMENT= Simple image viewer widget
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static
USE_GNOME= gtk20
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 27f31857ab44..3dda64cc8efd 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-toolkits
MAINTAINER= x11@FreeBSD.org
COMMENT= X Athena Widgets library
-WITH_FBSD10_FIX=yes
XORG_CAT= lib
USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
USE_GMAKE= yes
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index f14b4f0bdde1..7d4ed1ccdaaf 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11-toolkits
MAINTAINER= x11@FreeBSD.org
COMMENT= X Miscellaneous Utilities libraries
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= xproto:both x11 xt xext
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 3202b1e18869..e7bc81dea28b 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -14,7 +14,6 @@ COMMENT= X Toolkit library
XORG_CAT= lib
USE_XORG= x11 sm xproto:both kbproto
-WITH_FBSD10_FIX= yes
MAN3= MenuPopdown.3 \
MenuPopup.3 \
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index a124d0b309a8..fbba2a59270d 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -26,7 +26,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pango
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 09a029f50c97..53d07082d7a4 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -28,7 +28,6 @@ USE_GNOME= gnomehack libglade2 pygobject
USE_PYTHON= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-WITH_FBSD10_FIX=yes
CONFIGURE_ENV= LIBS="-lintl" \
PYTHON="${PYTHON_VERSION}"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 1ec98523192a..ed3c6056c4dd 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -15,6 +15,5 @@ COMMENT= Inter Client Exchange library for X11
XORG_CAT= lib
USE_XORG= xproto:both xtrans
-WITH_FBSD10_FIX= yes
.include <bsd.port.mk>
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 5a7a3ea97f10..05af68453f54 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -17,7 +17,6 @@ LICENSE= MIT
BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= ice xproto:both xtrans
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d415cafb4b92..76826561eb99 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \
${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-WITH_FBSD10_FIX=yes
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 86327e486fb3..8a206ab25518 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -15,7 +15,6 @@ COMMENT= The XScrnSaver library
XORG_CAT= lib
USE_XORG= x11 xext xextproto scrnsaverproto:both
-WITH_FBSD10_FIX= yes
MAN3= Xss.3 \
XScreenSaverAllocInfo.3 \
XScreenSaverGetRegistered.3 \
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 7debc9999e47..73ddb55609bf 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -14,7 +14,6 @@ COMMENT= Authentication Protocol library for X11
XORG_CAT= lib
USE_XORG= xproto:both
-WITH_FBSD10_FIX= yes
MAN3= Xau.3 XauDisposeAuth.3 XauFileName.3 XauGetAuthByAddr.3 \
XauGetBestAuthByAddr.3 XauLockAuth.3 XauReadAuth.3 \
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 3623c2e28a15..effee3169f91 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Composite extension library
-WITH_FBSD10_FIX=yes
XORG_CAT= lib
USE_XORG= compositeproto:both x11 xfixes xext fixesproto xproto:both
MAN3= Xcomposite.3 \
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 1dd8d8f0f2cb..31fb2148208a 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -14,7 +14,6 @@ COMMENT= X client-side cursor loading library
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= xrender x11 xfixes fixesproto xproto:both \
xextproto
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 176b90741303..f27b13611b89 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -14,6 +14,5 @@ COMMENT= X Damage extension library
XORG_CAT= lib
USE_XORG= x11 damageproto:both xfixes fixesproto xextproto xproto:both
-WITH_FBSD10_FIX= yes
.include <bsd.port.mk>
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 8bdfcd8419d2..ad629cf5fb2e 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -16,7 +16,6 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= xproto:both
-WITH_FBSD10_FIX= yes
CONFIGURE_ARGS+=--disable-docs --without-xmlto
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index 576070e71ed1..11d67e701b89 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -14,7 +14,6 @@ COMMENT= The Xevie library
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= evieproto x11 xext xextproto xproto:both
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index f5b20bff321a..24f7bad8d840 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -16,7 +16,6 @@ COMMENT= X11 Extension library
LICENSE= MIT
-WITH_FBSD10_FIX=yes
XORG_CAT= lib
USE_XORG= xproto x11 xextproto:both xau
CONFIGURE_ARGS+=--disable-specs --without-xmlto
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index ee00dca0034b..338fe642a411 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -14,7 +14,6 @@ COMMENT= X Fixes extension library
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= x11 fixesproto:both xproto:both xextproto
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 757ea708f0d2..d4ab0714e8ca 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -15,7 +15,6 @@ COMMENT= X Input extension library
LICENSE= MIT
-WITH_FBSD10_FIX=yes
XORG_CAT= lib
USE_XORG= xproto x11 xext xextproto inputproto:both
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 53767e7e4aba..3e44c8540793 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -14,7 +14,6 @@ COMMENT= X Pixmap library
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= xproto x11 xext xextproto xt
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 88913d4a58fa..6d5e9610656d 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -17,7 +17,6 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both
-WITH_FBSD10_FIX= yes
MAN3= Xrandr.3 \
XRRConfigCurrentConfiguration.3 \
XRRConfigCurrentRate.3 \
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 8095b24ef336..301d1c153ece 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -14,7 +14,6 @@ COMMENT= X Render extension library
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= x11 renderproto:both xproto:both
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index f73fc866595f..a3d822122476 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -17,7 +17,6 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 xext xextproto resourceproto xproto:both
-WITH_FBSD10_FIX= yes
MAN3= XRes.3 \
XResQueryClients.3 \
XResQueryClientPixmapBytes.3 \
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index cb4e9732f30a..333c8d841bb2 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -15,7 +15,6 @@ COMMENT= X Video Extension library
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= x11 xext xextproto videoproto:both xproto:both
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index e0b974d2ea27..6404f9752524 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -14,7 +14,6 @@ COMMENT= X DGA Extension
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86dgaproto:both
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index bcc70227aace..fd15d2ab7d40 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -17,7 +17,6 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86miscproto:both
-WITH_FBSD10_FIX=yes
MAN3= XF86Misc.3 \
XF86MiscGetKbdSettings.3 \
XF86MiscGetMouseSettings.3 \
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index f54f00602ae2..1385ced799ad 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -16,7 +16,6 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86vidmodeproto:both
-WITH_FBSD10_FIX= yes
MAN3= XF86VM.3 \
XF86VidModeLockModeSwitch.3 \
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 90a33ccbc4e1..5ec77e3ad23d 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -15,7 +15,6 @@ COMMENT= DMX extension library
XORG_CAT= lib
USE_XORG= x11 xext xextproto dmxproto:both
-WITH_FBSD10_FIX=yes
MAN3= DMX.3 \
DMXAddInput.3 \
DMXAddScreen.3 \
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 6577fbfd7096..a451cfe01f48 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
WRKSRC= ${WRKDIR}/${DISTNAME}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/lib//}
-WITH_FBSD10_FIX=yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 33fc339d8f5f..c92e1518a45c 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -31,7 +31,6 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_XORG= xau xdmcp
USE_PYTHON_BUILD= 2.5-2.7
-WITH_FBSD10_FIX= yes
GNU_CONFIGURE= yes
.for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index fea958e0a755..c957f7884a20 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -14,7 +14,6 @@ COMMENT= XKB file library
LICENSE= MIT
-WITH_FBSD10_FIX= yes
XORG_CAT= lib
USE_XORG= x11 kbproto:both
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
index 23ceaa250acb..c4cb3351c379 100644
--- a/x11/libxkbui/Makefile
+++ b/x11/libxkbui/Makefile
@@ -13,7 +13,6 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= The xkbui library
-WITH_FBSD10_FIX=yes
XORG_CAT= lib
USE_XORG= x11 xt xkbfile kbproto:both
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 85ac576ff8a2..4df0e6e57d76 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -30,8 +30,6 @@ USE_XORG= xtst
INSTALLS_ICONS= yes
-WITH_FBSD10_FIX= yes
-
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_UNIQUE)