Xaw3d: 1.5E -> 1.6.2, switch md5 to sha256, use X.org as the upstream

4 files changed, 7 insertions, 95 deletions

diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh
deleted file mode 100644
index ff42e47ea56..00000000000
--- a/pkgs/development/libraries/Xaw3d/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-
-configurePhase() {
-    cd lib/Xaw3d
-    (mkdir X11 && cd X11 && ln -fs .. Xaw3d)
-    xmkmf
-}
-
-buildPhase() {
-    make depend $makeFlags
-    make $makeFlags
-}
-
-installPhase() {
-    make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include
-    cd $out/include/X11 && ln -s Xaw3d Xaw
-
-    mkdir -p "$out/nix-support"
-    echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-}
-
-makeFlags="CDEBUGFLAGS=" # !!! awful hack
-
-genericBuild
diff --git a/pkgs/development/libraries/Xaw3d/config.patch b/pkgs/development/libraries/Xaw3d/config.patch
deleted file mode 100644
index 4062f313368..00000000000
--- a/pkgs/development/libraries/Xaw3d/config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -rc xc-orig/lib/Xaw3d/Imakefile xc/lib/Xaw3d/Imakefile
-*** xc-orig/lib/Xaw3d/Imakefile	2003-03-08 15:55:18.000000000 +0100
---- xc/lib/Xaw3d/Imakefile	2005-11-11 20:12:24.000000000 +0100
-***************
-*** 9,15 ****
-  XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
-  #define GRAY_BLKWHT_STIPPLES
-  XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
-! #undef ARROW_SCROLLBARS
-  
-  #define DoNormalLib NormalLibXaw
-  #define DoSharedLib SharedLibXaw
---- 9,15 ----
-  XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
-  #define GRAY_BLKWHT_STIPPLES
-  XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
-! #define ARROW_SCROLLBARS
-  
-  #define DoNormalLib NormalLibXaw
-  #define DoSharedLib SharedLibXaw
-***************
-*** 22,28 ****
-  #define IncSubSubdir Xaw3d
-  
-  XCOMM When building outside an X11 source tree:
-! XCOMM EXTRA_INCLUDES = -I.
-  
-  #ifdef SharedXawReqs
-  REQUIREDLIBS = SharedXawReqs
---- 22,28 ----
-  #define IncSubSubdir Xaw3d
-  
-  XCOMM When building outside an X11 source tree:
-! EXTRA_INCLUDES = -I.
-  
-  #ifdef SharedXawReqs
-  REQUIREDLIBS = SharedXawReqs
-diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
-*** xc-orig/lib/Xaw3d/laylex.l	1996-10-15 16:41:26.000000000 +0200
---- xc/lib/Xaw3d/laylex.l	2005-11-11 20:03:50.000000000 +0100
-***************
-*** 26,31 ****
---- 26,33 ----
-  #ifdef __STDC__
-  static int count ();
-  #endif
-+ 
-+ static int LayYY_prev_more_offset = 0;
-  %}
-  %%
-  vertical		return VERTICAL;
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index ca225b3381b..50399f62d0a 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
+{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "Xaw3d-1.5E";
-  builder = ./builder.sh;
+  name = "Xaw3d-1.6.2";
   src = fetchurl {
-    url = http://freshmeat.net/redir/xaw3d/11835/url_tgz/Xaw3d-1.5E.tar.gz;
-    md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
+    urls = [ 
+      ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2
+      ];
+    sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi";
   };
-  patches = [./config.patch ./laylex.patch];
-  buildInputs = [imake gccmakedep libXpm libXp bison flex];
+  buildInputs = [imake gccmakedep libXpm libXp bison flex pkgconfig];
   propagatedBuildInputs = [xlibsWrapper libXmu];
 
   meta = {
diff --git a/pkgs/development/libraries/Xaw3d/laylex.patch b/pkgs/development/libraries/Xaw3d/laylex.patch
deleted file mode 100644
index 911ea800ec6..00000000000
--- a/pkgs/development/libraries/Xaw3d/laylex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
-*** xc-orig/lib/Xaw3d/laylex.l	2006-08-07 12:12:54.000000000 +0200
---- xc/lib/Xaw3d/laylex.l	2006-08-07 12:14:49.000000000 +0200
-***************
-*** 27,33 ****
-  static int count ();
-  #endif
-  
-- static int LayYY_prev_more_offset = 0;
-  %}
-  %%
-  vertical		return VERTICAL;
---- 27,32 ----