-optional_depends slv2 \
+optional_depends lilv-0 \
"LV2=1" \
"LV2=0" \
"for LV2 plugin support" &&
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index fe37256..5895129 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,8 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ DEPENDS, PRE_BUILD, BUILD, INSTALL: Keep it building with old version
+ of aubio, fixed lv2 dep. Note for the future: Ardour 2 is not
obsoleted by
+ Ardour 3! Import of old sessions in the latter is not lossless, sadly.
+
2013-10-23 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, ardour-2.8.16-lilv16.patch: build fix from
diff --git a/audio-libs/aubio03/BUILD b/audio-libs/aubio03/BUILD
new file mode 100755
index 0000000..b68d0f8
--- /dev/null
+++ b/audio-libs/aubio03/BUILD
@@ -0,0 +1,5 @@
+cd "$SOURCE_DIRECTORY" &&
+# Stupid, stupid!
+export LDFLAGS="$LDFLAGS -lm" &&
+./configure $OPTS --prefix="$INSTALL_ROOT/opt/aubio03" &&
+make
diff --git a/audio-libs/aubio03/DEPENDS b/audio-libs/aubio03/DEPENDS
new file mode 100755
index 0000000..26e106f
--- /dev/null
+++ b/audio-libs/aubio03/DEPENDS
@@ -0,0 +1,18 @@
+depends libsndfile &&
+depends libsamplerate &&
+depends fftw &&
+
+optional_depends alsa-lib \
+ "--enable-alsa" \
+ "--disable-alsa" \
+ "for ALSA support" &&
+
+optional_depends JACK-DRIVER \
+ "--enable-jack" \
+ "--disable-jack" \
+ "for JACK support" &&
+
+optional_depends lash \
+ "--enable-lash" \
+ "--disable-lash" \
+ "for LASH support (it will force alsa and jack depends)"
diff --git a/audio-libs/aubio03/DETAILS b/audio-libs/aubio03/DETAILS
new file mode 100644
index 0000000..af8440c
--- /dev/null
+++ b/audio-libs/aubio03/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=aubio03
+ VERSION=0.3.2
+ SOURCE=aubio-$VERSION.tar.gz
+ SOURCE_URL[0]=http://aubio.org/pub/$SOURCE
+
SOURCE_HASH=sha512:b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/aubio-$VERSION
+ WEB_SITE=http://aubio.org/
+ LICENSE[0]=GPL
+ ENTERED=20080710
+ SHORT="library for audio labelling"
+cat << EOF
+This is an old version there only to make Ardour2 work!
+
+aubio is a library for audio labelling. Its features include segmenting a
+sound file before each of its attacks, performing pitch detection, tapping
the
+beat and producing midi streams from live audio. The name aubio comes from
+'audio' with a typo: several transcription errors are likely to be found in
+the results too.
+
+The aim of this project is to provide these automatic labelling features to
+other audio softwares. Functions can be used offline in sound editors and
+software samplers, or online in audio effects and virtual instruments.
+EOF
diff --git a/audio-libs/aubio03/HISTORY b/audio-libs/aubio03/HISTORY
new file mode 100644
index 0000000..386d8c0
--- /dev/null
+++ b/audio-libs/aubio03/HISTORY
@@ -0,0 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD: install old version of spell to
/opt/aubio03 as
+ prerequesite for ardour2
+
+2008-07-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/audio-libs/lilv-0/HISTORY b/audio-libs/lilv-0/HISTORY
index 07d457f..84d7695 100644
--- a/audio-libs/lilv-0/HISTORY
+++ b/audio-libs/lilv-0/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: fail-safe cleanup of non-libraries
+
2013-10-23 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: created
diff --git a/audio-libs/lilv-0/INSTALL b/audio-libs/lilv-0/INSTALL
index 54ea838..8d809b8 100755
--- a/audio-libs/lilv-0/INSTALL
+++ b/audio-libs/lilv-0/INSTALL
@@ -1,4 +1,4 @@
./waf install --destdir=".pre-install" &&
-rm -rv .pre-install/usr/{bin,etc,share/man} &&
+rm -rvf .pre-install/usr/{bin,etc,share/man} &&
# cp -a complains about inability to preserve times for symlinks
cp -rv .pre-install/* "$INSTALL_ROOT/"
diff --git a/audio-libs/lv2/HISTORY b/audio-libs/lv2/HISTORY
index 7d9c040..d141342 100644
--- a/audio-libs/lv2/HISTORY
+++ b/audio-libs/lv2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: pre-create directory
+
2013-10-23 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created
* CONFLICTS: replaces lv2core
diff --git a/audio-libs/lv2/INSTALL b/audio-libs/lv2/INSTALL
index 0ea15cc..6af2edc 100755
--- a/audio-libs/lv2/INSTALL
+++ b/audio-libs/lv2/INSTALL
@@ -1 +1,3 @@
+# Too dumb to use mkdir -p in waf?
+mkdir -p "$INSTALL_ROOT/usr/lib/lv2" &&
waf_install
diff --git a/audio-libs/slv2/DEPENDS b/audio-libs/slv2/DEPENDS
index 0a13f7c..569adcc 100755
--- a/audio-libs/slv2/DEPENDS
+++ b/audio-libs/slv2/DEPENDS
@@ -1,5 +1,5 @@
depends python &&
-depends lv2core &&
+depends lv2 &&
depends redland &&
optional_depends JACK-DRIVER \
diff --git a/audio-libs/slv2/HISTORY b/audio-libs/slv2/HISTORY
index 1694755..2c49867 100644
--- a/audio-libs/slv2/HISTORY
+++ b/audio-libs/slv2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depend on lv2 instead of lv2core
+
2011-10-22 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Updated to 0.6.6.
diff --git a/audio-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE
index bab1c79..1c5107e 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -149,11 +149,12 @@ config_query_option XMMS2_OPTS
\
y \
"--with-plugins=wave" \
"--without-plugins=wave" &&
-config_query_option XMMS2_OPTS \
- "Do you want CDDA support" \
- y \
- "--with-plugins=cdda" \
- "--without-plugins=cdda" &&
+# Does not build without CDDA.
+#config_query_option XMMS2_OPTS \
+# "Do you want CDDA support" \
+# y \
+# "--with-plugins=cdda" \
+# "--without-plugins=cdda" &&
config_query_option XMMS2_OPTS \
"Do you want GVFS support" \
y \
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index a6df3fe..8580b7f 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -4,10 +4,9 @@ depends glib2
&&
#Transport plugins &&
if list_find "$XMMS2_OPTS" "--with-xmms2d" ; then
- if list_find "$XMMS2_OPTS" "--with-plugins=cdda" ; then
+# CDDA plugin is required.
depends libcdio &&
depends libdiscid
- fi &&
if list_find "$XMMS2_OPTS" "--with-plugins=xspf" ||
list_find "$XMMS2_OPTS" "--with-plugins=xml" ||
list_find "$XMMS2_OPTS" "--with-plugins=rss"
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 6c90a3c..72826c8 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ CONFIGURE, DEPENDS: always build with CDDA (breaks otherwise)
+
2011-10-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.8DrO_o
* PRE_BUILD: no more patching
diff --git a/audio-plugins/swh-plugins/HISTORY
b/audio-plugins/swh-plugins/HISTORY
index 88cb9e1..88472fb 100644
--- a/audio-plugins/swh-plugins/HISTORY
+++ b/audio-plugins/swh-plugins/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fix build with current autotools
+
2014-03-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* swh-plugins-nosetlocale.patch: add missing file
+# Minimal hack to make it work with current autoconf.
+# More should be done. Like, ditching bitchin' autoconf.
+sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in &&
# ipdate gettext macros
autopoint -f &&
autoreconf -f -i
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index f1d00c1..c56965f 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: add a define missing from current ffmpeg
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 14.4.1
diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index bc5bec1..6784dae 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -8,3 +8,8 @@ patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
if spell_ok ffmpeg && is_version_less 0.10 $(installed_version ffmpeg); then
patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
fi
+# New ffmpeg misses that define for some reason.
+echo "#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+#endif" >> src/ffmpeg.h
+
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 439d74f..86acf00 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,11 +1,11 @@
SPELL=gnutls
case $GNUTLS_BRANCH in
stable)
- VERSION=3.2.16
+ VERSION=3.2.17
SOURCE=$SPELL-$VERSION.tar.xz
;;
stable-old)
- VERSION=3.1.25
+ VERSION=3.1.26
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 7823c4e..efe27f2 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2014-08-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.2.17 and 3.1.26
+
2014-07-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 3.2.16
* DEPENDS: add gettext, remove lzo
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 3c0c110..dd56ffd 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fixup of default branch with PEM
+ * nss-pem-20140808.tar.bz2: new PEM from
+ https://git.fedorahosted.org/git/nss-pem.git
+ * INSTALL: fix path for nss-config in 3.15.5
+
2014-07-22 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: fix 3.16 aptching
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8
diff --git a/e-17/ecore/ecore-1.7.8.tar.bz2.sig
b/e-17/ecore/ecore-1.7.8.tar.bz2.sig
deleted file mode 100644
index 34f0581..0000000
Binary files a/e-17/ecore/ecore-1.7.8.tar.bz2.sig and /dev/null differ
diff --git a/e-17/eina/DETAILS b/e-17/eina/DETAILS
index ada4cf1..6942279 100755
--- a/e-17/eina/DETAILS
+++ b/e-17/eina/DETAILS
@@ -1,10 +1,10 @@
SPELL=eina
- VERSION=1.7.8
+ VERSION=1.7.10
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
-#
SOURCE_HASH=sha512:eaf690cc11a38b19b4ee04475907143c5ac8d9c1c0ba34b8c20d3be535f67dc699edd99d36b4db8e2de5ac9acf6df1f7eace2b8925ce4367d3fecbecef319a53
+
SOURCE_HASH=sha512:c1195ec9f2cd79777912ba3c8b6e69a206d035c9a7f2c38762c18e3c86ec43d52f020e4dd8d0ea0c9b580aff9707cede909412260ac6d23796ddbd78eb8e280e
LICENSE[0]=LGPL
WEB_SITE=http://trac.enlightenment.org/e/wiki/Eina
ENTERED=20081013
diff --git a/e-17/eina/HISTORY b/e-17/eina/HISTORY
index c141be6..19ca3ab 100644
--- a/e-17/eina/HISTORY
+++ b/e-17/eina/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Updated to 1.7.10 (removed guru sig)
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8
diff --git a/e-17/eina/eina-1.7.8.tar.bz2.sig
b/e-17/eina/eina-1.7.8.tar.bz2.sig
deleted file mode 100644
index 97dfed6..0000000
Binary files a/e-17/eina/eina-1.7.8.tar.bz2.sig and /dev/null differ
diff --git a/editors/gawk/BUILD b/editors/gawk/BUILD
index faf4b96..6e4e95a 100755
--- a/editors/gawk/BUILD
+++ b/editors/gawk/BUILD
@@ -1,10 +1,14 @@
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
-
+# Disable mpfr and readline as that complicates upgrade
+# of gmp ... which fails mid-way since sorcery really relies
+# on awk to work. Proper fix would be to protect all
+# base libraries during dispel, like libc. -- ThOr
./configure --build=${BUILD} \
--prefix=${TRACK_ROOT}/usr \
--bindir=${TRACK_ROOT}/bin \
--infodir=${TRACK_ROOT}/usr/share/info \
--mandir=${TRACK_ROOT}/usr/share/man \
+ --without-mpfr --without-readline \
${OPTS} &&
make DESTDIR=$INSTALL_ROOT
diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY
index e8ad2a0..2cd60a1 100644
--- a/editors/gawk/HISTORY
+++ b/editors/gawk/HISTORY
@@ -1,3 +1,8 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: reduce usage of libraries to prevent failure of spell
+ upgrades (example: awk broken when updating gmp, sorcery cannot
complete
+ when awk cannot run due to temporarily missing libgmp)
+
2014-04-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.1
diff --git a/graphics-libs/freeglut/DEPENDS b/graphics-libs/freeglut/DEPENDS
index d3212c0..3bb1971 100755
--- a/graphics-libs/freeglut/DEPENDS
+++ b/graphics-libs/freeglut/DEPENDS
@@ -1,4 +1,8 @@
depends OPENGL &&
+if test mesalib-1x = "$(get_spell_provider $SPELL OPENGL)"; then
+ # New mesalib has it separated out.
+ depends glu
+fi &&
depends libx11 &&
depends libxi &&
depends libxext &&
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index e3d4546..5ffe91c 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: separate glu for mesalib-1x
+
2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: major cleanup
diff --git a/libs/libconfig/DEPENDS b/libs/libconfig/DEPENDS
new file mode 100755
index 0000000..cf20e51
--- /dev/null
+++ b/libs/libconfig/DEPENDS
@@ -0,0 +1,2 @@
+depends -sub CXX gcc
+
diff --git a/libs/libconfig/HISTORY b/libs/libconfig/HISTORY
index a2d4b8c..c74b1b4 100644
--- a/libs/libconfig/HISTORY
+++ b/libs/libconfig/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: C++
+
2013-02-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.4.9
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index b3a60ef..4a2a420 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: support NV and NOUVEAU, both in field
+ use:-/
+
2014-07-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.4.56
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
index b8aa194..10c89b6 100755
--- a/libs/libdrm/PRE_SUB_DEPENDS
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NV) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
+ NV|NOUVEAU) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
index f0d0d9e..5db50df 100755
--- a/libs/libdrm/SUB_DEPENDS
+++ b/libs/libdrm/SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NV) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
+ NV|NOUVEAU) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
LIBDRM_NV='y'
;;
INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Intel KMS API${DEFAULT_COLOR}" &&
diff --git a/net/net-tools/BUILD b/net/net-tools/BUILD
index 1f79ca2..65e023e 100755
--- a/net/net-tools/BUILD
+++ b/net/net-tools/BUILD
@@ -16,4 +16,3 @@ sedit '382,391s/$/\\n\\/' mii-tool.c
&&
./configure.sh config.in < smgl_config_opts &&
make_single &&
make COPTS="-D_GNU_SOURCE -Wall $CFLAGS" LOPTS="$LDFLAGS"
-
diff --git a/net/net-tools/CONFIGURE b/net/net-tools/CONFIGURE
index 5ef105b..772bee8 100755
--- a/net/net-tools/CONFIGURE
+++ b/net/net-tools/CONFIGURE
@@ -20,8 +20,14 @@ config_query ARCNET "ARCnet hardware support?"
y &&
config_query SLIP "SLIP (serial line) hardware support?" y &&
config_query PPP "PPP (serial line) hardware support?" y &&
config_query IPIP "IPIP Tunnel hardware support?" y &&
-config_query STRIP "STRIP (Metricom radio) hardware support?" y &&
-config_query TOKEN "Token ring (generic) hardware support?" y &&
+# Disable STRIP and Token Ring, not supported by kernel anymore, see
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700008 .
+#config_query STRIP "STRIP (Metricom radio) hardware support?" y &&
+persistent_add STRIP &&
+STRIP=n &&
+#config_query TOKEN "Token ring (generic) hardware support?" y &&
+persistent_add TOKEN &&
+TOKEN=n &&
config_query HWAX25 "AX25 (packet radio) hardware support?" y &&
config_query HWROSE "Rose (packet radio) hardware support?" y &&
config_query HWNETROM "NET/ROM (packet radio) hardware support?" y &&
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index dc4db4b..4e1f3eb 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, BUILD: disable STRIP and Token Ring lacking kernel
support
+
2009-09-30 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: use INITSCRIPTS provider
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ # There are folks who want to link libwrap into shared objects.
+ CFLAGS+=" -DPIC -fPIC"
+fi
sedit 's/= -O/= '"$CFLAGS"'/' Makefile &&
make REAL_DAEMON_DIR=${INSTALL_ROOT}/usr/sbin linux
diff --git a/net/tcp_wrappers/HISTORY b/net/tcp_wrappers/HISTORY
index 34e996d..5b81b5e 100644
--- a/net/tcp_wrappers/HISTORY
+++ b/net/tcp_wrappers/HISTORY
@@ -1,3 +1,7 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: enforce PIC on x86-64 to enable other spells to include
+ libwrap.a in dynamic libs, which does happen and fails otherwise
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.
diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 56f5817..b2a6909 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -1,3 +1,4 @@
+CFLAGS="$CFLAGS -I$INSTALL_ROOT/usr/include/libnl3"
cd "$SOURCE_DIRECTORY/wpa_supplicant"
# Create .config file for make (this is here instead of PRE_BUILD because
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index b19658a..597453e 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -1,12 +1,18 @@
depends wireless_tools &&
+if [ "$CONFIG_DRIVER_NL80211" = y ]; then
+ depends libnl
+fi &&
+
if [[ $CONFIG_EAP_SIM == y || $CONFIG_EAP_AKA == y ]]; then
depends pcsc-lite
fi &&