Upgrade to 4.7.

PR:		ports/13624
Submitted by:	Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>

4 files changed, 56 insertions, 48 deletions

diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 22a2e53173e3..8579c340ace4 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -3,15 +3,16 @@
 # Date created:		11 December 96
 # Whom:			Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
 # With some
-# modifications from:	Andreas Klemm <andreas@FreeBSD.org>
+# modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
 #
-# $FreeBSD$
+# $Id: Makefile,v 1.6 1998/11/14 09:43:33 asami Exp $
 #
 
-DISTNAME=	Xbae-4.6.2
-PKGNAME=	xbae-4.6.2
+DISTNAME=	Xbae-4.7
+PKGNAME=	xbae-4.7
 CATEGORIES=	x11-toolkits math
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITES=	ftp://sunsite.doc.ic.ac.uk/packages/X11/contrib/widgets/ \
+		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	widgets/motif
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
diff --git a/x11-toolkits/xbae/distinfo b/x11-toolkits/xbae/distinfo
index f98134646172..09cf47e3dbd9 100644
--- a/x11-toolkits/xbae/distinfo
+++ b/x11-toolkits/xbae/distinfo
@@ -1 +1 @@
-MD5 (Xbae-4.6.2.tar.gz) = 733fed059a8b1570860ef30c89aed93d
+MD5 (Xbae-4.7.tar.gz) = bcdeb96a0f77ad8723867ee025378e62
diff --git a/x11-toolkits/xbae/files/patch-aa b/x11-toolkits/xbae/files/patch-aa
index 9476f6947dcd..475cbe5fbd2a 100644
--- a/x11-toolkits/xbae/files/patch-aa
+++ b/x11-toolkits/xbae/files/patch-aa
@@ -1,28 +1,36 @@
---- Xbae.tmpl.orig	Thu Jul 10 03:15:47 1997
-+++ Xbae.tmpl	Sun May 30 09:43:38 1999
-@@ -11,7 +11,7 @@
- XCOMM yes as the demos may have trouble finding the shared library.
- 
- #define DoNormalLib		YES
--#define DoSharedLib		NO /* Don't define if you want the demos! */
-+#define DoSharedLib		YES /* Don't define if you want the demos! */
- #define DoDebugLib		NO
- 
- XCOMM Some of the examples use Wcl.  If you haven't got Wcl, it doesn't
-@@ -93,9 +93,9 @@
-    LOCAL_LDFLAGS = -L../../src $(EXTRA_LDOPTIONS)
- 
- #if HaveXpm
-- LOCAL_LIBRARIES = -lXbae -lXm -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
-+ LOCAL_LIBRARIES = -lXbae ${MOTIFLIB} -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
- #else
-- LOCAL_LIBRARIES = -lXbae -lXm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
-+ LOCAL_LIBRARIES = -lXbae ${MOTIFLIB} $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
- #endif
-          DEPLIBS =
-         INCLUDES = -I../../src
-@@ -172,4 +172,3 @@
- osaber:
-         XCOMM load $(ALLDEFINES) $(OBJS)
- #endif
--
+*** Xbae.tmpl.orig	Tue Jul 27 11:21:55 1999
+--- Xbae.tmpl	Wed Sep  8 18:00:52 1999
+***************
+*** 12,18 ****
+  
+  #define DoNormalLib		YES
+  #define DoSharedLib		YES
+! #define DoDebugLib		YES
+  
+  #include <Library.tmpl>
+  
+--- 12,18 ----
+  
+  #define DoNormalLib		YES
+  #define DoSharedLib		YES
+! #define DoDebugLib		NO
+  
+  #include <Library.tmpl>
+  
+***************
+*** 138,144 ****
+     LOCAL_LDFLAGS = -L../../src $(EXTRA_LDOPTIONS)
+  
+  #if HaveXpm
+!  LOCAL_LIBRARIES = -lXbae -lXm -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
+  #else
+   LOCAL_LIBRARIES = -lXbae -lXm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
+  #endif
+--- 138,144 ----
+     LOCAL_LDFLAGS = -L../../src $(EXTRA_LDOPTIONS)
+  
+  #if HaveXpm
+!  LOCAL_LIBRARIES = -lXbae ${MOTIFLIB} -lXpm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
+  #else
+   LOCAL_LIBRARIES = -lXbae -lXm $(X11R6_LIBS) $(EDITRES_LIBS) -lXt -lX11 $(SVR4_LIBS)
+  #endif
diff --git a/x11-toolkits/xbae/pkg-plist b/x11-toolkits/xbae/pkg-plist
index 4c82a4ced731..9bb3f530116e 100644
--- a/x11-toolkits/xbae/pkg-plist
+++ b/x11-toolkits/xbae/pkg-plist
@@ -1,17 +1,16 @@
-lib/libXbae-4.6.a
+lib/libXbae-4.7.a
 lib/libXbae.a
 lib/libXbae.so
-lib/libXbae.so.6.2
+lib/libXbae.so.7.0
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-include/Xbae-4.6/Caption.h
-include/Xbae-4.6/CaptionP.h
-include/Xbae-4.6/Cell.h
-include/Xbae-4.6/CellP.h
-include/Xbae-4.6/Clip.h
-include/Xbae-4.6/ClipP.h
-include/Xbae-4.6/Matrix.h
-include/Xbae-4.6/MatrixP.h
-include/Xbae-4.6/patchlevel.h
-@dirrm include/Xbae-4.6
-include/Xbae
+@unexec /usr/bin/env OBJFORMAT==%%PORTOBJFORMAT%% /sbin/ldconfig -R
+include/Xbae-4.7/Caption.h
+include/Xbae-4.7/CaptionP.h
+include/Xbae-4.7/Input.h
+include/Xbae-4.7/InputP.h
+include/Xbae-4.7/Clip.h
+include/Xbae-4.7/ClipP.h
+include/Xbae-4.7/Matrix.h
+include/Xbae-4.7/MatrixP.h
+include/Xbae-4.7/patchlevel.h
+@dirrm include/Xbae-4.7