5 files changed, 182 insertions, 189 deletions

diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index aa2132931772..200cb3844442 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -8,12 +8,11 @@
 #
 
 PORTNAME=	Xbae
-PORTVERSION=	4.50.97
-PORTREVISION=	2
+PORTVERSION=	4.60.4
 CATEGORIES=	x11-toolkits math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xbae
-DISTNAME=	Xbae-${PORTVERSION}
+DISTNAME=	xbae-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
@@ -22,7 +21,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 USE_MOTIF=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=--enable-production
+CONFIGURE_ARGS=--enable-production --enable-static
 
 MAN3=		XbaeCaption.3 XbaeInput.3 XbaeMatrix.3
 
diff --git a/x11-toolkits/xbae/distinfo b/x11-toolkits/xbae/distinfo
index c4c5631e7ce3..7567ef8381e7 100644
--- a/x11-toolkits/xbae/distinfo
+++ b/x11-toolkits/xbae/distinfo
@@ -1,3 +1,3 @@
-MD5 (Xbae-4.50.97.tar.gz) = f5518adff4cf031fd429c7f47bc0b49d
-SHA256 (Xbae-4.50.97.tar.gz) = 7b8f51db7397e65ffcc2585b3789b4a3f1e9828c6599635c2eee32c66d44b725
-SIZE (Xbae-4.50.97.tar.gz) = 1411186
+MD5 (xbae-4.60.4.tar.gz) = 9690059474bb05191dccd041ff5052bd
+SHA256 (xbae-4.60.4.tar.gz) = eb72702ed0a36d043f2075a9d5a4545556da1b8dab4d67d85fca92f37aeb04a8
+SIZE (xbae-4.60.4.tar.gz) = 1770938
diff --git a/x11-toolkits/xbae/files/patch-aa b/x11-toolkits/xbae/files/patch-aa
deleted file mode 100644
index 91d5b4e7abc9..000000000000
--- a/x11-toolkits/xbae/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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>
-
diff --git a/x11-toolkits/xbae/files/patch-ac b/x11-toolkits/xbae/files/patch-ac
deleted file mode 100644
index f8120c081394..000000000000
--- a/x11-toolkits/xbae/files/patch-ac
+++ /dev/null
@@ -1,108 +0,0 @@
---- doc/Makefile.am.orig	Sat May 29 23:24:50 2004
-+++ doc/Makefile.am	Sat May 29 23:24:57 2004
-@@ -15,7 +15,7 @@
- # Lets put the informational stuff in a sub directory to avoid 
- # polluting /usr/local for default installs.
- #
--docdir=	$(datadir)/Xbae
-+docdir=	$(datadir)/doc/Xbae
- 
- doc_DATA=	\
-       contents.html coverplus.html difffonts.html \
---- doc/Makefile.in.orig	Sat May 29 23:25:16 2004
-+++ doc/Makefile.in	Sat May 29 23:25:18 2004
-@@ -214,7 +214,7 @@
- # Lets put the informational stuff in a sub directory to avoid 
- # polluting /usr/local for default installs.
- #
--docdir = $(datadir)/Xbae
-+docdir = $(datadir)/doc/Xbae
- doc_DATA = \
-       contents.html coverplus.html difffonts.html \
-       index.html main.html morelines.html \
---- Makefile.am.orig	Tue Aug 20 12:03:13 2002
-+++ Makefile.am	Sat Nov 23 16:28:21 2002
-@@ -16,7 +16,7 @@
- 
- endif
- 
--docdir=	$(prefix)/Xbae
-+docdir=	$(datadir)/doc/Xbae
- doc_DATA= NEWS README
- 
- .PHONY: changelog UpdateCheck
---- Makefile.in.orig	Sat May 29 22:51:17 2004
-+++ Makefile.in	Sat May 29 23:03:58 2004
-@@ -226,7 +226,7 @@
- 
- aclocaldir = @ACLOCALDIR@
- @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
--docdir = $(prefix)/Xbae
-+docdir = $(datadir)/doc/Xbae
- doc_DATA = NEWS README
- 
- #
-@@ -627,7 +627,7 @@
- 
- info-am:
- 
--install-data-am: install-aclocalDATA install-docDATA
-+install-data-am: install-docDATA
- 
- install-exec-am:
- 
---- examples/builderXcessory/Makefile.am.orig	Sat May 29 23:20:22 2004
-+++ examples/builderXcessory/Makefile.am	Sat May 29 23:20:26 2004
-@@ -9,7 +9,7 @@
- 	xbae.wml \
- 	xbae_ctrl.tcl
- 
--examplesdir = $(datadir)/Xbae/examples/builderXcessory
-+examplesdir = $(datadir)/examples/Xbae/builderXcessory
- examples_DATA = \
- 	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
- 	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
---- examples/builderXcessory/Makefile.in.orig	Sat May 29 23:23:48 2004
-+++ examples/builderXcessory/Makefile.in	Sat May 29 23:23:52 2004
-@@ -203,7 +203,7 @@
- 	xbae.wml \
- 	xbae_ctrl.tcl
- 
--examplesdir = $(datadir)/Xbae/examples/builderXcessory
-+examplesdir = $(datadir)/examples/Xbae/builderXcessory
- examples_DATA = \
- 	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
- 	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
---- src/Makefile.in.orig	Sat May 29 23:37:07 2004
-+++ src/Makefile.in	Sat May 29 23:37:10 2004
-@@ -525,7 +525,7 @@
- 
- info-am:
- 
--install-data-am: install-htmlDATA install-man
-+install-data-am: install-man
- 
- install-exec-am: install-libLTLIBRARIES
- 
---- doc/images/Makefile.am.orig	Sat May 29 23:25:49 2004
-+++ doc/images/Makefile.am	Sat May 29 23:25:53 2004
-@@ -10,7 +10,7 @@
- # Lets put the informational stuff in a sub directory to avoid 
- # polluting /usr/local for default installs.
- #
--imagedir=	$(datadir)/Xbae/images
-+imagedir=	$(datadir)/doc/Xbae/images
- 
- 
- 
---- doc/images/Makefile.in.orig	Sat May 29 23:26:09 2004
-+++ doc/images/Makefile.in	Sat May 29 23:26:14 2004
-@@ -203,7 +203,7 @@
- # Lets put the informational stuff in a sub directory to avoid 
- # polluting /usr/local for default installs.
- #
--imagedir = $(datadir)/Xbae/images
-+imagedir = $(datadir)/doc/Xbae/images
- 
- #
- # Cut the distribution size, don't distribute these in a source
diff --git a/x11-toolkits/xbae/pkg-plist b/x11-toolkits/xbae/pkg-plist
index 69f6d5090850..6294095deae7 100644
--- a/x11-toolkits/xbae/pkg-plist
+++ b/x11-toolkits/xbae/pkg-plist
@@ -11,59 +11,180 @@ lib/libXbae.a
 lib/libXbae.la
 lib/libXbae.so
 lib/libXbae.so.4
-%%DOCSDIR%%/FAQ.html
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/contents.html
-%%DOCSDIR%%/coverplus.html
-%%DOCSDIR%%/difffonts.html
-%%DOCSDIR%%/images/LDO.jpg
-%%DOCSDIR%%/images/add.jpg
-%%DOCSDIR%%/images/bg.png
-%%DOCSDIR%%/images/capfloor1.png
-%%DOCSDIR%%/images/capfloor3.png
-%%DOCSDIR%%/images/caption.png
-%%DOCSDIR%%/images/choice.png
-%%DOCSDIR%%/images/colors.jpg
-%%DOCSDIR%%/images/coverplus.png
-%%DOCSDIR%%/images/draw.png
-%%DOCSDIR%%/images/fifteen.jpg
-%%DOCSDIR%%/images/input.png
-%%DOCSDIR%%/images/lesstif.png
-%%DOCSDIR%%/images/list.jpg
-%%DOCSDIR%%/images/mailbox.png
-%%DOCSDIR%%/images/matrix.jpg
-%%DOCSDIR%%/images/multifixed.jpg
-%%DOCSDIR%%/images/new.png
-%%DOCSDIR%%/images/organize.jpg
-%%DOCSDIR%%/images/pricing.jpg
-%%DOCSDIR%%/images/risk.jpg
-%%DOCSDIR%%/images/select-push.jpg
-%%DOCSDIR%%/images/taam.png
-%%DOCSDIR%%/images/updated.png
-%%DOCSDIR%%/images/xbasket.png
-%%DOCSDIR%%/images/xbill2-2.png
-%%DOCSDIR%%/images/xbum1-2.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/main.html
-%%DOCSDIR%%/morelines.html
-%%DOCSDIR%%/psdriver.html
-%%DOCSDIR%%/scrolling.html
-%%DOCSDIR%%/sites.html
-%%DOCSDIR%%/spancells.html
-%%DOCSDIR%%/title.html
-%%DOCSDIR%%/users.html
-%%EXAMPLESDIR%%/builderXcessory/XbaeCaption.col
-%%EXAMPLESDIR%%/builderXcessory/XbaeCaption.pix
-%%EXAMPLESDIR%%/builderXcessory/XbaeInput.col
-%%EXAMPLESDIR%%/builderXcessory/XbaeInput.pix
-%%EXAMPLESDIR%%/builderXcessory/XbaeMatrix.col
-%%EXAMPLESDIR%%/builderXcessory/XbaeMatrix.pix
-%%EXAMPLESDIR%%/builderXcessory/local.cat
-%%EXAMPLESDIR%%/builderXcessory/xbae.wml
-%%EXAMPLESDIR%%/builderXcessory/xbae_ctrl.tcl
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%
-@dirrm share/examples/Xbae/builderXcessory
-@dirrm share/examples/Xbae
+share/Xbae/FAQ.html
+share/Xbae/NEWS
+share/Xbae/README
+share/Xbae/contents.html
+share/Xbae/coverplus.html
+share/Xbae/difffonts.html
+share/Xbae/examples/builderXcessory/XbaeCaption.col
+share/Xbae/examples/builderXcessory/XbaeCaption.pix
+share/Xbae/examples/builderXcessory/XbaeInput.col
+share/Xbae/examples/builderXcessory/XbaeInput.pix
+share/Xbae/examples/builderXcessory/XbaeMatrix.col
+share/Xbae/examples/builderXcessory/XbaeMatrix.pix
+share/Xbae/examples/builderXcessory/local.cat
+share/Xbae/examples/builderXcessory/xbae.wml
+share/Xbae/examples/builderXcessory/xbae_ctrl.tcl
+share/Xbae/images/LDO.jpg
+share/Xbae/images/add.jpg
+share/Xbae/images/bg.png
+share/Xbae/images/capfloor1.png
+share/Xbae/images/capfloor3.png
+share/Xbae/images/caption.png
+share/Xbae/images/choice.png
+share/Xbae/images/colors.jpg
+share/Xbae/images/coverplus.png
+share/Xbae/images/draw.png
+share/Xbae/images/fifteen.jpg
+share/Xbae/images/grohtml-XbaeCaption1.png
+share/Xbae/images/grohtml-XbaeCaption2.png
+share/Xbae/images/grohtml-XbaeCaption3.png
+share/Xbae/images/grohtml-XbaeCaption4.png
+share/Xbae/images/grohtml-XbaeCaption5.png
+share/Xbae/images/grohtml-XbaeInput1.png
+share/Xbae/images/grohtml-XbaeInput2.png
+share/Xbae/images/grohtml-XbaeInput3.png
+share/Xbae/images/grohtml-XbaeInput4.png
+share/Xbae/images/grohtml-XbaeInput5.png
+share/Xbae/images/grohtml-XbaeInput6.png
+share/Xbae/images/grohtml-XbaeInput7.png
+share/Xbae/images/grohtml-XbaeInput8.png
+share/Xbae/images/grohtml-XbaeMatrix1.png
+share/Xbae/images/grohtml-XbaeMatrix10.png
+share/Xbae/images/grohtml-XbaeMatrix100.png
+share/Xbae/images/grohtml-XbaeMatrix101.png
+share/Xbae/images/grohtml-XbaeMatrix102.png
+share/Xbae/images/grohtml-XbaeMatrix103.png
+share/Xbae/images/grohtml-XbaeMatrix104.png
+share/Xbae/images/grohtml-XbaeMatrix105.png
+share/Xbae/images/grohtml-XbaeMatrix106.png
+share/Xbae/images/grohtml-XbaeMatrix107.png
+share/Xbae/images/grohtml-XbaeMatrix108.png
+share/Xbae/images/grohtml-XbaeMatrix11.png
+share/Xbae/images/grohtml-XbaeMatrix12.png
+share/Xbae/images/grohtml-XbaeMatrix13.png
+share/Xbae/images/grohtml-XbaeMatrix14.png
+share/Xbae/images/grohtml-XbaeMatrix15.png
+share/Xbae/images/grohtml-XbaeMatrix16.png
+share/Xbae/images/grohtml-XbaeMatrix17.png
+share/Xbae/images/grohtml-XbaeMatrix18.png
+share/Xbae/images/grohtml-XbaeMatrix19.png
+share/Xbae/images/grohtml-XbaeMatrix2.png
+share/Xbae/images/grohtml-XbaeMatrix20.png
+share/Xbae/images/grohtml-XbaeMatrix21.png
+share/Xbae/images/grohtml-XbaeMatrix22.png
+share/Xbae/images/grohtml-XbaeMatrix23.png
+share/Xbae/images/grohtml-XbaeMatrix24.png
+share/Xbae/images/grohtml-XbaeMatrix25.png
+share/Xbae/images/grohtml-XbaeMatrix26.png
+share/Xbae/images/grohtml-XbaeMatrix27.png
+share/Xbae/images/grohtml-XbaeMatrix28.png
+share/Xbae/images/grohtml-XbaeMatrix29.png
+share/Xbae/images/grohtml-XbaeMatrix3.png
+share/Xbae/images/grohtml-XbaeMatrix30.png
+share/Xbae/images/grohtml-XbaeMatrix31.png
+share/Xbae/images/grohtml-XbaeMatrix32.png
+share/Xbae/images/grohtml-XbaeMatrix33.png
+share/Xbae/images/grohtml-XbaeMatrix34.png
+share/Xbae/images/grohtml-XbaeMatrix35.png
+share/Xbae/images/grohtml-XbaeMatrix36.png
+share/Xbae/images/grohtml-XbaeMatrix37.png
+share/Xbae/images/grohtml-XbaeMatrix38.png
+share/Xbae/images/grohtml-XbaeMatrix39.png
+share/Xbae/images/grohtml-XbaeMatrix4.png
+share/Xbae/images/grohtml-XbaeMatrix40.png
+share/Xbae/images/grohtml-XbaeMatrix41.png
+share/Xbae/images/grohtml-XbaeMatrix42.png
+share/Xbae/images/grohtml-XbaeMatrix43.png
+share/Xbae/images/grohtml-XbaeMatrix44.png
+share/Xbae/images/grohtml-XbaeMatrix45.png
+share/Xbae/images/grohtml-XbaeMatrix46.png
+share/Xbae/images/grohtml-XbaeMatrix47.png
+share/Xbae/images/grohtml-XbaeMatrix48.png
+share/Xbae/images/grohtml-XbaeMatrix49.png
+share/Xbae/images/grohtml-XbaeMatrix5.png
+share/Xbae/images/grohtml-XbaeMatrix50.png
+share/Xbae/images/grohtml-XbaeMatrix51.png
+share/Xbae/images/grohtml-XbaeMatrix52.png
+share/Xbae/images/grohtml-XbaeMatrix53.png
+share/Xbae/images/grohtml-XbaeMatrix54.png
+share/Xbae/images/grohtml-XbaeMatrix55.png
+share/Xbae/images/grohtml-XbaeMatrix56.png
+share/Xbae/images/grohtml-XbaeMatrix57.png
+share/Xbae/images/grohtml-XbaeMatrix58.png
+share/Xbae/images/grohtml-XbaeMatrix59.png
+share/Xbae/images/grohtml-XbaeMatrix6.png
+share/Xbae/images/grohtml-XbaeMatrix60.png
+share/Xbae/images/grohtml-XbaeMatrix61.png
+share/Xbae/images/grohtml-XbaeMatrix62.png
+share/Xbae/images/grohtml-XbaeMatrix63.png
+share/Xbae/images/grohtml-XbaeMatrix64.png
+share/Xbae/images/grohtml-XbaeMatrix65.png
+share/Xbae/images/grohtml-XbaeMatrix66.png
+share/Xbae/images/grohtml-XbaeMatrix67.png
+share/Xbae/images/grohtml-XbaeMatrix68.png
+share/Xbae/images/grohtml-XbaeMatrix69.png
+share/Xbae/images/grohtml-XbaeMatrix7.png
+share/Xbae/images/grohtml-XbaeMatrix70.png
+share/Xbae/images/grohtml-XbaeMatrix71.png
+share/Xbae/images/grohtml-XbaeMatrix72.png
+share/Xbae/images/grohtml-XbaeMatrix73.png
+share/Xbae/images/grohtml-XbaeMatrix74.png
+share/Xbae/images/grohtml-XbaeMatrix75.png
+share/Xbae/images/grohtml-XbaeMatrix76.png
+share/Xbae/images/grohtml-XbaeMatrix77.png
+share/Xbae/images/grohtml-XbaeMatrix78.png
+share/Xbae/images/grohtml-XbaeMatrix79.png
+share/Xbae/images/grohtml-XbaeMatrix8.png
+share/Xbae/images/grohtml-XbaeMatrix80.png
+share/Xbae/images/grohtml-XbaeMatrix81.png
+share/Xbae/images/grohtml-XbaeMatrix82.png
+share/Xbae/images/grohtml-XbaeMatrix83.png
+share/Xbae/images/grohtml-XbaeMatrix84.png
+share/Xbae/images/grohtml-XbaeMatrix85.png
+share/Xbae/images/grohtml-XbaeMatrix86.png
+share/Xbae/images/grohtml-XbaeMatrix87.png
+share/Xbae/images/grohtml-XbaeMatrix88.png
+share/Xbae/images/grohtml-XbaeMatrix89.png
+share/Xbae/images/grohtml-XbaeMatrix9.png
+share/Xbae/images/grohtml-XbaeMatrix90.png
+share/Xbae/images/grohtml-XbaeMatrix91.png
+share/Xbae/images/grohtml-XbaeMatrix92.png
+share/Xbae/images/grohtml-XbaeMatrix93.png
+share/Xbae/images/grohtml-XbaeMatrix94.png
+share/Xbae/images/grohtml-XbaeMatrix95.png
+share/Xbae/images/grohtml-XbaeMatrix96.png
+share/Xbae/images/grohtml-XbaeMatrix97.png
+share/Xbae/images/grohtml-XbaeMatrix98.png
+share/Xbae/images/grohtml-XbaeMatrix99.png
+share/Xbae/images/input.png
+share/Xbae/images/lesstif.png
+share/Xbae/images/list.jpg
+share/Xbae/images/mailbox.png
+share/Xbae/images/matrix.jpg
+share/Xbae/images/multifixed.jpg
+share/Xbae/images/new.png
+share/Xbae/images/organize.jpg
+share/Xbae/images/pricing.jpg
+share/Xbae/images/risk.jpg
+share/Xbae/images/select-push.jpg
+share/Xbae/images/taam.png
+share/Xbae/images/updated.png
+share/Xbae/images/xbasket.png
+share/Xbae/images/xbill2-2.png
+share/Xbae/images/xbum1-2.png
+share/Xbae/index.html
+share/Xbae/main.html
+share/Xbae/morelines.html
+share/Xbae/psdriver.html
+share/Xbae/scrolling.html
+share/Xbae/sites.html
+share/Xbae/spancells.html
+share/Xbae/title.html
+share/Xbae/users.html
+@dirrm share/Xbae/images
+@dirrm share/Xbae/examples/builderXcessory
+@dirrm share/Xbae/examples
+@dirrm share/Xbae
 @dirrm include/Xbae