summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-02-10 20:26:55 +0100
committertnut <thierryn1 at hispeed dot ch>2010-02-10 20:26:55 +0100
commit95abc82991a507ac95029b6fc941a9d1094e4a3b (patch)
treeb7e8504a55bf1ba32c56338fbb62b6efe75ad93b
parentcc3e170c711ceac641de44f2baefbedc507aa44b (diff)
parent10650457c5f635044485eee151a31e6e461d8363 (diff)
downloadnutyx-extra-95abc82991a507ac95029b6fc941a9d1094e4a3b.tar.gz
nutyx-extra-95abc82991a507ac95029b6fc941a9d1094e4a3b.tar.bz2
nutyx-extra-95abc82991a507ac95029b6fc941a9d1094e4a3b.tar.xz
nutyx-extra-95abc82991a507ac95029b6fc941a9d1094e4a3b.zip
Merge commit 'lesibel/master'
-rwxr-xr-xbase/cmake/Pkgfile6
-rw-r--r--base/libical/Pkgfile2
-rw-r--r--extra/curl/.footprint6
-rw-r--r--extra/curl/.md5sum2
-rwxr-xr-xextra/curl/Pkgfile2
5 files changed, 10 insertions, 8 deletions
diff --git a/base/cmake/Pkgfile b/base/cmake/Pkgfile
index 0a202323b..49a73d9d6 100755
--- a/base/cmake/Pkgfile
+++ b/base/cmake/Pkgfile
@@ -6,13 +6,15 @@
name=cmake
version=2.8.0
-release=1
+release=2
source=(http://www.cmake.org/files/v2.8/$name-$version.tar.gz)
build() {
cd $name-$version
./bootstrap --prefix=/usr \
- --mandir=/usr/share/man
+ --mandir=/usr/share/man \
+ --system-libs \
+ --parallel=2
make
make DESTDIR=$PKG install
rm -rf $PKG/usr/doc
diff --git a/base/libical/Pkgfile b/base/libical/Pkgfile
index 7e6297ca9..0003df343 100644
--- a/base/libical/Pkgfile
+++ b/base/libical/Pkgfile
@@ -6,7 +6,7 @@
name=libical
version=0.44
release=1
-source=(http://downloads.sourceforge.net/project/freeassociation/libical/libical-0.44/libical-0.44.tar.gz)
+source=(http://downloads.sourceforge.net/project/freeassociation/$name/$name-$version/$name-$version.tar.gz)
build() {
diff --git a/extra/curl/.footprint b/extra/curl/.footprint
index c8c35bc47..032b27de2 100644
--- a/extra/curl/.footprint
+++ b/extra/curl/.footprint
@@ -17,9 +17,9 @@ drwxr-xr-x root/root usr/include/curl/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libcurl.a
-rwxr-xr-x root/root usr/lib/libcurl.la
-lrwxrwxrwx root/root usr/lib/libcurl.so -> libcurl.so.4.1.1
-lrwxrwxrwx root/root usr/lib/libcurl.so.4 -> libcurl.so.4.1.1
--rwxr-xr-x root/root usr/lib/libcurl.so.4.1.1
+lrwxrwxrwx root/root usr/lib/libcurl.so -> libcurl.so.4.2.0
+lrwxrwxrwx root/root usr/lib/libcurl.so.4 -> libcurl.so.4.2.0
+-rwxr-xr-x root/root usr/lib/libcurl.so.4.2.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libcurl.pc
drwxr-xr-x root/root usr/share/
diff --git a/extra/curl/.md5sum b/extra/curl/.md5sum
index eb2c9cc00..e3892f89d 100644
--- a/extra/curl/.md5sum
+++ b/extra/curl/.md5sum
@@ -1 +1 @@
-426d161661dce70c8ea9ad8f553363a3 curl-7.19.5.tar.bz2
+3dda78c4a808d9a779dc3a2ae81b47d8 curl-7.20.0.tar.bz2
diff --git a/extra/curl/Pkgfile b/extra/curl/Pkgfile
index d5a118318..c0abed195 100755
--- a/extra/curl/Pkgfile
+++ b/extra/curl/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: libidn
name=curl
-version=7.19.5
+version=7.20.0
release=1
source=(http://curl.haxx.se/download/$name-$version.tar.bz2 )