[Frugalware-git] frugalware-current: libxaw3d-1.6-1-i686

[Michel Hermier]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=feadb899507c48d0fa01f32b211370ddec4ddc9f

commit feadb899507c48d0fa01f32b211370ddec4ddc9f
Author: Michel Hermier <hermier at frugalware.org>
Date:   Tue Jan 24 18:55:05 2012 +0100

libxaw3d-1.6-1-i686

* Bump version.

diff --git a/source/x11/libxaw3d/FrugalBuild b/source/x11/libxaw3d/FrugalBuild
index e3dffd1..97202c0 100644
--- a/source/x11/libxaw3d/FrugalBuild
+++ b/source/x11/libxaw3d/FrugalBuild
@@ -2,42 +2,26 @@
# Maintainer: Miklos Vajna <vmiklos at frugalware.org>

pkgname=libxaw3d
-pkgver=1.5
-pkgextraver=E
+_F_xorg_name=libXaw3d
+pkgver=1.6
pkgrel=1
pkgdesc="Athena widgets (libXaw) drop-in replacement"
-url="ftp://ftp.x.org/contrib/widgets/Xaw3d/"
-depends=('libx11>=1.2.1' 'libxt' 'libxpm' 'libxp' 'libxmu')
-makedepends=('imake' 'gccmakedep' 'xorg-cf-files')
-groups=('x11')
+depends=('libxmu' 'libxpm' 'libuuid')
+groups=('x11' 'xorg-core' 'xorg-libs')
archs=('i686' 'x86_64' 'arm')
-_F_archive_name=Xaw3d
-up2date="Flasttar ftp://ftp.visi.com/users/hawkeyd/X/"
-source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-$pkgver$pkgextraver.tar.gz \
-	$pkgname-$pkgver-xfree86.diff)
-sha1sums=('efc5b923feda52866c859c59a5b553cb675a69d1' \
-          'b45d4ea2104bbb6a0e756f2356acc1ac44b54df2')
-unset MAKEFLAGS
+
+_F_xorg_ind=1
+Finclude xorg
+sha1sums=('b10489c3cc9dde46bd13294ee971b1a782e0a4be')

provides=('xaw3d')
replaces=("${provides[@]}")
conflicts=("${provides[@]}")

-build()
-{
-	Fcd xc/lib/Xaw3d
-	Fpatchall
-	# more familiar scroll-bar look
-	Fsed '#.*EXTRA_DEFINES' 'EXTRA_DEFINES' Imakefile
-	# we are building outside the x tree
-	Fsed 'XCOMM EXTRA_INCLUDES = -I.' 'EXTRA_INCLUDES = -I.' Imakefile
-	mkdir X11; cd X11; ln -fs .. Xaw3d; cd ..
-	xmkmf || Fdie
-	make includes || Fdie
-	make depend || Fdie
-	Fmake
-	Fmakeinstall
-	if [ "$CARCH" = "x86_64" ]; then
-		Fmv /usr/lib64 /usr/lib
-	fi
-}
+Fconfopts="
+	--enable-arrow-scrollbars
+	--enable-gray-stipples
+	--enable-internationalization
+	--enable-multiplane-bitmaps
+"
+
diff --git a/source/x11/libxaw3d/libxaw3d-1.5-xfree86.diff b/source/x11/libxaw3d/libxaw3d-1.5-xfree86.diff
deleted file mode 100644
index 3f15688..0000000
--- a/source/x11/libxaw3d/libxaw3d-1.5-xfree86.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- Xaw3d.orig/XawI18n.h	Tue Aug 29 07:00:21 1995
-+++ Xaw3d/XawI18n.h		Tue Nov 19 02:22:09 1996
-@@ -27,12 +27,18 @@
-
- ********************************************************/
-
-+#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)
-+#if 0
-+#endif
- #endif
-
- #ifdef HAS_WCHAR_H