Update gfract to version 0.3. Notable changes include:

- Use GTK2.

- Allow palettes with unlimited number of entries.

- User specified coloring algorithms.

- Palette interpolation.

- Change over to using C++.

- Documentation changes

3 files changed, 38 insertions, 42 deletions

diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 1c168a8fb82..15670b6682c 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:14:50 tv Exp $
+# $NetBSD: Makefile,v 1.17 2004/11/25 16:31:05 ben Exp $
 #
 
-DISTNAME=		gfract-0.21
-PKGREVISION=		4
+DISTNAME=		gfract-0.30
 CATEGORIES=		graphics x11
 MASTER_SITES=		http://www.cs.Helsinki.FI/u/salerma/gfract/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gfract-palettes-0.1.tar.gz
@@ -13,22 +12,19 @@ COMMENT=		Gtk-based fractal program
 
 USE_BUILDLINK3=		yes
 USE_X11=		yes
+USE_GNU_TOOLS+=		make
 ALL_TARGET=		gfract
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+SUBST_CLASSES=		prefix
+SUBST_MESSAGE.prefix=	"Fixing prefix."
+SUBST_STAGE.prefix=	post-extract
+SUBST_FILES.prefix=	main.cpp
+SUBST_SED.prefix=	-e "s,/usr/local,${PREFIX},g"
+
 post-extract:
 	${MV} ${WRKDIR}/monk2\'.map ${WRKDIR}/monk2.map
-	files="main.c";							\
-	cd ${WRKSRC}; for file in $${files}; do				\
-		${MV} $${file} $${file}.fixme;				\
-		${SED} -e "s|/usr/local/|${PREFIX}/|g"			\
-			$${file}.fixme > $${file};			\
-		if [ -x $${file}.fixme ]; then				\
-			${CHMOD} +x $${file};				\
-		fi;							\
-		${RM} $${file}.fixme;					\
-	done
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gfract
@@ -38,6 +34,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gfract ${PREFIX}/bin/
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gfract/distinfo b/graphics/gfract/distinfo
index ebd55126afc..47c0dfbb1d5 100644
--- a/graphics/gfract/distinfo
+++ b/graphics/gfract/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/09/22 00:16:58 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/11/25 16:31:05 ben Exp $
 
-SHA1 (gfract-0.21.tar.gz) = 0d996547359ba5f52e43fdb2b4c4baf2a4773a88
-Size (gfract-0.21.tar.gz) = 27927 bytes
+SHA1 (gfract-0.30.tar.gz) = fb8603fd32fe2aae90c51f0b75efec66411093c2
+Size (gfract-0.30.tar.gz) = 32384 bytes
 SHA1 (gfract-palettes-0.1.tar.gz) = f05e06e6012e1b1526e0c796ca7f6617fca8ab7d
 Size (gfract-palettes-0.1.tar.gz) = 223648 bytes
-SHA1 (patch-aa) = d04a36b152ba2cd511a0ef18730121bf533cf221
+SHA1 (patch-aa) = 5b865c0ce7cf35cd4920ce07f42a5acc1732c3df
diff --git a/graphics/gfract/patches/patch-aa b/graphics/gfract/patches/patch-aa
index 84de134e163..130b79b7c58 100644
--- a/graphics/gfract/patches/patch-aa
+++ b/graphics/gfract/patches/patch-aa
@@ -1,30 +1,31 @@
-$NetBSD: patch-aa,v 1.3 2002/09/22 00:16:59 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2004/11/25 16:31:05 ben Exp $
 
---- Makefile.orig	Fri Feb  9 01:25:57 2001
+--- Makefile.orig	Fri Aug 13 08:23:59 2004
 +++ Makefile
-@@ -1,7 +1,7 @@
--CC=gcc
-+#CC=gcc
- #CFLAGS=-g -Wall
--CFLAGS=-O2 -Wall -Winline
--LIBS=-lpng -lz
-+CFLAGS+=`gtk-config --cflags`
-+LIBS+=`gtk-config --libs` -lpng -lz
+@@ -2,10 +2,10 @@ PROG := gfract
  
- OBJS=main.o fractal.o palette.o globals.o misc.o attr_dlg.o my_png.o \
- pal_rot_dlg.o timer.o
-@@ -9,13 +9,9 @@
- pal_rot_dlg.h timer.h version.h
+ CC := g++
  
- gfract: $(OBJS)
--	$(CC) `gtk-config --cflags` $(CFLAGS) $(OBJS) -o gfract \
--`gtk-config --libs` $(LIBS)
-+	$(CC) $(CFLAGS) $(OBJS) -o gfract $(LIBS)
+-DEFS := -Wall -ansi -pedantic -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATED
++DEFS := -Wall -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATED
+ DEFS := $(shell pkg-config --cflags gtk+-2.0) $(DEFS)
  
- %.o : %.c $(HEADERS)
--	$(CC) `gtk-config --cflags` $(CFLAGS) -c $<
--
--main.o: main.c $(HEADERS) *.xpm
+-CXXFLAGS := $(DEFS) -O2 -fomit-frame-pointer -ffast-math
++CXXFLAGS := $(DEFS)
+ #CXXFLAGS := $(DEFS) -g
+ 
+ LDFLAGS := -lpng -lz
+@@ -17,11 +17,11 @@ HEADERS := $(wildcard *.h *.xpm)
+ 
+ $(PROG): $(OBJS)
+ 	@echo Linking $(PROG)
+-	@$(CC) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $(PROG)
++	@$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $(PROG)
+ 
+ %.o: %.cpp $(HEADERS)
+ 	@echo Compiling $<
+-	@$(CC) $(CXXFLAGS) -c $< -o $@
++	@$(CXX) $(CXXFLAGS) -c $< -o $@
  
  clean:
- 	rm -f gfract $(OBJS)
+ 	rm -f $(PROG) $(OBJS)