Added secondary site to MASTER_SITES

Fixed some files to respect X11BASE/CC properly
Switched install path of data files from lib/ to share/
Added WWW: line into pkg/DESCR
PR: 14289
Submitted by: tkato@prontomail.ne.jp

4 files changed, 205 insertions, 184 deletions

diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index 4b74b5e5ff5a..cae5de670d44 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -1,15 +1,16 @@
-# New ports collection makefile for:    xfractint
-# Version required:     3.10
-# Date created:         7 Sept 1995
-# Whom:                 cacho@mexicano.gdl.iteso.mx
+# New ports collection makefile for:	xfractint
+# Version required:	3.10
+# Date created:		7 Sept 1995
+# Whom:			cacho@mexicano.gdl.iteso.mx
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xfrac310
+DISTNAME=	xfrac310
 PKGNAME=	xfractint-3.10
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.phoenix.net/pub/USERS/twegner/
+MASTER_SITES=	ftp://ftp.phoenix.net/pub/USERS/twegner/ \
+		http://spanky.triumf.ca/pub/fractals/programs/unix/
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/graphics/xfractint/files/patch-aa b/graphics/xfractint/files/patch-aa
index 85a4c8345df1..fc842b80f84d 100644
--- a/graphics/xfractint/files/patch-aa
+++ b/graphics/xfractint/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.orig	Sat Sep 11 20:32:16 1999
-+++ Makefile	Fri Oct  8 18:18:25 1999
+--- Makefile.orig	Sun Sep 12 10:32:16 1999
++++ Makefile	Tue Oct 12 20:41:38 1999
 @@ -2,11 +2,11 @@
  # SRCDIR should be a path to the directory that will hold fractint.hlp
  # You will have to copy fractint.hlp to SRCDIR and make it world readable.
  # SRCDIR should also hold the .par, .frm, etc. files
 -SRCDIR =  /usr/src/xfractint
-+SRCDIR =  ${PREFIX}/lib/fractint
++SRCDIR =  ${PREFIX}/share/fractint
  # BINDIR is where you put your X11 binaries
 -BINDIR = /usr/X11R6/bin
 +BINDIR = ${PREFIX}/bin
@@ -24,6 +24,15 @@
  
  # Gcc is often the only compiler that works for this
  # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE
+@@ -60,7 +60,7 @@
+ # For Sun Solaris 2.x w/SparcCompilerC (cc), use CC = cc.
+ # For Sun Solaris 2.x w/GNU gcc, use CC = gcc
+ #CC = gcc
+-CC = cc
++CC ?= cc
+ 
+ # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap
+ # For AIX or OSF/1, add -lbsd
 @@ -68,8 +68,8 @@
  # For Apollo, change -lX11 to -L/usr/X11/libX11
  # For Solaris, add -L/usr/openwin/lib
@@ -31,7 +40,7 @@
 -LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap
 -#LIBS = -L/usr/X11R6/lib -lX11 -lm -lcurses -ltermcap
 +#LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap
-+LIBS = -L/usr/X11R6/lib -lX11 -lm -lcurses -ltermcap
++LIBS = -L${X11BASE}/lib -lX11 -lm -lcurses -ltermcap
  #LIBS = -lX11 -lm -lcurses -ltermcap
  
  # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd.
@@ -44,16 +53,25 @@
  xfractint: fractint.hlp .WAIT $(OBJS)
  	$(CC) -o xfractint $(CFLAGS) $(OBJS) $(LIBS)
  #	strip xfractint
-@@ -183,6 +185,12 @@
- 	cp xfractint $(BINDIR)/xfractint
- 	strip $(BINDIR)/xfractint
- 	chmod a+x $(BINDIR)/xfractint
+@@ -180,13 +182,14 @@
+ 	rm -f $(OBJS) $(HOBJS) fractint.doc fractint.hlp hc xfractint helpdefs.h
+ 
+ install: xfractint fractint.hlp
+-	cp xfractint $(BINDIR)/xfractint
+-	strip $(BINDIR)/xfractint
+-	chmod a+x $(BINDIR)/xfractint
+-	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR)
+-	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
+-	cp xfractint.man $(MANDIR)/xfractint.1
+-	chmod a+r $(MANDIR)/xfractint.1
++	${BSD_INSTALL_PROGRAM} xfractint $(BINDIR)/xfractint
 +	if [ ! -d $(SRCDIR) ]; then \
 +		echo "Making $(SRCDIR)"; \
-+		mkdir $(SRCDIR); \
-+		chmod 755 $(SRCDIR); \
++		${INSTALL} -d -m 555 $(SRCDIR); \
 +		else true; \
 +	fi;
- 	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR)
- 	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
- 	cp xfractint.man $(MANDIR)/xfractint.1
++	${BSD_INSTALL_DATA} fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR)
++	${BSD_INSTALL_MAN} xfractint.man $(MANDIR)/xfractint.1
+ 
+ fractint.hlp: hc $(HELP)
+ 	./hc /c
diff --git a/graphics/xfractint/pkg-descr b/graphics/xfractint/pkg-descr
index 4f3a7496296f..6c4a4f2f34fc 100644
--- a/graphics/xfractint/pkg-descr
+++ b/graphics/xfractint/pkg-descr
@@ -4,3 +4,5 @@ Fractint is an IBM PC program to generate fractals, and was written by
 the Stone Soup Group.
 
 The unix port was done by Ken Shirriff  (shirriff@Sprite.Berkeley.EDU)
+
+WWW: http://spanky.triumf.ca/www/fractint/xfractint_port.html
diff --git a/graphics/xfractint/pkg-plist b/graphics/xfractint/pkg-plist
index 54cea555aacc..eae7f1de1612 100644
--- a/graphics/xfractint/pkg-plist
+++ b/graphics/xfractint/pkg-plist
@@ -1,166 +1,166 @@
 bin/xfractint
-lib/fractint/Carlson1.map
-lib/fractint/Digiorg1.map
-lib/fractint/Digiorg2.map
-lib/fractint/Gallet01.map
-lib/fractint/Gallet02.map
-lib/fractint/Gallet03.map
-lib/fractint/Gallet04.map
-lib/fractint/Gallet05.map
-lib/fractint/Gallet06.map
-lib/fractint/Gallet07.map
-lib/fractint/Gallet08.map
-lib/fractint/Gallet09.map
-lib/fractint/Gallet10.map
-lib/fractint/Gallet11.map
-lib/fractint/Gallet12.map
-lib/fractint/Gallet13.map
-lib/fractint/Gallet14.map
-lib/fractint/Gallet15.map
-lib/fractint/Gallet16.map
-lib/fractint/Gallet17.map
-lib/fractint/Gallet18.map
-lib/fractint/Lindaa01.map
-lib/fractint/Lindaa02.map
-lib/fractint/Lindaa03.map
-lib/fractint/Lindaa04.map
-lib/fractint/Lindaa05.map
-lib/fractint/Lindaa06.map
-lib/fractint/Lindaa07.map
-lib/fractint/Lindaa08.map
-lib/fractint/Lindaa09.map
-lib/fractint/Lindaa10.map
-lib/fractint/Lindaa11.map
-lib/fractint/Lindaa12.map
-lib/fractint/Lindaa14.map
-lib/fractint/Lindaa15.map
-lib/fractint/Lindaa16.map
-lib/fractint/Lindaa17.map
-lib/fractint/Morgan1.map
-lib/fractint/Morgan2.map
-lib/fractint/Morgan3.map
-lib/fractint/Morgen3.map
-lib/fractint/Skydye01.map
-lib/fractint/Skydye02.map
-lib/fractint/Skydye03.map
-lib/fractint/Skydye04.map
-lib/fractint/Skydye05.map
-lib/fractint/Skydye06.map
-lib/fractint/Skydye07.map
-lib/fractint/Skydye08.map
-lib/fractint/Skydye09.map
-lib/fractint/Skydye10.map
-lib/fractint/Skydye11.map
-lib/fractint/Skydye12.map
-lib/fractint/Wizzl011.map
-lib/fractint/Wizzl012.map
-lib/fractint/Wizzl013.map
-lib/fractint/Wizzl014.map
-lib/fractint/Wizzl015.map
-lib/fractint/Wizzl016.map
-lib/fractint/Wizzl017.map
-lib/fractint/Wizzl018.map
-lib/fractint/Wizzl019.map
-lib/fractint/Wizzl020.map
-lib/fractint/altern.map
-lib/fractint/blues.map
-lib/fractint/bud2.map
-lib/fractint/bud3.map
-lib/fractint/bud4.map
-lib/fractint/bud5.map
-lib/fractint/bud6.map
-lib/fractint/bud7.map
-lib/fractint/cellular.par
-lib/fractint/chroma.map
-lib/fractint/damien1.map
-lib/fractint/damien2.map
-lib/fractint/damien3.map
-lib/fractint/damien4.map
-lib/fractint/damien5.map
-lib/fractint/default.map
-lib/fractint/demo.par
-lib/fractint/droz10.map
-lib/fractint/droz11.map
-lib/fractint/droz12.map
-lib/fractint/droz13.map
-lib/fractint/droz14.map
-lib/fractint/droz15.map
-lib/fractint/droz21.map
-lib/fractint/droz22.map
-lib/fractint/droz23.map
-lib/fractint/droz28.map
-lib/fractint/droz31.map
-lib/fractint/droz33.map
-lib/fractint/droz34.map
-lib/fractint/droz35.map
-lib/fractint/droz36.map
-lib/fractint/droz38.map
-lib/fractint/droz39.map
-lib/fractint/droz40.map
-lib/fractint/droz44.map
-lib/fractint/droz46.map
-lib/fractint/droz49.map
-lib/fractint/droz52.map
-lib/fractint/droz54.map
-lib/fractint/droz56.map
-lib/fractint/droz60.map
-lib/fractint/droz62.map
-lib/fractint/droz8.map
-lib/fractint/drozdis1.map
-lib/fractint/firestrm.map
-lib/fractint/fract18.par
-lib/fractint/fract19.par
-lib/fractint/fract200.frm
-lib/fractint/fract200.par
-lib/fractint/fractint.frm
-lib/fractint/fractint.hlp
-lib/fractint/fractint.ifs
-lib/fractint/fractint.l
-lib/fractint/fractint.par
-lib/fractint/froth3.map
-lib/fractint/froth316.map
-lib/fractint/froth6.map
-lib/fractint/froth616.map
-lib/fractint/gamma1.map
-lib/fractint/gamma2.map
-lib/fractint/glasses1.map
-lib/fractint/glasses2.map
-lib/fractint/goodega.map
-lib/fractint/green.map
-lib/fractint/grey.map
-lib/fractint/grid.map
-lib/fractint/headache.map
-lib/fractint/icons.par
-lib/fractint/landscap.map
-lib/fractint/lkmtch00.map
-lib/fractint/lkmtch01.map
-lib/fractint/lkmtch02.map
-lib/fractint/lkmtch03.map
-lib/fractint/lkmtch04.map
-lib/fractint/lkmtch05.map
-lib/fractint/lkmtch06.map
-lib/fractint/lkmtch07.map
-lib/fractint/lkmtch08.map
-lib/fractint/lkmtch09.map
-lib/fractint/lkmtch10.map
-lib/fractint/lkmtch11.map
-lib/fractint/lkmtch12.map
-lib/fractint/lkmtch13.map
-lib/fractint/lkmtch14.map
-lib/fractint/lkmtch15.map
-lib/fractint/lkmtch16.map
-lib/fractint/lkmtch17.map
-lib/fractint/lkmtch18.map
-lib/fractint/lkmtch19.map
-lib/fractint/lyapunov.map
-lib/fractint/lyapunov.par
-lib/fractint/music.par
-lib/fractint/neon.map
-lib/fractint/paintjet.map
-lib/fractint/penrose.l
-lib/fractint/phoenix.par
-lib/fractint/royal.map
-lib/fractint/tiling.l
-lib/fractint/topo.map
-lib/fractint/volcano.map
-@dirrm lib/fractint
+share/fractint/Carlson1.map
+share/fractint/Digiorg1.map
+share/fractint/Digiorg2.map
+share/fractint/Gallet01.map
+share/fractint/Gallet02.map
+share/fractint/Gallet03.map
+share/fractint/Gallet04.map
+share/fractint/Gallet05.map
+share/fractint/Gallet06.map
+share/fractint/Gallet07.map
+share/fractint/Gallet08.map
+share/fractint/Gallet09.map
+share/fractint/Gallet10.map
+share/fractint/Gallet11.map
+share/fractint/Gallet12.map
+share/fractint/Gallet13.map
+share/fractint/Gallet14.map
+share/fractint/Gallet15.map
+share/fractint/Gallet16.map
+share/fractint/Gallet17.map
+share/fractint/Gallet18.map
+share/fractint/Lindaa01.map
+share/fractint/Lindaa02.map
+share/fractint/Lindaa03.map
+share/fractint/Lindaa04.map
+share/fractint/Lindaa05.map
+share/fractint/Lindaa06.map
+share/fractint/Lindaa07.map
+share/fractint/Lindaa08.map
+share/fractint/Lindaa09.map
+share/fractint/Lindaa10.map
+share/fractint/Lindaa11.map
+share/fractint/Lindaa12.map
+share/fractint/Lindaa14.map
+share/fractint/Lindaa15.map
+share/fractint/Lindaa16.map
+share/fractint/Lindaa17.map
+share/fractint/Morgan1.map
+share/fractint/Morgan2.map
+share/fractint/Morgan3.map
+share/fractint/Morgen3.map
+share/fractint/Skydye01.map
+share/fractint/Skydye02.map
+share/fractint/Skydye03.map
+share/fractint/Skydye04.map
+share/fractint/Skydye05.map
+share/fractint/Skydye06.map
+share/fractint/Skydye07.map
+share/fractint/Skydye08.map
+share/fractint/Skydye09.map
+share/fractint/Skydye10.map
+share/fractint/Skydye11.map
+share/fractint/Skydye12.map
+share/fractint/Wizzl011.map
+share/fractint/Wizzl012.map
+share/fractint/Wizzl013.map
+share/fractint/Wizzl014.map
+share/fractint/Wizzl015.map
+share/fractint/Wizzl016.map
+share/fractint/Wizzl017.map
+share/fractint/Wizzl018.map
+share/fractint/Wizzl019.map
+share/fractint/Wizzl020.map
+share/fractint/altern.map
+share/fractint/blues.map
+share/fractint/bud2.map
+share/fractint/bud3.map
+share/fractint/bud4.map
+share/fractint/bud5.map
+share/fractint/bud6.map
+share/fractint/bud7.map
+share/fractint/cellular.par
+share/fractint/chroma.map
+share/fractint/damien1.map
+share/fractint/damien2.map
+share/fractint/damien3.map
+share/fractint/damien4.map
+share/fractint/damien5.map
+share/fractint/default.map
+share/fractint/demo.par
+share/fractint/droz10.map
+share/fractint/droz11.map
+share/fractint/droz12.map
+share/fractint/droz13.map
+share/fractint/droz14.map
+share/fractint/droz15.map
+share/fractint/droz21.map
+share/fractint/droz22.map
+share/fractint/droz23.map
+share/fractint/droz28.map
+share/fractint/droz31.map
+share/fractint/droz33.map
+share/fractint/droz34.map
+share/fractint/droz35.map
+share/fractint/droz36.map
+share/fractint/droz38.map
+share/fractint/droz39.map
+share/fractint/droz40.map
+share/fractint/droz44.map
+share/fractint/droz46.map
+share/fractint/droz49.map
+share/fractint/droz52.map
+share/fractint/droz54.map
+share/fractint/droz56.map
+share/fractint/droz60.map
+share/fractint/droz62.map
+share/fractint/droz8.map
+share/fractint/drozdis1.map
+share/fractint/firestrm.map
+share/fractint/fract18.par
+share/fractint/fract19.par
+share/fractint/fract200.frm
+share/fractint/fract200.par
+share/fractint/fractint.frm
+share/fractint/fractint.hlp
+share/fractint/fractint.ifs
+share/fractint/fractint.l
+share/fractint/fractint.par
+share/fractint/froth3.map
+share/fractint/froth316.map
+share/fractint/froth6.map
+share/fractint/froth616.map
+share/fractint/gamma1.map
+share/fractint/gamma2.map
+share/fractint/glasses1.map
+share/fractint/glasses2.map
+share/fractint/goodega.map
+share/fractint/green.map
+share/fractint/grey.map
+share/fractint/grid.map
+share/fractint/headache.map
+share/fractint/icons.par
+share/fractint/landscap.map
+share/fractint/lkmtch00.map
+share/fractint/lkmtch01.map
+share/fractint/lkmtch02.map
+share/fractint/lkmtch03.map
+share/fractint/lkmtch04.map
+share/fractint/lkmtch05.map
+share/fractint/lkmtch06.map
+share/fractint/lkmtch07.map
+share/fractint/lkmtch08.map
+share/fractint/lkmtch09.map
+share/fractint/lkmtch10.map
+share/fractint/lkmtch11.map
+share/fractint/lkmtch12.map
+share/fractint/lkmtch13.map
+share/fractint/lkmtch14.map
+share/fractint/lkmtch15.map
+share/fractint/lkmtch16.map
+share/fractint/lkmtch17.map
+share/fractint/lkmtch18.map
+share/fractint/lkmtch19.map
+share/fractint/lyapunov.map
+share/fractint/lyapunov.par
+share/fractint/music.par
+share/fractint/neon.map
+share/fractint/paintjet.map
+share/fractint/penrose.l
+share/fractint/phoenix.par
+share/fractint/royal.map
+share/fractint/tiling.l
+share/fractint/topo.map
+share/fractint/volcano.map
+@dirrm share/fractint