4 files changed, 52 insertions, 42 deletions

diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index f522091e9a07..0d8689d50b69 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	Xbae
 # Date created:		11 December 96
-# Whom:			Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
+# Whom:			Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>
 # With some
 # modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
 #
@@ -8,10 +8,10 @@
 #
 
 PORTNAME=	xbae
-PORTVERSION= 	4.7
+PORTVERSION= 	4.8.4
 CATEGORIES=	x11-toolkits math
-MASTER_SITES=	ftp://sunsite.doc.ic.ac.uk/packages/X11/contrib/widgets/ \
-		${MASTER_SITE_XCONTRIB}
+MASTER_SITES=	ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \
+		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/
 MASTER_SITE_SUBDIR=	widgets/motif
 DISTNAME=	Xbae-${PORTVERSION}
 
@@ -19,17 +19,27 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-MAN3=		XbaeCaption.3 XbaeMatrix.3
+HAS_CONFIGURE=  yes
+CONFIGURE_ARGS= --prefix=${X11BASE} --enable-xbae-24bit --enable-xbae-row-heights
+
+MAN3=		XbaeCaption.3 XbaeInput.3 XbaeMatrix.3
 
 .include <bsd.port.pre.mk>
 
+post-patch:
+	for na in $$(find ${WRKSRC}/examples -name Makefile.in); do \
+	  ${CP} $$na $$na.orig; \
+	  ${SED} "s%-lXm%${MOTIFLIB}%" $$na.orig > $$na; \
+	done
+
 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libXbae.so.6.2 ${PREFIX}/lib/libXbae.so
+	${LN} -sf libXbae.so.8.4 ${PREFIX}/lib/libXbae.so
 .endif
 	${RM} -rf ${PREFIX}/include/Xbae
-	${LN} -sf Xbae-4.7 ${PREFIX}/include/Xbae
+	${LN} -sf Xbae-4.8 ${PREFIX}/include/Xbae
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/xbae/distinfo b/x11-toolkits/xbae/distinfo
index 09cf47e3dbd9..9c7822b181f6 100644
--- a/x11-toolkits/xbae/distinfo
+++ b/x11-toolkits/xbae/distinfo
@@ -1 +1 @@
-MD5 (Xbae-4.7.tar.gz) = bcdeb96a0f77ad8723867ee025378e62
+MD5 (Xbae-4.8.4.tar.gz) = b4bbe73d4d44203d96ca47ccff18732a
diff --git a/x11-toolkits/xbae/files/patch-aa b/x11-toolkits/xbae/files/patch-aa
index 475cbe5fbd2a..1a18485713b2 100644
--- a/x11-toolkits/xbae/files/patch-aa
+++ b/x11-toolkits/xbae/files/patch-aa
@@ -1,36 +1,36 @@
-*** Xbae.tmpl.orig	Tue Jul 27 11:21:55 1999
---- Xbae.tmpl	Wed Sep  8 18:00:52 1999
+*** Xbae.tmpl.orig	Thu Dec 28 20:02:38 2000
+--- Xbae.tmpl	Thu Dec 28 20:05:49 2000
 ***************
 *** 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)
+*** 166,172 ****
   #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)
+
+  #ifndef XmClientLibs
+! # define XmClientLibs -lXm $(XTOOLLIB) $(XLIB)
   #endif
+
+  #ifndef HasSaberC
+--- 166,172 ----
+  #endif
+
+  #ifndef XmClientLibs
+! # define XmClientLibs ${MOTIFLIB} $(XTOOLLIB) $(XLIB)
+  #endif
+
+  #ifndef HasSaberC
diff --git a/x11-toolkits/xbae/pkg-plist b/x11-toolkits/xbae/pkg-plist
index b9114f143d73..cbc55c9879a5 100644
--- a/x11-toolkits/xbae/pkg-plist
+++ b/x11-toolkits/xbae/pkg-plist
@@ -1,15 +1,15 @@
-lib/libXbae-4.7.a
+lib/libXbae-4.8.a
 lib/libXbae.a
 lib/libXbae.so
-lib/libXbae.so.7.0
-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
+lib/libXbae.so.8
+include/Xbae-4.8/Caption.h
+include/Xbae-4.8/CaptionP.h
+include/Xbae-4.8/Input.h
+include/Xbae-4.8/InputP.h
+include/Xbae-4.8/Clip.h
+include/Xbae-4.8/ClipP.h
+include/Xbae-4.8/Matrix.h
+include/Xbae-4.8/MatrixP.h
+include/Xbae-4.8/patchlevel.h
+@dirrm include/Xbae-4.8
 include/Xbae