From 176c0e32b18139e83efaf71c516bcd9dee733192 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Sep 2009 15:33:03 +0000 Subject: * net-tools: install the manpages in $out/share/man/manN instead of $out/share/manN. Cleaned up the expression at the same time. svn path=/nixpkgs/trunk/; revision=17509 --- pkgs/os-specific/linux/net-tools/builder.sh | 12 --- pkgs/os-specific/linux/net-tools/default.nix | 22 ++++- pkgs/os-specific/linux/net-tools/gcc-34.patch | 119 -------------------------- 3 files changed, 18 insertions(+), 135 deletions(-) delete mode 100644 pkgs/os-specific/linux/net-tools/builder.sh delete mode 100644 pkgs/os-specific/linux/net-tools/gcc-34.patch (limited to 'pkgs/os-specific/linux/net-tools') diff --git a/pkgs/os-specific/linux/net-tools/builder.sh b/pkgs/os-specific/linux/net-tools/builder.sh deleted file mode 100644 index 5f9583980b0..00000000000 --- a/pkgs/os-specific/linux/net-tools/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -buildinputs="" -source $stdenv/setup - -tar xvfj $src -cd net-tools-* -cp $config config.h -sed "s^/usr/share/man^/share^" < man/Makefile > tmp -mv tmp man/Makefile -patch -p1 < $patch -make -mkdir $out -make BASEDIR=$out install diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index d8764f391d6..4b2f6f96d86 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,12 +1,26 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "net-tools-1.60"; - builder = ./builder.sh; + src = fetchurl { url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2; md5 = "888774accab40217dde927e21979c165"; }; - config = ./config.h; - patch = ./net-tools-labels.patch; + + patches = [ ./net-tools-labels.patch ]; + + preBuild = + '' + cp ${./config.h} config.h + ''; + + makeFlags = "BASEDIR=$(out) mandir=/share/man"; + + meta = { + homepage = http://www.tazenda.demon.co.uk/phil/net-tools/; + description = "A set of tools for controlling the network subsystem in Linux"; + license = "GPLv2+"; + platforms = [ stdenv.lib.platforms.linux ]; + }; } diff --git a/pkgs/os-specific/linux/net-tools/gcc-34.patch b/pkgs/os-specific/linux/net-tools/gcc-34.patch deleted file mode 100644 index 95c4daaf3e1..00000000000 --- a/pkgs/os-specific/linux/net-tools/gcc-34.patch +++ /dev/null @@ -1,119 +0,0 @@ -Only in net-tools-1.60: arp -Only in net-tools-1.60: arp.o -Only in net-tools-1.60: hostname -diff -rc net-tools-orig/hostname.c net-tools-1.60/hostname.c -*** net-tools-orig/hostname.c 2001-04-08 19:04:23.000000000 +0200 ---- net-tools-1.60/hostname.c 2004-11-08 15:14:12.000000000 +0100 -*************** -*** 98,103 **** ---- 98,104 ---- - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ; - } - exit(1); - }; -*************** -*** 117,122 **** ---- 118,124 ---- - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ; - } - exit(1); - }; -*************** -*** 174,179 **** ---- 176,182 ---- - printf("%s\n", hp->h_name); - break; - default: -+ ; - } - } - -Only in net-tools-1.60: hostname.o -Only in net-tools-1.60: ifconfig -Only in net-tools-1.60: ifconfig.o -Only in net-tools-1.60/lib: activate.o -Only in net-tools-1.60/lib: af.o -Only in net-tools-1.60/lib: arcnet.o -Only in net-tools-1.60/lib: ash.o -Only in net-tools-1.60/lib: ax25_gr.o -Only in net-tools-1.60/lib: ax25.o -Only in net-tools-1.60/lib: ddp_gr.o -Only in net-tools-1.60/lib: ddp.o -Only in net-tools-1.60/lib: ec_hw.o -Only in net-tools-1.60/lib: econet.o -Only in net-tools-1.60/lib: ether.o -Only in net-tools-1.60/lib: fddi.o -Only in net-tools-1.60/lib: frame.o -Only in net-tools-1.60/lib: getargs.o -Only in net-tools-1.60/lib: getroute.o -Only in net-tools-1.60/lib: hdlclapb.o -Only in net-tools-1.60/lib: hippi.o -Only in net-tools-1.60/lib: hw.o -Only in net-tools-1.60/lib: inet6_gr.o -Only in net-tools-1.60/lib: inet6.o -Only in net-tools-1.60/lib: inet6_sr.o -Only in net-tools-1.60/lib: inet_gr.o -Only in net-tools-1.60/lib: inet.o -diff -rc net-tools-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c -*** net-tools-orig/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100 ---- net-tools-1.60/lib/inet_sr.c 2004-11-08 15:09:33.000000000 +0100 -*************** -*** 105,110 **** ---- 105,111 ---- - case 2: - isnet = 0; break; - default: -+ ; - } - - /* Fill in the other fields. */ -Only in net-tools-1.60/lib: inet_sr.o -Only in net-tools-1.60/lib: interface.o -Only in net-tools-1.60/lib: ipx_gr.o -Only in net-tools-1.60/lib: ipx.o -Only in net-tools-1.60/lib: ipx_sr.o -Only in net-tools-1.60/lib: irda.o -Only in net-tools-1.60/lib: libnet-tools.a -Only in net-tools-1.60/lib: loopback.o -Only in net-tools-1.60/lib: masq_info.o -Only in net-tools-1.60/lib: netrom_gr.o -Only in net-tools-1.60/lib: netrom.o -Only in net-tools-1.60/lib: netrom_sr.o -Only in net-tools-1.60/lib: nstrcmp.o -Only in net-tools-1.60/lib: ppp_ac.o -Only in net-tools-1.60/lib: ppp.o -Only in net-tools-1.60/lib: proc.o -Only in net-tools-1.60/lib: rose_gr.o -Only in net-tools-1.60/lib: rose.o -Only in net-tools-1.60/lib: setroute.o -Only in net-tools-1.60/lib: sit.o -Only in net-tools-1.60/lib: slip_ac.o -Only in net-tools-1.60/lib: slip.o -Only in net-tools-1.60/lib: sockets.o -Only in net-tools-1.60/lib: strip.o -Only in net-tools-1.60/lib: tr.o -Only in net-tools-1.60/lib: tunnel.o -Only in net-tools-1.60/lib: unix.o -Only in net-tools-1.60/lib: util.o -Only in net-tools-1.60/lib: x25_gr.o -Only in net-tools-1.60/lib: x25.o -Only in net-tools-1.60/lib: x25_sr.o -Only in net-tools-1.60: nameif -Only in net-tools-1.60: nameif.o -Only in net-tools-1.60: netstat -Only in net-tools-1.60: netstat.o -Only in net-tools-1.60: plipconfig -Only in net-tools-1.60: plipconfig.o -Only in net-tools-1.60: rarp -Only in net-tools-1.60: rarp.o -Only in net-tools-1.60: route -Only in net-tools-1.60: route.o -Only in net-tools-1.60: slattach -Only in net-tools-1.60: slattach.o -Only in net-tools-1.60: statistics.o -- cgit 1.4.1