Update apt to 1.4.9

12 files changed, 10 insertions, 10 deletions

diff --git a/data/_apt1.4/_metadata/version b/data/_apt1.4/_metadata/version
index b2e46d185..4ea2b1f40 100644
--- a/data/_apt1.4/_metadata/version
+++ b/data/_apt1.4/_metadata/version
@@ -1 +1 @@
-1.4.8
+1.4.9
diff --git a/data/_apt1.4/apt-iphone.tar.lz b/data/_apt1.4/apt-iphone.tar.lz
index 4386f7ad1..7836bf1e3 100644
--- a/data/_apt1.4/apt-iphone.tar.lz
+++ b/data/_apt1.4/apt-iphone.tar.lz
diff --git a/data/_apt1.4/make.sh b/data/_apt1.4/make.sh
index 2f77aa5cf..8c8b118ac 100644
--- a/data/_apt1.4/make.sh
+++ b/data/_apt1.4/make.sh
@@ -1,5 +1,6 @@
 pkg:setup
 cat >iphoneos_toolchain.cmake <<EOF
+set(CMAKE_BUILD_TYPE Release)
 set(CMAKE_SYSTEM_NAME Darwin)  # Tell CMake we're cross-compiling
 set(CMAKE_CROSSCOMPILING true)
 #include(CMakeForceCompiler)
@@ -16,6 +17,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(DPKG_DATADIR /usr/share/dpkg)
+set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "${IPHONEOS_DEPLOYMENT_TARGET}" CACHE STRING "Min IOS version")
 EOF
 
 cmake -j8 -DCMAKE_TOOLCHAIN_FILE=iphoneos_toolchain.cmake -DCMAKE_LOCALSTATEDIR="/private/var" -DCMAKE_INSTALL_NAME_DIR="/usr/lib" -DCMAKE_INSTALL_RPATH="/usr/" -DCMAKE_OSX_SYSROOT="${PKG_ROOT}" -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_SHARED_LINKER_FLAGS="-lresolv" -DCURRENT_VENDOR=debian -DUSE_NLS=0 -DWITH_DOC=0 -DCOMMON_ARCH=${PKG_ARCH} .
diff --git a/data/apt1.4/_metadata/apt-key.dep b/data/apt1.4/_metadata/apt-key.dep
deleted file mode 120000
index 67fe46032..000000000
--- a/data/apt1.4/_metadata/apt-key.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../apt-key
\ No newline at end of file
diff --git a/data/apt1.4/_metadata/berkeleydb.dep b/data/apt1.4/_metadata/berkeleydb.dep
deleted file mode 120000
index f945cb1a2..000000000
--- a/data/apt1.4/_metadata/berkeleydb.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../berkeleydb
\ No newline at end of file
diff --git a/data/apt1.4/_metadata/depends b/data/apt1.4/_metadata/depends
new file mode 100644
index 000000000..cd5643b98
--- /dev/null
+++ b/data/apt1.4/_metadata/depends
@@ -0,0 +1 @@
+libapt (>= %MYVERSION%), apt-key, berkeleydb
diff --git a/data/apt1.4/_metadata/libapt.dep b/data/apt1.4/_metadata/libapt.dep
deleted file mode 120000
index 280bf477b..000000000
--- a/data/apt1.4/_metadata/libapt.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libapt
\ No newline at end of file
diff --git a/data/apt1.4/_metadata/libapt.ver.iphoneos-arm b/data/apt1.4/_metadata/libapt.ver.iphoneos-arm
deleted file mode 120000
index 06c5113b0..000000000
--- a/data/apt1.4/_metadata/libapt.ver.iphoneos-arm
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt1.4/_metadata/version
\ No newline at end of file
diff --git a/data/libapt-dev/make.sh b/data/libapt-dev/make.sh
index e7e0d3db1..28cbffbb0 100644
--- a/data/libapt-dev/make.sh
+++ b/data/libapt-dev/make.sh
@@ -1,3 +1,3 @@
 pkg: mkdir -p /usr/lib
 find "$(PKG_DEST_ _apt1.4)"/usr/lib -maxdepth 1 -type l -exec cp {} "${PKG_DEST}"/usr/lib/ \;
-rm -rf "${PKG_DEST}"/usr/lib/libapt-pkg*
+rm -rf "${PKG_DEST}"/usr/lib/libapt-pkg* "${PKG_DEST}"/usr/lib/lib*.*.dylib
diff --git a/data/libapt/_metadata/depends b/data/libapt/_metadata/depends
index 8313cb552..19efb3b09 100644
--- a/data/libapt/_metadata/depends
+++ b/data/libapt/_metadata/depends
@@ -1 +1 @@
-libapt-pkg (>=%MYVERSION%)
+libapt-pkg5.0 (>= %MYVERSION%)
diff --git a/data/libapt/libapt b/data/libapt/libapt
deleted file mode 120000
index 280bf477b..000000000
--- a/data/libapt/libapt
+++ /dev/null
@@ -1 +0,0 @@
-../../libapt
\ No newline at end of file
diff --git a/data/libapt/make.sh b/data/libapt/make.sh
index c9b62a8ea..4accc54f1 100644
--- a/data/libapt/make.sh
+++ b/data/libapt/make.sh
@@ -1,8 +1,8 @@
 cp -a "$(PKG_DEST_ _apt1.4)"/etc "${PKG_DEST}"
 cp -a "$(PKG_DEST_ _apt1.4)"/var "${PKG_DEST}"
 
-pkg: mkdir -p /usr
-cp -a "$(PKG_DEST_ _apt1.4)"/usr/lib "${PKG_DEST}"/usr
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _apt1.4)"/usr/lib/lib*.*.dylib "${PKG_DEST}"/usr/lib/
 cp -a "$(PKG_DEST_ _apt1.4)"/usr/libexec "${PKG_DEST}"/usr
 rm -f "${PKG_DEST}"/usr/lib/libapt-pkg.*
 pkg: ln -s ../libexec/apt /usr/lib/apt