Prepare for xforms update.

5 files changed, 26 insertions, 17 deletions

diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 0230dd0c446..8f4ba94d025 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	forms.0:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
 
 USE_IMAKE=	yes
diff --git a/graphics/xfpovray/files/patch-aa b/graphics/xfpovray/files/patch-aa
index c7effc567b1..e66a2687975 100644
--- a/graphics/xfpovray/files/patch-aa
+++ b/graphics/xfpovray/files/patch-aa
@@ -1,6 +1,6 @@
---- xfpovray.cf.orig	Tue Feb 10 04:46:25 1998
-+++ xfpovray.cf	Tue Feb 17 08:37:34 1998
-@@ -3,10 +3,10 @@
+--- xfpovray.cf.orig	Mon Feb  9 22:46:25 1998
++++ xfpovray.cf	Mon Jul  1 02:57:04 2002
+@@ -3,10 +3,14 @@
  XCOMM
  
  XCOMM Root installation directory for xfpovray
@@ -13,4 +13,8 @@
  
  XCOMM If your compiler can't find the xforms header file 
 -XFORMS_INCDIR = /usr/local/include
++.if exists(${X11BASE}/include/X11/forms.h)
++XFORMS_INCDIR = ${X11BASE}/include/X11
++.else
 +XFORMS_INCDIR = ${X11BASE}/include
++.endif
diff --git a/graphics/xfpovray/files/patch-ac b/graphics/xfpovray/files/patch-ac
index d24a0bea379..0b1f6ce622d 100644
--- a/graphics/xfpovray/files/patch-ac
+++ b/graphics/xfpovray/files/patch-ac
@@ -1,5 +1,5 @@
---- src/Imakefile.orig	Mon Feb 23 12:40:53 1998
-+++ src/Imakefile	Wed Nov  1 10:01:38 2000
+--- src/Imakefile.orig	Sun Feb 22 22:40:53 1998
++++ src/Imakefile	Mon Jul  1 03:02:20 2002
 @@ -9,8 +9,8 @@
  XCOMM * * * No need to edit below here * * *
  
@@ -16,9 +16,8 @@
  	$(TOP)/../help/help_topics
  			
 -EXTRA_LIBRARIES = -L$(XFORMS_LIBDIR) ../flx/libflx.a -lforms -lm
-- EXTRA_INCLUDES = -I$(XFORMS_INCDIR) -I../flx
-+EXTRA_LIBRARIES = ../flx/libflx.a -lxforms $(XPMLIB) -lm
-+ EXTRA_INCLUDES = -I../flx
++EXTRA_LIBRARIES = ../flx/libflx.a -L$(XFORMS_LIBDIR) -lforms $(XPMLIB) -lm
+  EXTRA_INCLUDES = -I$(XFORMS_INCDIR) -I../flx
    EXTRA_DEFINES = -DHELP_DIR=\"$(XFHELPDIR)\"
           LDLIBS = $(EXTRA_LIBRARIES) $(XLIB)
  
diff --git a/graphics/xfpovray/files/patch-ad b/graphics/xfpovray/files/patch-ad
index 345a5395cd1..6563e6595c4 100644
--- a/graphics/xfpovray/files/patch-ad
+++ b/graphics/xfpovray/files/patch-ad
@@ -1,5 +1,5 @@
---- flx/Imakefile.orig	Sat Feb 21 10:03:08 1998
-+++ flx/Imakefile	Wed Nov  1 20:58:23 2000
+--- flx/Imakefile.orig	Fri Feb 20 20:03:08 1998
++++ flx/Imakefile	Mon Jul  1 02:51:19 2002
 @@ -11,7 +11,7 @@
  XCOMM * * * No need to edit below here * * *
  
@@ -9,12 +9,7 @@
  
  
  
-@@ -51,12 +51,10 @@
-         -I$(TOP)/flx_show_dialog \
-         -I$(TOP)/flx_util
- 
--EXTRA_LIBRARIES = -shared -L$(XFORMS_LIBDIR) -lforms -lm
-+EXTRA_LIBRARIES = -shared -L$(XFORMS_LIBDIR) -lxforms -lm
+@@ -55,8 +55,6 @@
   EXTRA_INCLUDES = -I$(XFORMS_INCDIR) $(INCS)
    EXTRA_DEFINES =
           LDLIBS = $(EXTRA_LIBRARIES) $(XLIB)
diff --git a/graphics/xfpovray/files/patch-af b/graphics/xfpovray/files/patch-af
new file mode 100644
index 00000000000..d9aaa198057
--- /dev/null
+++ b/graphics/xfpovray/files/patch-af
@@ -0,0 +1,11 @@
+--- src/xfpovray.c.orig	Mon Jul  1 03:06:04 2002
++++ src/xfpovray.c	Mon Jul  1 03:06:57 2002
+@@ -47,7 +47,7 @@
+ #include "xfpovray.xpm"
+ 
+ 
+-#if FL_VERSION < MIN_XFORMS_VER || FL_REVISION < MIN_XFORMS_REV
++#if FL_VERSION < MIN_XFORMS_VER || (FL_VERSION == MIN_XFORMS_VER && FL_REVISION < MIN_XFORMS_REV)
+ #error
+ #error CANNOT COMPILE WITH THIS VERSION OF XFORMS.
+ #error PLEASE UPGRADE TO THE LATEST VERSION.