From 564e3fa1d1f972732dc59414401aea17d592fc0d Mon Sep 17 00:00:00 2001
From: "Andreas V. 'netrunner' Meier" <avmeier@web.de>
Date: Tue, 4 Apr 2006 14:11:51 +0000
Subject: [PATCH] Andreas V. Meier: 	 update xaw3d(1.5E)

[2006031900533003768] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7413 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/x11/xaw3d/redhat.patch | 74 ----------------------------------
 package/x11/xaw3d/xaw3d.conf   | 19 +++------
 package/x11/xaw3d/xaw3d.desc   |  4 +-
 3 files changed, 7 insertions(+), 90 deletions(-)
 delete mode 100644 package/x11/xaw3d/redhat.patch

diff --git a/package/x11/xaw3d/redhat.patch b/package/x11/xaw3d/redhat.patch
deleted file mode 100644
index a2b73e46d..000000000
--- a/package/x11/xaw3d/redhat.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x11/xaw3d/redhat.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./xc/lib/Xaw3d/XawI18n.h.orig	Wed Jun 20 14:18:34 2001
-+++ ./xc/lib/Xaw3d/XawI18n.h	Wed Jun 20 14:18:50 2001
-@@ -27,9 +27,13 @@
- 
- ********************************************************/
- 
-+#if 0
- #ifdef HAS_WCTYPE_H
- #include <wctype.h>
-+#if !defined(__linux__)
- #include <widec.h>
-+#endif
-+#endif
- #define wcslen(c) wslen(c)
- #define wcscpy(d,s) wscpy(d,s)
- #define wcsncpy(d,s,l) wsncpy(d,s,l)
---- ./xc/lib/Xaw3d/Imakefile.orig	Wed Jun 20 14:14:35 2001
-+++ ./xc/lib/Xaw3d/Imakefile	Wed Jun 20 14:18:50 2001
-@@ -10,27 +10,6 @@
- #define IncSubdir X11
- #define IncSubSubdir Xaw3d
- 
--#ifdef LinuxArchitecture
--JUMP_ROOT_Xaw3d = $(AWIDGETSRC)3d
--JUMP_IS_HOST_Xaw3d = YES
--JUMP_STUBLIBS_Xaw3d = libXaw3d.sa
--JUMP_SUBDIRS_Xaw3d = $(JUMP_ROOT_Xt)
--JUMP_DIR_Xaw3d = $(JUMP_ROOT_Xaw3d)/shared
--JUMP_VARS_Xaw3d = $(JUMP_ROOT_Xaw3d)/jump_vars
--JUMP_FUNCS_Xaw3d = $(JUMP_ROOT_Xaw3d)/jump_funcs
--JUMP_IGNORE_Xaw3d = $(JUMP_ROOT_Xaw3d)/jump_ignore
--JUMP_EXPORT_Xaw3d = $(JUMP_DIR_Xaw3d)/jump.vars
--JUMP_IMPORT_Xaw3d = $(JUMP_EXPORT_Xt) $(JUMP_EXPORT_X11)
--JUMP_ADDRESS_Xaw3d = 0x60300000
--JUMP_JUMPTABLESIZE_Xaw3d = 0x4000
--JUMP_GOTSIZE_Xaw3d = 4096
--JUMP_STUBNAMES_Xaw3d = libXaw3d
--JUMP_STUBS_IMPORT_Xaw3d = $(JUMP_STUBS_IMPORT_X11)
--JUMP_LDLIBS_Xaw3d = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \
--        $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \
--        $(JUMP_LDLIBS_libc)
--#endif
--
- #ifdef SharedXawReqs
- REQUIREDLIBS = SharedXawReqs
- #endif
-@@ -41,7 +20,7 @@
- 
- #  EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
- 
--#  EXTRA_INCLUDES = -I.
-+EXTRA_INCLUDES = -I.
- 
- HEADERS = \
- 	AllWidgets.h \
diff --git a/package/x11/xaw3d/xaw3d.conf b/package/x11/xaw3d/xaw3d.conf
index 1dcc596f0..611b309e5 100644
--- a/package/x11/xaw3d/xaw3d.conf
+++ b/package/x11/xaw3d/xaw3d.conf
@@ -20,17 +20,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-xaw_main()
-{
-	mkdir -p $root/usr/X11R6/include/Xaw3d
-	cd xc/lib/Xaw3d
-	ln -sf .. X11
-	echo "running xmkmf ..."
-	pwd
-	xmkmf -a
-	eval "$MAKE $makeopt" ; eval "$MAKE $makeinstopt"
-	#cd $root/usr/include/X11 && rm -rf Xaw3d && ln -s ../Xaw3d Xaw3d
-}
-
-custmain="xaw_main"
-
+hook_add premake 3 "mkdir -p $root/usr/X11R6/include/Xaw3d"
+hook_add premake 3 "mkdir X11; ln -fs .. X11/Xaw3d;"
+hook_add premake 3 "sed -i -e 's,^XCOMM \(EXTRA_INCLUDES = -I.\),\1,' Imakefile"
+hook_add premake 4 "xmkmf; make depend;"
+srcdir="xc/lib/Xaw3d"
diff --git a/package/x11/xaw3d/xaw3d.desc b/package/x11/xaw3d/xaw3d.desc
index cc8289735..1c516040d 100644
--- a/package/x11/xaw3d/xaw3d.desc
+++ b/package/x11/xaw3d/xaw3d.desc
@@ -33,8 +33,8 @@
 
 [L] OpenSource
 [S] Stable
-[V] 1.5
+[V] 1.5E
 [P] X -?---5---9 118.100
 
-[D] 1934987973 Xaw3d-1.5.tar.gz ftp://ftp.sunet.se/pub/X11/contrib/widgets/Xaw3d/R6.3/ 
+[D] 1490872365 Xaw3d-1.5E.tar.gz ftp://ftp.visi.com/users/hawkeyd/X/