upgrade to 1.6.4 (1)

drop maintainership

Submitted by:	(1) Tilman Linneweh <tilman@arved.de>

4 files changed, 98 insertions, 72 deletions

diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile
index 61afa1e..3a9046d 100644
--- a/graphics/fractorama/Makefile
+++ b/graphics/fractorama/Makefile
@@ -7,31 +7,32 @@
 #
 
 PORTNAME=	fractorama
-PORTVERSION=	1.5.8
+PORTVERSION=	1.6.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://fractorama.com/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_BISON=	yes
-USE_QT_VER=	2
+USE_QT_VER=	3
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	yes
 MAKE_ENV=	QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}" MOC=${MOC}
 ALL_TARGET=	release
+USE_REINPLACE=	yes
 
 post-patch:
-	@find ${WRKSRC} -name Makefile | xargs \
-		${PERL} -pi -e "s,OPTIMIZE := -O2,OPTIMIZE := ${CFLAGS},g"
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
+		${REINPLACE_CMD} -e "s,OPTIMIZE := -O2,OPTIMIZE := ${CFLAGS},g"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../fractorama.exe ${PREFIX}/bin/fractorama
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/fractorama
-	${CP} -R ${WRKSRC}/../examples/* ${PREFIX}/share/examples/fractorama
-	${MKDIR} ${PREFIX}/share/doc/fractorama
-	${CP} -R ${WRKSRC}/../doc/* ${PREFIX}/share/doc/fractorama
+	${MKDIR} ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/../examples/* ${EXAMPLESDIR}
+	${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/../doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/fractorama/distinfo b/graphics/fractorama/distinfo
index f47f359..f322084 100644
--- a/graphics/fractorama/distinfo
+++ b/graphics/fractorama/distinfo
@@ -1 +1 @@
-MD5 (fractorama.tar.gz) = 9d61880068697cd65196f0e41154c5ff
+MD5 (fractorama.tar.gz) = 299046c798f5d73691cf8bc87ed107a9
diff --git a/graphics/fractorama/files/patch-src::Makefile b/graphics/fractorama/files/patch-src::Makefile
index 044df47..d7197ba 100644
--- a/graphics/fractorama/files/patch-src::Makefile
+++ b/graphics/fractorama/files/patch-src::Makefile
@@ -1,21 +1,21 @@
---- Makefile.orig	Mon Apr  9 02:33:36 2001
-+++ Makefile	Sun Apr 15 16:25:40 2001
-@@ -89,7 +89,7 @@
+--- Makefile.orig	Fri Aug 23 14:07:34 2002
++++ Makefile	Fri Aug 23 14:11:13 2002
+@@ -92,7 +92,7 @@
     endif
  
     QTROOT        := ${UNIX_QTROOT}
 -   PLATFORM_LIBS := -L${QTROOT}/lib -lqt
-+   PLATFORM_LIBS := ${QTCFGLIBS} -lqt2
++   PLATFORM_LIBS := -L${QTROOT}/lib -lqt-mt -pthread
     CPP           := g++
     WARN          := -W -Wall
     LINK          := ${CPP} -o ${EXE}
-@@ -112,8 +113,7 @@
- LIBS := ${FRACT_LIBS} ${PLATFORM_LIBS}
+@@ -121,7 +121,8 @@
  
  OUT     := ${OUT1}${OUT2}
--MOC     := ${QTROOT}/bin/moc
+ MOC     := ${QTROOT}/bin/moc
 -INCLUDE := -I${QTROOT}/include \
-+INCLUDE := ${QTCPPFLAGS} \
++INCLUDE := ${QTCPPFLCAGS} \
++           -I${QTROOT}/include \
             -Ilib/fractal       \
             -Ilib/tiff          \
             -Ilib/persist       \
diff --git a/graphics/fractorama/pkg-plist b/graphics/fractorama/pkg-plist
index 8b231cd..c4967b6 100644
--- a/graphics/fractorama/pkg-plist
+++ b/graphics/fractorama/pkg-plist
@@ -1,4 +1,56 @@
 bin/fractorama
+%%PORTDOCS%%share/doc/fractorama/and.png
+%%PORTDOCS%%share/doc/fractorama/circle1.png
+%%PORTDOCS%%share/doc/fractorama/circle2.png
+%%PORTDOCS%%share/doc/fractorama/coloring_techniques.html
+%%PORTDOCS%%share/doc/fractorama/colors.html
+%%PORTDOCS%%share/doc/fractorama/complex_attributes.html
+%%PORTDOCS%%share/doc/fractorama/complex_functions.html
+%%PORTDOCS%%share/doc/fractorama/cross1.png
+%%PORTDOCS%%share/doc/fractorama/cross2.png
+%%PORTDOCS%%share/doc/fractorama/double_functions.html
+%%PORTDOCS%%share/doc/fractorama/drawbutton.png
+%%PORTDOCS%%share/doc/fractorama/ellipse1.png
+%%PORTDOCS%%share/doc/fractorama/ellipse2.png
+%%PORTDOCS%%share/doc/fractorama/formula.html
+%%PORTDOCS%%share/doc/fractorama/fractal.html
+%%PORTDOCS%%share/doc/fractorama/getting_started.html
+%%PORTDOCS%%share/doc/fractorama/graph1.png
+%%PORTDOCS%%share/doc/fractorama/graph2.png
+%%PORTDOCS%%share/doc/fractorama/index.html
+%%PORTDOCS%%share/doc/fractorama/mapping.html
+%%PORTDOCS%%share/doc/fractorama/not.png
+%%PORTDOCS%%share/doc/fractorama/not_or.png
+%%PORTDOCS%%share/doc/fractorama/not_xor.png
+%%PORTDOCS%%share/doc/fractorama/or.png
+%%PORTDOCS%%share/doc/fractorama/piechart.png
+%%PORTDOCS%%share/doc/fractorama/poly1.png
+%%PORTDOCS%%share/doc/fractorama/poly2.png
+%%PORTDOCS%%share/doc/fractorama/predefined_variables.html
+%%PORTDOCS%%share/doc/fractorama/rect1.png
+%%PORTDOCS%%share/doc/fractorama/rect2.png
+%%PORTDOCS%%share/doc/fractorama/region.html
+%%PORTDOCS%%share/doc/fractorama/region1.png
+%%PORTDOCS%%share/doc/fractorama/region2.png
+%%PORTDOCS%%share/doc/fractorama/rfractal.png
+%%PORTDOCS%%share/doc/fractorama/spoly1.png
+%%PORTDOCS%%share/doc/fractorama/spoly2.png
+%%PORTDOCS%%share/doc/fractorama/start1.png
+%%PORTDOCS%%share/doc/fractorama/start2.png
+%%PORTDOCS%%share/doc/fractorama/statements.html
+%%PORTDOCS%%share/doc/fractorama/taylor.html
+%%PORTDOCS%%share/doc/fractorama/taylor.png
+%%PORTDOCS%%share/doc/fractorama/test01.png
+%%PORTDOCS%%share/doc/fractorama/test02.png
+%%PORTDOCS%%share/doc/fractorama/test03.png
+%%PORTDOCS%%share/doc/fractorama/test04.png
+%%PORTDOCS%%share/doc/fractorama/test05.png
+%%PORTDOCS%%share/doc/fractorama/test06.png
+%%PORTDOCS%%share/doc/fractorama/test07.png
+%%PORTDOCS%%share/doc/fractorama/test08.png
+%%PORTDOCS%%share/doc/fractorama/xor.png
+%%PORTDOCS%%share/doc/fractorama/zoomin.png
+%%PORTDOCS%%share/doc/fractorama/zoominbutton.png
 %%PORTDOCS%%share/examples/fractorama/jfd/awakening.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/bolt.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/bright_idea.jfd
@@ -181,10 +233,36 @@ bin/fractorama
 %%PORTDOCS%%share/examples/fractorama/jfd/z_strange8.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/z_strange.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/z_strange_worm.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/bouquet.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/z_technicolor.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/z_treerings.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/z_well_of_souls.jfd
 %%PORTDOCS%%share/examples/fractorama/jfd/z_z1_z3_series_v1.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/autumn_sunrise.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/black_widow_1.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/black_widow_2.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/black_widow_3.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/black_widow_4.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/corona.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/creeping_vines_1.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/creeping_vines_2.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/dragons_breath.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/fire_ice.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/firestorm.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/gathering.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/habitrail.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/ice_dream.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/medusa.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/medusa_2.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/phantom_garden.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/poltergeist.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/poseidon.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/ringworld_squared.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/solar_flare.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/string_of_pearls.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/symphony_of_minds.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/trilobite.jfd
+%%PORTDOCS%%share/examples/fractorama/jfd/vortex.jfd
 %%PORTDOCS%%share/examples/fractorama/stevef/acg-001.jfd
 %%PORTDOCS%%share/examples/fractorama/stevef/another01.jfd
 %%PORTDOCS%%share/examples/fractorama/stevef/another02.jfd
@@ -320,59 +398,6 @@ bin/fractorama
 %%PORTDOCS%%share/examples/fractorama/stevef/stig-variation-11.jfd
 %%PORTDOCS%%share/examples/fractorama/stevef/stig-variation-12.jfd
 %%PORTDOCS%%share/examples/fractorama/stevef/stig-wood-apples-01.jfd
-%%PORTDOCS%%share/doc/fractorama/and.png
-%%PORTDOCS%%share/doc/fractorama/circle1.png
-%%PORTDOCS%%share/doc/fractorama/circle2.png
-%%PORTDOCS%%share/doc/fractorama/coloring_techniques.html
-%%PORTDOCS%%share/doc/fractorama/colors.html
-%%PORTDOCS%%share/doc/fractorama/complex_attributes.html
-%%PORTDOCS%%share/doc/fractorama/complex_functions.html
-%%PORTDOCS%%share/doc/fractorama/cross1.png
-%%PORTDOCS%%share/doc/fractorama/cross2.png
-%%PORTDOCS%%share/doc/fractorama/double_functions.html
-%%PORTDOCS%%share/doc/fractorama/drawbutton.png
-%%PORTDOCS%%share/doc/fractorama/ellipse1.png
-%%PORTDOCS%%share/doc/fractorama/ellipse2.png
-%%PORTDOCS%%share/doc/fractorama/formula.html
-%%PORTDOCS%%share/doc/fractorama/fractal.html
-%%PORTDOCS%%share/doc/fractorama/getting_started.html
-%%PORTDOCS%%share/doc/fractorama/graph1.png
-%%PORTDOCS%%share/doc/fractorama/graph2.png
-%%PORTDOCS%%share/doc/fractorama/index.html
-%%PORTDOCS%%share/doc/fractorama/mapping.html
-%%PORTDOCS%%share/doc/fractorama/not.png
-%%PORTDOCS%%share/doc/fractorama/not_or.png
-%%PORTDOCS%%share/doc/fractorama/not_xor.png
-%%PORTDOCS%%share/doc/fractorama/or.png
-%%PORTDOCS%%share/doc/fractorama/piechart.png
-%%PORTDOCS%%share/doc/fractorama/poly1.png
-%%PORTDOCS%%share/doc/fractorama/poly2.png
-%%PORTDOCS%%share/doc/fractorama/predefined_variables.html
-%%PORTDOCS%%share/doc/fractorama/rect1.png
-%%PORTDOCS%%share/doc/fractorama/rect2.png
-%%PORTDOCS%%share/doc/fractorama/region.html
-%%PORTDOCS%%share/doc/fractorama/region1.png
-%%PORTDOCS%%share/doc/fractorama/region2.png
-%%PORTDOCS%%share/doc/fractorama/rfractal.png
-%%PORTDOCS%%share/doc/fractorama/spoly1.png
-%%PORTDOCS%%share/doc/fractorama/spoly2.png
-%%PORTDOCS%%share/doc/fractorama/start1.png
-%%PORTDOCS%%share/doc/fractorama/start2.png
-%%PORTDOCS%%share/doc/fractorama/statements.html
-%%PORTDOCS%%share/doc/fractorama/taylor.html
-%%PORTDOCS%%share/doc/fractorama/taylor.png
-%%PORTDOCS%%share/doc/fractorama/test01.png
-%%PORTDOCS%%share/doc/fractorama/test02.png
-%%PORTDOCS%%share/doc/fractorama/test03.png
-%%PORTDOCS%%share/doc/fractorama/test04.png
-%%PORTDOCS%%share/doc/fractorama/test05.png
-%%PORTDOCS%%share/doc/fractorama/test06.png
-%%PORTDOCS%%share/doc/fractorama/test07.png
-%%PORTDOCS%%share/doc/fractorama/test08.png
-%%PORTDOCS%%share/doc/fractorama/xor.png
-%%PORTDOCS%%share/doc/fractorama/zoomin.png
-%%PORTDOCS%%share/doc/fractorama/zoominbutton.png
+%%PORTDOCS%%@dirrm share/doc/fractorama
 %%PORTDOCS%%@dirrm share/examples/fractorama/jfd
 %%PORTDOCS%%@dirrm share/examples/fractorama/stevef
-%%PORTDOCS%%@dirrm share/examples/fractorama
-%%PORTDOCS%%@dirrm share/doc/fractorama