Prepare for xforms update.

3 files changed, 58 insertions, 66 deletions

diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 5a14d96e388a..33932739ffaa 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	-source.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	forms.0:${PORTSDIR}/x11-toolkits/xforms
 
 WRKSRC=		${WRKDIR}/xldlas
 
diff --git a/math/xldlas/files/patch-aa b/math/xldlas/files/patch-aa
index 2510e826c0f5..a8cc4e74a7cf 100644
--- a/math/xldlas/files/patch-aa
+++ b/math/xldlas/files/patch-aa
@@ -1,65 +1,44 @@
-*** Makefile.orig	Tue Apr  1 12:13:32 1997
---- Makefile	Mon Apr 27 01:10:50 1998
-***************
-*** 16,26 ****
-  #	want to remove the -DXFORMS86 declaration in the CCFLAG 
-  #	assignment. 
-  #
-! CCFLAG		= -O2 -Wall -DXFORMS86
-! CC		= gcc
-! COMMONLIBS	= -L/usr/X11R6/lib/ -lX11 -lm
-! SHAREDLIBS	= -lforms
-! STATICLIBS	= -lXpm /usr/X11R6/lib/libforms.a
-  ECHO		= echo
-  RM		= rm
-  RMOPTS		= -f
---- 16,26 ----
-  #	want to remove the -DXFORMS86 declaration in the CCFLAG 
-  #	assignment. 
-  #
-! CCFLAG		= $(CFLAGS) -DXFORMS86 -DPREFIX=\"$(PREFIX)\" -I$(X11BASE)/include
-! #CC		= gcc
-! COMMONLIBS	= -L$(X11BASE)/lib/ -lX11 -lm
-! SHAREDLIBS	= -lxforms -lXpm
-! STATICLIBS	= $(X11BASE)/lib/libxforms.a -lXpm
-  ECHO		= echo
-  RM		= rm
-  RMOPTS		= -f
-***************
-*** 29,37 ****
-  INSTALL		= install
-  INSTALLOPTS	= -d 
-  
-! BINDIR		= /usr/local/bin
-! MANDIR		= /usr/man/man1
-! HELPDIR		= /usr/local/xldlas/help
-  SRCDIR		:= $$PWD
-  USER		:= $$LOGNAME
-  
---- 29,37 ----
-  INSTALL		= install
-  INSTALLOPTS	= -d 
-  
-! BINDIR		= $(PREFIX)/bin
-! MANDIR		= $(PREFIX)/man/man1
-! HELPDIR		= $(PREFIX)/share/xldlas/help
-  SRCDIR		:= $$PWD
-  USER		:= $$LOGNAME
-  
-***************
-*** 115,121 ****
-  			so the following commands will probably fail"; fi 
-  		@$(ECHO)
-  		@$(CP) $(CPOPTS) xldlas $(BINDIR)
-! 		@if test '/usr/local/xldlas' = $(SRCDIR); then \
-  			$(ECHO) Help Files Already in Place; else \
-  			$(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi
-  install.man:	
---- 115,121 ----
-  			so the following commands will probably fail"; fi 
-  		@$(ECHO)
-  		@$(CP) $(CPOPTS) xldlas $(BINDIR)
-! 		@if test '/usr/local/share/xldlas' = $(SRCDIR); then \
-  			$(ECHO) Help Files Already in Place; else \
-  			$(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi
-  install.man:	
+--- Makefile.orig	Tue Apr  1 12:13:32 1997
++++ Makefile	Tue Jul  2 01:19:28 2002
+@@ -16,11 +16,14 @@
+ #	want to remove the -DXFORMS86 declaration in the CCFLAG 
+ #	assignment. 
+ #
+-CCFLAG		= -O2 -Wall -DXFORMS86
+-CC		= gcc
+-COMMONLIBS	= -L/usr/X11R6/lib/ -lX11 -lm
+-SHAREDLIBS	= -lforms
+-STATICLIBS	= -lXpm /usr/X11R6/lib/libforms.a
++.if exists(${X11BASE}/include/X11/forms.h)
++XFORMSINC	= -I${X11BASE}/include/X11
++.endif
++CCFLAG		= $(CFLAGS) -DXFORMS86 -DPREFIX=\"$(PREFIX)\" -I$(X11BASE)/include ${XFORMSINC}
++#CC		= gcc
++COMMONLIBS	= -L$(X11BASE)/lib/ -lX11 -lm
++SHAREDLIBS	= -lforms -lXpm
++STATICLIBS	= $(X11BASE)/lib/libxforms.a -lXpm
+ ECHO		= echo
+ RM		= rm
+ RMOPTS		= -f
+@@ -29,9 +32,9 @@
+ INSTALL		= install
+ INSTALLOPTS	= -d 
+ 
+-BINDIR		= /usr/local/bin
+-MANDIR		= /usr/man/man1
+-HELPDIR		= /usr/local/xldlas/help
++BINDIR		= $(PREFIX)/bin
++MANDIR		= $(PREFIX)/man/man1
++HELPDIR		= $(PREFIX)/share/xldlas/help
+ SRCDIR		:= $$PWD
+ USER		:= $$LOGNAME
+ 
+@@ -115,7 +118,7 @@
+ 			so the following commands will probably fail"; fi 
+ 		@$(ECHO)
+ 		@$(CP) $(CPOPTS) xldlas $(BINDIR)
+-		@if test '/usr/local/xldlas' = $(SRCDIR); then \
++		@if test '/usr/local/share/xldlas' = $(SRCDIR); then \
+ 			$(ECHO) Help Files Already in Place; else \
+ 			$(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi
+ install.man:	
diff --git a/math/xldlas/files/patch-ac b/math/xldlas/files/patch-ac
new file mode 100644
index 000000000000..387153842c14
--- /dev/null
+++ b/math/xldlas/files/patch-ac
@@ -0,0 +1,13 @@
+--- xldlas.h.orig	Tue Jul  2 01:22:11 2002
++++ xldlas.h	Tue Jul  2 01:20:07 2002
+@@ -51,8 +51,10 @@
+ 	change the numbers above to suit your tastes (and recompile!).
+ */
+ 
++#ifndef TRUE
+ #define TRUE		1			/* Standard Logic Testing		*/
+ #define	FALSE		0			/* "			"		*/
++#endif
+ #define TYPE_COLS	1			/* User supplied format for imports	*/
+ #define TYPE_ROWS	2			/* "				  "	*/
+ #define	TINY		1.0e-20			/* Need this to calculate Gamma function*/