From 011179a980c6f99f1408968bdbe531463a69929e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 May 2008 13:39:28 +0000 Subject: [PATCH] * Updated attr and acl. svn path=/nixpkgs/branches/stdenv-updates/; revision=11846 --- .../libraries/acl/acl-2.2.45-patch | 222 ------------------ pkgs/development/libraries/acl/builder.sh | 12 - pkgs/development/libraries/acl/default.nix | 22 +- .../libraries/attr/attr-2.4.32-makefile.patch | 25 -- .../libraries/attr/attr-2.4.32.patch | 171 -------------- pkgs/development/libraries/attr/default.nix | 16 +- pkgs/top-level/all-packages.nix | 4 +- 7 files changed, 23 insertions(+), 449 deletions(-) delete mode 100644 pkgs/development/libraries/acl/acl-2.2.45-patch delete mode 100644 pkgs/development/libraries/acl/builder.sh delete mode 100644 pkgs/development/libraries/attr/attr-2.4.32-makefile.patch delete mode 100644 pkgs/development/libraries/attr/attr-2.4.32.patch diff --git a/pkgs/development/libraries/acl/acl-2.2.45-patch b/pkgs/development/libraries/acl/acl-2.2.45-patch deleted file mode 100644 index 557381922c35..000000000000 --- a/pkgs/development/libraries/acl/acl-2.2.45-patch +++ /dev/null @@ -1,222 +0,0 @@ -diff -u -U3 -r acl-2.2.45-orig/aclocal.m4 acl-2.2.45-mod/aclocal.m4 ---- acl-2.2.45-orig/aclocal.m4 2007-12-23 16:16:11.000000000 +0300 -+++ acl-2.2.45-mod/aclocal.m4 2007-12-23 18:09:04.000000000 +0300 -@@ -228,32 +228,32 @@ - AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) - - if test -z "$MAKE"; then -- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(MAKE, gmake,,) - fi - if test -z "$MAKE"; then -- AC_PATH_PROG(MAKE, make,, /usr/bin) -+ AC_PATH_PROG(MAKE, make,, ) - fi - make=$MAKE - AC_SUBST(make) - AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) - - if test -z "$LIBTOOL"; then -- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) -+ AC_PATH_PROG(LIBTOOL, glibtool,, ) - fi - if test -z "$LIBTOOL"; then -- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(LIBTOOL, libtool,, ) - fi - libtool=$LIBTOOL - AC_SUBST(libtool) - AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) - - if test -z "$TAR"; then -- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) -+ AC_PATH_PROG(TAR, tar,, ) - fi - tar=$TAR - AC_SUBST(tar) - if test -z "$ZIP"; then -- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(ZIP, gzip,, ) - fi - - zip=$ZIP -@@ -266,25 +266,25 @@ - AC_SUBST(makedepend) - - if test -z "$AWK"; then -- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) -+ AC_PATH_PROG(AWK, awk,, ) - fi - awk=$AWK - AC_SUBST(awk) - - if test -z "$SED"; then -- AC_PATH_PROG(SED, sed,, /bin:/usr/bin) -+ AC_PATH_PROG(SED, sed,, ) - fi - sed=$SED - AC_SUBST(sed) - - if test -z "$ECHO"; then -- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) -+ AC_PATH_PROG(ECHO, echo,, ) - fi - echo=$ECHO - AC_SUBST(echo) - - if test -z "$SORT"; then -- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) -+ AC_PATH_PROG(SORT, sort,, ) - fi - sort=$SORT - AC_SUBST(sort) -@@ -294,21 +294,21 @@ - - if test "$enable_gettext" = yes; then - if test -z "$MSGFMT"; then -- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(MSGFMT, msgfmt,, ) - fi - msgfmt=$MSGFMT - AC_SUBST(msgfmt) - AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) - - if test -z "$MSGMERGE"; then -- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(MSGMERGE, msgmerge,, ) - fi - msgmerge=$MSGMERGE - AC_SUBST(msgmerge) - AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext) - - if test -z "$XGETTEXT"; then -- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin) -+ AC_PATH_PROG(XGETTEXT, xgettext,, ) - fi - xgettext=$XGETTEXT - AC_SUBST(xgettext) -@@ -316,7 +316,7 @@ - fi - - if test -z "$RPM"; then -- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) -+ AC_PATH_PROG(RPM, rpm,, ) - fi - rpm=$RPM - AC_SUBST(rpm) -Только в acl-2.2.45-orig/: configure -diff -u -U3 -r acl-2.2.45-orig/m4/package_utilies.m4 acl-2.2.45-mod/m4/package_utilies.m4 ---- acl-2.2.45-orig/m4/package_utilies.m4 2007-12-23 16:16:11.000000000 +0300 -+++ acl-2.2.45-mod/m4/package_utilies.m4 2007-12-23 18:01:28.000000000 +0300 -@@ -23,32 +23,26 @@ - AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) - - if test -z "$MAKE"; then -- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - if test -z "$MAKE"; then -- AC_PATH_PROG(MAKE, make,, /usr/bin) - fi - make=$MAKE - AC_SUBST(make) - AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) - - if test -z "$LIBTOOL"; then -- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) - fi - if test -z "$LIBTOOL"; then -- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - libtool=$LIBTOOL - AC_SUBST(libtool) - AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) - - if test -z "$TAR"; then -- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) - fi - tar=$TAR - AC_SUBST(tar) - if test -z "$ZIP"; then -- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - - zip=$ZIP -@@ -61,25 +55,21 @@ - AC_SUBST(makedepend) - - if test -z "$AWK"; then -- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) - fi - awk=$AWK - AC_SUBST(awk) - - if test -z "$SED"; then -- AC_PATH_PROG(SED, sed,, /bin:/usr/bin) - fi - sed=$SED - AC_SUBST(sed) - - if test -z "$ECHO"; then -- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) - fi - echo=$ECHO - AC_SUBST(echo) - - if test -z "$SORT"; then -- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) - fi - sort=$SORT - AC_SUBST(sort) -@@ -89,21 +79,18 @@ - - if test "$enable_gettext" = yes; then - if test -z "$MSGFMT"; then -- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - msgfmt=$MSGFMT - AC_SUBST(msgfmt) - AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) - - if test -z "$MSGMERGE"; then -- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - msgmerge=$MSGMERGE - AC_SUBST(msgmerge) - AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext) - - if test -z "$XGETTEXT"; then -- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - xgettext=$XGETTEXT - AC_SUBST(xgettext) -@@ -111,7 +98,6 @@ - fi - - if test -z "$RPM"; then -- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) - fi - rpm=$RPM - AC_SUBST(rpm) -diff -u -U3 -r acl-2.2.45-orig/Makefile acl-2.2.45-mod/Makefile ---- acl-2.2.45-orig/Makefile 2007-12-23 16:16:11.000000000 +0300 -+++ acl-2.2.45-mod/Makefile 2007-12-23 18:01:28.000000000 +0300 -@@ -33,19 +33,6 @@ - endif - - $(CONFIGURE): -- autoconf -- ./configure \ -- --prefix=/ \ -- --exec-prefix=/ \ -- --sbindir=/bin \ -- --bindir=/usr/bin \ -- --libdir=/lib \ -- --libexecdir=/usr/lib \ -- --enable-lib64=yes \ -- --includedir=/usr/include \ -- --mandir=/usr/share/man \ -- --datadir=/usr/share \ -- $$LOCAL_CONFIGURE_OPTIONS - touch .census - - aclocal.m4:: diff --git a/pkgs/development/libraries/acl/builder.sh b/pkgs/development/libraries/acl/builder.sh deleted file mode 100644 index 4cabc84f8289..000000000000 --- a/pkgs/development/libraries/acl/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -preConfigure() { - rm configure - autoconf -} - -preConfigure=preConfigure - -installFlags='install-lib install-dev' - -genericBuild diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index b9992af612e7..bbba61c1de6e 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -1,14 +1,16 @@ -args: with args; +{stdenv, fetchurl, gettext, attr, libtool}: stdenv.mkDerivation { - name = "acl-2.2.45"; + name = "acl-2.2.47"; - builder = ./builder.sh; - src = - fetchurl { - url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.45-1.tar.gz; - sha256 = "1bb2k5br494yk863w27k1h8gkdkq4kzakvajhj844hl1cixhhf1a"; - }; - buildInputs = [autoconf libtool gettext attr]; - patches = [ ./acl-2.2.45-patch ]; + src = fetchurl { + url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.47-1.tar.gz; + sha256 = "1j39g62fki0iyji9s62slgwdfskpkqy7rmjlqcnmsvsnxbxhc294"; + }; + + buildInputs = [gettext attr libtool]; + + configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk"; + + installTargets = "install install-lib install-dev"; } diff --git a/pkgs/development/libraries/attr/attr-2.4.32-makefile.patch b/pkgs/development/libraries/attr/attr-2.4.32-makefile.patch deleted file mode 100644 index 96b2f78ca801..000000000000 --- a/pkgs/development/libraries/attr/attr-2.4.32-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rc attr-2.4.32/Makefile attr-2.4.32.new/Makefile -*** attr-2.4.32/Makefile 2006-06-20 08:51:25.000000000 +0200 ---- attr-2.4.32.new/Makefile 2006-08-13 20:47:52.000000000 +0200 -*************** -*** 33,51 **** - endif - - $(CONFIGURE): -- autoconf -- ./configure \ -- --prefix=/ \ -- --exec-prefix=/ \ -- --sbindir=/bin \ -- --bindir=/usr/bin \ -- --libdir=/lib \ -- --libexecdir=/usr/lib \ -- --enable-lib64=yes \ -- --includedir=/usr/include \ -- --mandir=/usr/share/man \ -- --datadir=/usr/share \ -- $$LOCAL_CONFIGURE_OPTIONS - touch .census - - aclocal.m4:: ---- 33,38 ---- diff --git a/pkgs/development/libraries/attr/attr-2.4.32.patch b/pkgs/development/libraries/attr/attr-2.4.32.patch deleted file mode 100644 index 6ed932e9f15e..000000000000 --- a/pkgs/development/libraries/attr/attr-2.4.32.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff -rc attr-2.4.32/aclocal.m4 attr-2.4.32.new/aclocal.m4 -*** attr-2.4.32/aclocal.m4 2006-06-20 08:51:25.000000000 +0200 ---- attr-2.4.32.new/aclocal.m4 2006-08-13 19:57:07.000000000 +0200 -*************** -*** 144,175 **** - AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) - - if test -z "$MAKE"; then -! AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - if test -z "$MAKE"; then -! AC_PATH_PROG(MAKE, make,, /usr/bin) - fi - make=$MAKE - AC_SUBST(make) - AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) - - if test -z "$LIBTOOL"; then -! AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) - fi - if test -z "$LIBTOOL"; then -! AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - libtool=$LIBTOOL - AC_SUBST(libtool) - AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) - - if test -z "$TAR"; then -! AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) - fi - tar=$TAR - AC_SUBST(tar) - if test -z "$ZIP"; then -! AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - - zip=$ZIP ---- 144,175 ---- - AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) - - if test -z "$MAKE"; then -! AC_PATH_PROG(MAKE, gmake) - fi - if test -z "$MAKE"; then -! AC_PATH_PROG(MAKE, make) - fi - make=$MAKE - AC_SUBST(make) - AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) - - if test -z "$LIBTOOL"; then -! AC_PATH_PROG(LIBTOOL, glibtool) - fi - if test -z "$LIBTOOL"; then -! AC_PATH_PROG(LIBTOOL, libtool) - fi - libtool=$LIBTOOL - AC_SUBST(libtool) - AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) - - if test -z "$TAR"; then -! AC_PATH_PROG(TAR, tar) - fi - tar=$TAR - AC_SUBST(tar) - if test -z "$ZIP"; then -! AC_PATH_PROG(ZIP, gzip) - fi - - zip=$ZIP -*************** -*** 182,206 **** - AC_SUBST(makedepend) - - if test -z "$AWK"; then -! AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) - fi - awk=$AWK - AC_SUBST(awk) - - if test -z "$SED"; then -! AC_PATH_PROG(SED, sed,, /bin:/usr/bin) - fi - sed=$SED - AC_SUBST(sed) - - if test -z "$ECHO"; then -! AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) - fi - echo=$ECHO - AC_SUBST(echo) - - if test -z "$SORT"; then -! AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) - fi - sort=$SORT - AC_SUBST(sort) ---- 182,206 ---- - AC_SUBST(makedepend) - - if test -z "$AWK"; then -! AC_PATH_PROG(AWK, awk) - fi - awk=$AWK - AC_SUBST(awk) - - if test -z "$SED"; then -! AC_PATH_PROG(SED, sed) - fi - sed=$SED - AC_SUBST(sed) - - if test -z "$ECHO"; then -! AC_PATH_PROG(ECHO, echo) - fi - echo=$ECHO - AC_SUBST(echo) - - if test -z "$SORT"; then -! AC_PATH_PROG(SORT, sort) - fi - sort=$SORT - AC_SUBST(sort) -*************** -*** 210,223 **** - - if test "$enable_gettext" = yes; then - if test -z "$MSGFMT"; then -! AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - msgfmt=$MSGFMT - AC_SUBST(msgfmt) - AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) - - if test -z "$MSGMERGE"; then -! AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) - fi - msgmerge=$MSGMERGE - AC_SUBST(msgmerge) ---- 210,223 ---- - - if test "$enable_gettext" = yes; then - if test -z "$MSGFMT"; then -! AC_PATH_PROG(MSGFMT, msgfmt) - fi - msgfmt=$MSGFMT - AC_SUBST(msgfmt) - AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) - - if test -z "$MSGMERGE"; then -! AC_PATH_PROG(MSGMERGE, msgmerge) - fi - msgmerge=$MSGMERGE - AC_SUBST(msgmerge) -*************** -*** 225,231 **** - fi - - if test -z "$RPM"; then -! AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) - fi - rpm=$RPM - AC_SUBST(rpm) ---- 225,231 ---- - fi - - if test -z "$RPM"; then -! AC_PATH_PROG(RPM, rpm) - fi - rpm=$RPM - AC_SUBST(rpm) diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 79da04d486ad..af30d08d7d7e 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, autoconf, libtool, gettext}: +{stdenv, fetchurl, libtool, gettext}: stdenv.mkDerivation { - name = "attr-2.4.32"; + name = "attr-2.4.41"; - builder = ./builder.sh; src = fetchurl { - url = ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/attr_2.4.32-1.tar.gz; - md5 = "092739e9b944815aecc1f5d8379d5ea5"; + url = ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.41-1.tar.gz; + sha256 = "0dc286g8vr402aca6wg945sdm92bys8a142vrkwx6bkjz4bwz6gp"; }; - buildInputs = [autoconf libtool gettext]; - patches = [./attr-2.4.32.patch ./attr-2.4.32-makefile.patch]; + buildInputs = [libtool gettext]; + + configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; + + installTargets = "install install-lib install-dev"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3f1b9c92974..3e9e2cb54d8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2115,7 +2115,7 @@ rec { }; acl = import ../development/libraries/acl { - inherit stdenv fetchurl autoconf libtool gettext attr; + inherit stdenv fetchurl gettext attr libtool; }; /* @@ -2166,7 +2166,7 @@ rec { }; attr = import ../development/libraries/attr { - inherit stdenv fetchurl autoconf libtool gettext; + inherit stdenv fetchurl libtool gettext; }; audiofile = import ../development/libraries/audiofile {