diff options
| author | tnut <tnut at nutyx dot com> | 2011-03-30 17:15:19 +0200 |
|---|---|---|
| committer | tnut <tnut at nutyx dot com> | 2011-03-30 17:15:19 +0200 |
| commit | 804ef70ac85e546a91eb7438ce3e177cf609572b (patch) | |
| tree | b861152cb96a408ba005f71522355a7adc14c553 /extra | |
| parent | 64a8d0ec5d21dab32d55d13557ff15de864a2329 (diff) | |
| parent | b1528a7b3d47dd1fd4001d10c67efc584d473969 (diff) | |
| download | nutyx-extra-804ef70ac85e546a91eb7438ce3e177cf609572b.tar.gz nutyx-extra-804ef70ac85e546a91eb7438ce3e177cf609572b.tar.bz2 nutyx-extra-804ef70ac85e546a91eb7438ce3e177cf609572b.tar.xz nutyx-extra-804ef70ac85e546a91eb7438ce3e177cf609572b.zip | |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/libproxy/.footprint.i686 | 8 | ||||
| -rw-r--r-- | extra/libproxy/.footprint.x86_64 | 8 | ||||
| -rwxr-xr-x | extra/libproxy/Pkgfile | 15 | ||||
| -rw-r--r-- | extra/libsoup/Pkgfile | 5 |
4 files changed, 10 insertions, 26 deletions
diff --git a/extra/libproxy/.footprint.i686 b/extra/libproxy/.footprint.i686 index 692aaae71..2adde0486 100644 --- a/extra/libproxy/.footprint.i686 +++ b/extra/libproxy/.footprint.i686 @@ -10,12 +10,6 @@ lrwxrwxrwx root/root usr/lib/libmodman.so.1 -> libmodman.so.1.0.0 lrwxrwxrwx root/root usr/lib/libproxy.so -> libproxy.so.1 lrwxrwxrwx root/root usr/lib/libproxy.so.1 -> libproxy.so.1.0.0 -rwxr-xr-x root/root usr/lib/libproxy.so.1.0.0 -drwxr-xr-x root/root usr/lib/libproxy/ -drwxr-xr-x root/root usr/lib/libproxy/0.4.6/ -drwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/ --rwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/config_gnome.so --rwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/config_kde4.so --rwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/network_networkmanager.so drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/site/ drwxr-xr-x root/root usr/lib/perl5/site/Net/ @@ -29,8 +23,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/libproxy.py -drwxr-xr-x root/root usr/libexec/ --rwxr-xr-x root/root usr/libexec/pxgconf drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/cmake/ drwxr-xr-x root/root usr/share/cmake/Modules/ diff --git a/extra/libproxy/.footprint.x86_64 b/extra/libproxy/.footprint.x86_64 index 692aaae71..2adde0486 100644 --- a/extra/libproxy/.footprint.x86_64 +++ b/extra/libproxy/.footprint.x86_64 @@ -10,12 +10,6 @@ lrwxrwxrwx root/root usr/lib/libmodman.so.1 -> libmodman.so.1.0.0 lrwxrwxrwx root/root usr/lib/libproxy.so -> libproxy.so.1 lrwxrwxrwx root/root usr/lib/libproxy.so.1 -> libproxy.so.1.0.0 -rwxr-xr-x root/root usr/lib/libproxy.so.1.0.0 -drwxr-xr-x root/root usr/lib/libproxy/ -drwxr-xr-x root/root usr/lib/libproxy/0.4.6/ -drwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/ --rwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/config_gnome.so --rwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/config_kde4.so --rwxr-xr-x root/root usr/lib/libproxy/0.4.6/modules/network_networkmanager.so drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/site/ drwxr-xr-x root/root usr/lib/perl5/site/Net/ @@ -29,8 +23,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/libproxy.py -drwxr-xr-x root/root usr/libexec/ --rwxr-xr-x root/root usr/libexec/pxgconf drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/cmake/ drwxr-xr-x root/root usr/share/cmake/Modules/ diff --git a/extra/libproxy/Pkgfile b/extra/libproxy/Pkgfile index cc57c68c9..d9fb8c772 100755 --- a/extra/libproxy/Pkgfile +++ b/extra/libproxy/Pkgfile @@ -2,8 +2,8 @@ # URL: http://code.google.com/p/libproxy # Maintainer: NutyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: cmake, gconf, networkmanager, kdelibs -# Run on: xorg-libice,xorg-libsm,xorg-libx11,xorg-libxau,xorg-libxcb,xorg-libxdmcp,xorg-libxext,xorg-libxmu,xorg-libxmu,xorg-libxt +# Depends on: cmake +# Run on: xorg-libice,xorg-libsm,xorg-libx11,xorg-libxau,xorg-libxcb,xorg-libxdmcp,xorg-libxext,xorg-libxmu,xorg-libxmu,xorg-libxti name=libproxy version=0.4.6 @@ -12,16 +12,15 @@ release=1 source=(http://libproxy.googlecode.com/files/libproxy-$version.tar.gz) build() { + unset MAKEFLAGS cd $name-$version mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \ + -DCMAKE_SKIP_RPATH=ON \ .. -#\ -# -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \ -# -DCMAKE_SKIP_RPATH=ON \ -# .. make DESTDIR=$PKG install } diff --git a/extra/libsoup/Pkgfile b/extra/libsoup/Pkgfile index 876b40f7e..36a632a35 100644 --- a/extra/libsoup/Pkgfile +++ b/extra/libsoup/Pkgfile @@ -2,17 +2,18 @@ # URL: http://www.gnome.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: libxml2, gnutls, libproxy, libtasn1, libgnome-keyring +# Depends on: libxml2, gnutls, libtasn1, libgnome-keyring, libproxy, gconf # Run on: libxml2,gnutls,libproxy,libtasn1,libgnome-keyring name=libsoup version=2.32.0 -release=1 +release=2 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2) build() { cd $name-$version ./configure --prefix=/usr + make make DESTDIR=$PKG install rm -rf $PKG/usr/share/gtk-doc |