7 files changed, 71 insertions, 39 deletions

diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 60c956fb552d..214647f17bef 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    xfpovray
-# Version required:     1.2.4
+# Version required:     1.3
 # Date created:         20 Sep 1997
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/01/09 14:39:20 tg Exp $
+# $Id: Makefile,v 1.2 1998/01/12 08:39:07 tg Exp $
 #
 
-DISTNAME=       xfpovray-1.2.4
+DISTNAME=       xfpovray-1.3
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/software/xfpovray/
+MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/software/xfpovray/v1.3/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.ORG
diff --git a/graphics/xfpovray/distinfo b/graphics/xfpovray/distinfo
index 61bd5b40ac18..43496c7f47d1 100644
--- a/graphics/xfpovray/distinfo
+++ b/graphics/xfpovray/distinfo
@@ -1 +1 @@
-MD5 (xfpovray-1.2.4.tgz) = 4a344d4d39db0ee81fc1207ef1c7eb5b
+MD5 (xfpovray-1.3.tgz) = f6375b73ed02d4cf8e89359e7b52485b
diff --git a/graphics/xfpovray/files/patch-aa b/graphics/xfpovray/files/patch-aa
index 585637ea0a1e..c7effc567b1f 100644
--- a/graphics/xfpovray/files/patch-aa
+++ b/graphics/xfpovray/files/patch-aa
@@ -1,35 +1,16 @@
---- Imakefile.orig	Fri Aug 22 04:39:59 1997
-+++ Imakefile	Tue Sep 30 18:43:06 1997
-@@ -5,7 +5,7 @@
+--- xfpovray.cf.orig	Tue Feb 10 04:46:25 1998
++++ xfpovray.cf	Tue Feb 17 08:37:34 1998
+@@ -3,10 +3,10 @@
+ XCOMM
  
  XCOMM Root installation directory for xfpovray
- 
 -XFROOTDIR = /usr/local
-+XCOMM XFROOTDIR = /usr/local
- 
- 
- 
-@@ -13,10 +13,10 @@
- 
- 
- XCOMM Directory for xfpovray binary
--BINDIR = $(XFROOTDIR)/bin
-+XCOMM BINDIR = $(XFROOTDIR)/bin
- 
- XCOMM Directories for xfpovray help files and icons
--XFLIBDIR = $(XFROOTDIR)/lib/xfpovray
-+XFLIBDIR = $(LIBDIR)/xfpovray
- XFHELPDIR = $(XFLIBDIR)/help
- XFICONDIR = $(XFLIBDIR)/icons
- 
-@@ -69,8 +69,8 @@
- 	$(TOP)/src/xfpovray_icon.xpm \
- 	$(TOP)/src/xfpovray_info.xpm
++XFROOTDIR = ${BINDIR}
  
--EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lm
-- EXTRA_INCLUDES = -I/usr/local/include -I./flx/flx_return_button
-+EXTRA_LIBRARIES = -lxforms -lm
-+ EXTRA_INCLUDES = -I./flx/flx_return_button
-   EXTRA_DEFINES = -DSTARTUP_PIXMAP=\"$(XFICONDIR)\" -DHELP_DIR=\"$(XFHELPDIR)\"
-          LDLIBS = $(EXTRA_LIBRARIES) $(XLIB)
+ XCOMM If your compiler can't find the xforms library 
+-XFORMS_LIBDIR = /usr/local/lib
++XFORMS_LIBDIR = ${X11BASE}/lib
  
+ XCOMM If your compiler can't find the xforms header file 
+-XFORMS_INCDIR = /usr/local/include
++XFORMS_INCDIR = ${X11BASE}/include
diff --git a/graphics/xfpovray/files/patch-ac b/graphics/xfpovray/files/patch-ac
new file mode 100644
index 000000000000..5ce6b31a8477
--- /dev/null
+++ b/graphics/xfpovray/files/patch-ac
@@ -0,0 +1,24 @@
+--- src/Imakefile.orig	Tue Feb 10 04:41:01 1998
++++ src/Imakefile	Tue Feb 17 08:39:41 1998
+@@ -9,8 +9,8 @@
+ XCOMM * * * No need to edit below here * * *
+ 
+ XCOMM Directories for xfpovray, help files, and icons
+-   BINDIR = $(XFROOTDIR)/bin
+- XFLIBDIR = $(XFROOTDIR)/lib/xfpovray
++XCOMM   BINDIR = $(XFROOTDIR)/bin
++ XFLIBDIR = $(LIBDIR)/xfpovray
+ XFHELPDIR = $(XFLIBDIR)/help
+ 
+ SRCS =  $(TOP)/build_pages.c \
+@@ -46,8 +46,8 @@
+ 	$(TOP)/../help/Templates \
+ 	$(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 -lm
++ EXTRA_INCLUDES = -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
new file mode 100644
index 000000000000..1a0a376d5af2
--- /dev/null
+++ b/graphics/xfpovray/files/patch-ad
@@ -0,0 +1,11 @@
+--- flx/Imakefile.orig	Tue Feb 10 04:42:39 1998
++++ flx/Imakefile	Tue Feb 17 08:44:05 1998
+@@ -49,7 +49,7 @@
+         -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
+  EXTRA_INCLUDES = -I$(XFORMS_INCDIR) $(INCS)
+   EXTRA_DEFINES =
+          LDLIBS = $(EXTRA_LIBRARIES) $(XLIB)
diff --git a/graphics/xfpovray/files/patch-ae b/graphics/xfpovray/files/patch-ae
new file mode 100644
index 000000000000..dcf0438627d9
--- /dev/null
+++ b/graphics/xfpovray/files/patch-ae
@@ -0,0 +1,20 @@
+--- src/show_image.c.orig	Sun Feb  8 04:09:16 1998
++++ src/show_image.c	Tue Feb 17 08:47:26 1998
+@@ -15,7 +15,7 @@
+ 
+ 
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ 
+-char *truncate(char *string, char endat)
++char *strtruncate(char *string, char endat)
+ {
+     char *endchar;
+     
+@@ -45,7 +45,7 @@
+     
+ 
+     strcpy(temp, pov.input_file_name);
+-    sprintf(imgfile, "%s", truncate(temp, '.'));
++    sprintf(imgfile, "%s", strtruncate(temp, '.'));
+ 
+     
+     /* 
diff --git a/graphics/xfpovray/pkg-plist b/graphics/xfpovray/pkg-plist
index b6d1b4aff6a1..b2a2c7b9588b 100644
--- a/graphics/xfpovray/pkg-plist
+++ b/graphics/xfpovray/pkg-plist
@@ -13,9 +13,5 @@ lib/X11/xfpovray/help/Options
 lib/X11/xfpovray/help/Table_Of_Contents
 lib/X11/xfpovray/help/Templates
 lib/X11/xfpovray/help/help_topics
-lib/X11/xfpovray/icons/xfpovray.xpm
-lib/X11/xfpovray/icons/xfpovray_icon.xpm
-lib/X11/xfpovray/icons/xfpovray_info.xpm
-@dirrm lib/X11/xfpovray/icons
 @dirrm lib/X11/xfpovray/help
 @dirrm lib/X11/xfpovray