4 files changed, 84 insertions, 53 deletions

diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile
index 77648c4dfba9..fe6a49e9424f 100644
--- a/graphics/maverik/Makefile
+++ b/graphics/maverik/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	maverik
-PORTVERSION=	6.1
+PORTVERSION=	6.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://aig.cs.man.ac.uk/pub/Maverik/
+MASTER_SITES=	http://aig.cs.man.ac.uk/maverik/
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -32,13 +32,16 @@ MANCOMPRESSED=	no
 .if defined(WITH_PNG)
 LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png
 
-CONFIGURE_ARGS+=	--PNGLIBS="${LOCALBASE}/lib -lpng" \
-			--PNGINCL="${LOCALBASE}/include"
+CONFIGURE_ARGS+=	--PNGLIBS="-L${LOCALBASE}/lib -lpng" \
+			--PNGINCL="-I${LOCALBASE}/include"
 .endif
 
 .if defined(HAVE_GTK)
 USE_GTK=	yes
 CONFIGURE_ARGS+=	--GTK
+PLIST_SUB+=	GTK=""
+.else
+PLIST_SUB+=	GTK="@comment "
 .endif
 
 post-extract:
@@ -46,6 +49,8 @@ post-extract:
 
 post-patch:
 	@${PERL} -pi -e "s,%%X11BASE%%,${X11BASE},g ; \
+		s,%%CC%%,${CC},g ; \
+		s,%%CXX%%,${CXX},g ; \
 		s,%%CFLAGS%%,${CFLAGS},g ; \
 		s,%%CXXFLAGS%%,${CXXFLAGS},g ; \
 		s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g ; \
@@ -54,16 +59,23 @@ post-patch:
 	@${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/examples/misc/GTK/Makefile
 
 do-install:
-	${CP} ${WRKSRC}/lib/* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/*.* ${PREFIX}/lib
 	@${MKDIR} ${PREFIX}/include/maverik
-	${CP} ${WRKSRC}/incl/* ${PREFIX}/include/maverik
-	@${CP} ${WRKSRC}/doc/MFS/man3/* ${MAN3PREFIX}/man/man3
-
+	${INSTALL_DATA} ${WRKSRC}/incl/*.* ${PREFIX}/include/maverik
+	${FIND} ${WRKSRC}/doc/MFS/man3 -name '*.3' -exec \
+		${INSTALL_MAN} \{} ${MAN3PREFIX}/man/man3 \;
 .if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
-	@${RM} -rf ${DOCSDIR}/MFS/man3
+	@${MKDIR} ${DOCSDIR}/MFS/html
+	${FIND} ${WRKSRC}/doc/MFS/html -name '*.html' -exec \
+		${INSTALL_DATA} \{} ${DOCSDIR}/MFS/html \;
+	@${MKDIR} ${DOCSDIR}/MFS/pdf
+	${INSTALL_DATA} ${WRKSRC}/doc/MFS/pdf/*.* ${DOCSDIR}/MFS/pdf
+	@${MKDIR} ${DOCSDIR}/MFS/ps
+	${INSTALL_DATA} ${WRKSRC}/doc/MFS/ps/*.* ${DOCSDIR}/MFS/ps
+	@${MKDIR} ${DOCSDIR}/MPG/pdf
+	${INSTALL_DATA} ${WRKSRC}/doc/MPG/pdf/*.* ${DOCSDIR}/MPG/pdf
+	@${MKDIR} ${DOCSDIR}/MPG/ps
+	${INSTALL_DATA} ${WRKSRC}/doc/MPG/ps/*.* ${DOCSDIR}/MPG/ps
 .endif
 
 post-clean:
diff --git a/graphics/maverik/distinfo b/graphics/maverik/distinfo
index 8be84ce14195..f1ccd404b787 100644
--- a/graphics/maverik/distinfo
+++ b/graphics/maverik/distinfo
@@ -1 +1 @@
-MD5 (maverik-6.1.tar.gz) = 01462db09a38d9a6d4a1bbd3edcbee5f
+MD5 (maverik-6.2.tar.gz) = b15b290f5a0c8c6c21a2f5c47ad8be37
diff --git a/graphics/maverik/files/patch-setup b/graphics/maverik/files/patch-setup
index fe06518c08c9..8a36410c638f 100644
--- a/graphics/maverik/files/patch-setup
+++ b/graphics/maverik/files/patch-setup
@@ -1,52 +1,61 @@
---- setup.orig	Thu May 24 17:32:53 2001
-+++ setup	Mon Nov 12 12:03:44 2001
-@@ -244,26 +244,26 @@
+--- setup.orig	Thu Mar 21 02:59:51 2002
++++ setup	Sat Apr 20 10:15:01 2002
+@@ -6,7 +6,7 @@
+ TDMPATH=""
+ MESAPATH=""
+ MESADEFAULT=1
+-XLIBPATH="/usr/X11R6/lib"
++XLIBPATH="%%X11BASE%%/lib"
+ TR=0
+ TRINCL=""
+ TRLIBS=""
+@@ -262,22 +262,22 @@
  FreeBSD)
      if [ $ECH = "1" ] ; then echo A FreeBSD box...; fi
  
 -    CC="gcc"
-+#    CC="gcc"
++    CC="%%CC%%"
      DLLIBS=""
      if [ "$DEBUG" = "1" ] ; then 
          OT="-Wall -ansi -g"
- 	CXXFLAG=`echo -g ${CXXFLAG}`
      else
 -        OT="-Wall -ansi -O2 -finline-functions -fomit-frame-pointer -funroll-loops -ffast-math -march=`uname -m`"
-+#        OT="-Wall -ansi -O2 -finline-functions -fomit-frame-pointer -funroll-loops -ffast-math -march=`uname -m`"
++        OT="%%PTHREAD_CFLAGS%% -Wall -ansi -finline-functions -fomit-frame-pointer -funroll-loops -ffast-math -march=`uname -m`"
      fi
      OS="-DMAV_LINUX -DMAV_FREEBSD" # The Linux defs also work for FreeBSD with a few exceptions
 -    CFLAG=`echo $OS $OT`
 -    LD="ld -shared"
-+    CFLAG=`echo $OS $OT -O -pipe -s -march=pentiumpro`
-+    LD="${CC} -shared"
++    CFLAG=`echo $OS $OT %%CFLAGS%%`
++    LD="${CC} -shared %%PTHREAD_LIBS%%"
      LEX="flex"
 -    YACC="bison -y"
 -    CXX="g++"
--    CXXFLAG=`echo $OS ${CXXFLAG}`
--    if [ "$MESADEFAULT" = "1" ] ; then
--	MESAPATH="/usr/X11R6"
--    fi
--    OPENGLINCL="-I${MESAPATH}/include"
--    OPENGLLIBS="-L${MESAPATH}/lib -lGL -lGLU -L${XLIBPATH} -lX11 -lXext"
+-    CXXFLAG=`echo $OS $OT`
 +    YACC="yacc"
-+#    CXX="g++"
-+    CXXFLAG=`echo $OS ${CXXFLAG}  -O -pipe -s -march=pentiumpro -fmemoize-lookups -fsave-memoized`
-+#    if [ "$MESADEFAULT" = "1" ] ; then
-+#	MESAPATH="/usr/X11R6"
-+#    fi
-+    OPENGLINCL="-I${MESAPATH}/include "
-+    OPENGLLIBS="-L${MESAPATH}/lib -lGL -lGLU -lX11 -lXext -lc_r"
- 
-     if [ $ECH = "1" ] ; then echo Looking for OpenGL include file in ${MESAPATH}/include/GL/gl.h ; fi
++    CXX="%%CXX%%"
++    CXXFLAG=`echo $OS $OT %%CXXFLAGS%%`
+     if [ "$MESADEFAULT" = "1" ] ; then
+-	MESAPATH="/usr/X11R6"
++	MESAPATH="%%X11BASE%%"
+     fi
+     OPENGLINCL="-I${MESAPATH}/include"
+     OPENGLLIBS="-L${MESAPATH}/lib -lGL -lGLU -L${XLIBPATH} -lX11 -lXext"
+@@ -437,18 +437,6 @@
+ fi
  
-@@ -383,8 +383,8 @@
- if [ $GTK = "1" ] ; then
  cat <<EOF >>Makefile
- 	"GTKLIB= ../../lib/libmav_gfxOpenGLGTK${OPT_EXT}.so" \\
--	"GTKINCL= \`gtk-config --cflags\`" \\
--	"GTKLIBS= \`gtk-config --libs | sed 's/-rdynamic//g'\` -lgtkgl" \\
-+	"GTKINCL= \`/usr/X11R6/bin/gtk12-config --cflags\`" \\
-+	"GTKLIBS= \`/usr/X11R6/bin/gtk12-config --libs | sed 's/-rdynamic//g'\` -lgtkgl" \\
+-	"OPENGLINCL= ${OPENGLINCL}" \\
+-	"OPENGLLIBS= ${OPENGLLIBS}"
+-EOF
+-
+-cat <<EOF >>Makefile
+-	make egs \\
+-	MAV_HOME=\`pwd\` \\
+-	"CC= ${CC} ${ABI} ${MIPS} ${OT}" \\
+-	"CXX= ${CXX} ${ABI} ${MIPS} ${OT}" 
+-	make dems \\
+-	MAV_HOME=\`pwd\` \\
+-	"CC= ${CC} ${ABI} ${MIPS} ${OT}" \\
+ 	"OPENGLINCL= ${OPENGLINCL}" \\
+ 	"OPENGLLIBS= ${OPENGLLIBS}"
  EOF
- fi
- 
diff --git a/graphics/maverik/pkg-plist b/graphics/maverik/pkg-plist
index 181f5f43b1b1..133a45805393 100644
--- a/graphics/maverik/pkg-plist
+++ b/graphics/maverik/pkg-plist
@@ -7,18 +7,18 @@ include/maverik/mav_lwo.h
 include/maverik/mav_navigation.h
 include/maverik/mav_objects.h
 include/maverik/mav_sms.h
+include/maverik/mav_sr.h
 include/maverik/mav_tdm.h
 include/maverik/mav_tr.h
 include/maverik/mav_vrad.h
 include/maverik/mav_vrml97.h
 include/maverik/mav_windows.h
 include/maverik/maverik.h
-@dirrm include/maverik
 lib/libmav_avatar.so
 lib/libmav_callbacks.so
 lib/libmav_gfx.so
 lib/libmav_gfxNone.so
-lib/libmav_gfxOpenGLGTK.so
+%%GTK%%lib/libmav_gfxOpenGLGTK.so
 lib/libmav_gfxOpenGLX11.so
 lib/libmav_hud.so
 lib/libmav_kernel.so
@@ -33,7 +33,7 @@ lib/libmav_vrml97.so
 lib/libmav_windows.so
 lib/libmaverik.so
 lib/libmaverikNone.so
-lib/libmaverikOpenGLGTK.so
+%%GTK%%lib/libmaverikOpenGLGTK.so
 lib/libmaverikOpenGLX11.so
 %%PORTDOCS%%share/doc/maverik/MFS/html/MAV_BB.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/MAV_HBB.html
@@ -380,6 +380,8 @@ lib/libmaverikOpenGLX11.so
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_frameFn4Add.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_frameFn4Rmv.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_free.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_getPID.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_getTempDir.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_gfx.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_gfx3DfxBoardSet.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_gfx3DfxModeSet.html
@@ -543,6 +545,7 @@ lib/libmaverikOpenGLX11.so
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_moduleNew.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_mouseDraw.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_mouseGet.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_mouseSet.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_mouseSurfaceParamsSet.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigate.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateForwards.html
@@ -553,6 +556,7 @@ lib/libmaverikOpenGLX11.so
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateRight.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateRightFixedUp.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateRoll.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateRotFixedUp.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateRotRight.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateRotUp.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_navigateTransX.html
@@ -752,7 +756,11 @@ lib/libmaverikOpenGLX11.so
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_vectorSet.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_vectorSub.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_vectorWorldPos.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_viewParamsAnimate.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_viewParamsAnimateToObject.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_viewParamsAnimateToSMS.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_viewParamsFixed.html
+%%PORTDOCS%%share/doc/maverik/MFS/html/mav_viewParamsInterpolate.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_viewParamsPrint.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_windowBackfaceCullGet.html
 %%PORTDOCS%%share/doc/maverik/MFS/html/mav_windowBackfaceCullSet.html
@@ -778,10 +786,12 @@ lib/libmaverikOpenGLX11.so
 %%PORTDOCS%%share/doc/maverik/MFS/ps/mfs.ps
 %%PORTDOCS%%share/doc/maverik/MPG/pdf/mpg.pdf
 %%PORTDOCS%%share/doc/maverik/MPG/ps/mpg.ps
-%%PORTDOCS%%@dirrm share/doc/maverik/MFS/html
-%%PORTDOCS%%@dirrm share/doc/maverik/MFS/pdf
-%%PORTDOCS%%@dirrm share/doc/maverik/MFS/ps
-%%PORTDOCS%%@dirrm share/doc/maverik/MFS
-%%PORTDOCS%%@dirrm share/doc/maverik/MPG/pdf
 %%PORTDOCS%%@dirrm share/doc/maverik/MPG/ps
+%%PORTDOCS%%@dirrm share/doc/maverik/MPG/pdf
 %%PORTDOCS%%@dirrm share/doc/maverik/MPG
+%%PORTDOCS%%@dirrm share/doc/maverik/MFS/ps
+%%PORTDOCS%%@dirrm share/doc/maverik/MFS/pdf
+%%PORTDOCS%%@dirrm share/doc/maverik/MFS/html
+%%PORTDOCS%%@dirrm share/doc/maverik/MFS
+%%PORTDOCS%%@dirrm share/doc/maverik
+@dirrm include/maverik