upgrade to 2.1.1.7

4 files changed, 24 insertions, 126 deletions

diff --git a/graphics/libqglviewer/Makefile b/graphics/libqglviewer/Makefile
index d44eaae90917..6ad5f06bcaac 100644
--- a/graphics/libqglviewer/Makefile
+++ b/graphics/libqglviewer/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libqglviewer
-PORTVERSION=	2.0.0.3
+PORTVERSION=	2.1.1.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/src/
 DISTNAME=	libQGLViewer-${PORTVERSION:R}-${PORTVERSION:E}
@@ -25,12 +25,13 @@ INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/QGLViewer
+PORTDOCS=	*
 
 QMAKE?=		${LOCALBASE}/bin/qmake
 QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
 do-configure:
-	cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
+	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
 		-spec ${QMAKESPEC} QGLViewer.pro PREFIX="${PREFIX}"
 
 .include <bsd.port.mk>
diff --git a/graphics/libqglviewer/distinfo b/graphics/libqglviewer/distinfo
index 980441fe7b8d..a7b98d1ad2c4 100644
--- a/graphics/libqglviewer/distinfo
+++ b/graphics/libqglviewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (libQGLViewer-2.0.0-3.tar.gz) = b1ce6c41ca98e7294932bbc15d7683b6
-SHA256 (libQGLViewer-2.0.0-3.tar.gz) = 018333da19ce5d3d5f36fbb7b9cfc9b52576ec612ce11a7a7fbab03eaa6d100f
-SIZE (libQGLViewer-2.0.0-3.tar.gz) = 1217678
+MD5 (libQGLViewer-2.1.1-7.tar.gz) = 577a802b7bfa847adeea24c33df5af6b
+SHA256 (libQGLViewer-2.1.1-7.tar.gz) = 1987d02a0e478907408f26875bb6f24e3aacfe1a265a8d560b5d4dd48673e586
+SIZE (libQGLViewer-2.1.1-7.tar.gz) = 1882453
diff --git a/graphics/libqglviewer/files/patch-QGLViewer.pro b/graphics/libqglviewer/files/patch-QGLViewer.pro
new file mode 100644
index 000000000000..0d1e9da5e606
--- /dev/null
+++ b/graphics/libqglviewer/files/patch-QGLViewer.pro
@@ -0,0 +1,15 @@
+--- QGLViewer.pro.orig	Thu Dec 22 17:32:51 2005
++++ QGLViewer.pro	Thu Dec 22 17:33:00 2005
+@@ -79,9 +79,9 @@
+ 
+   # Adds a -P option so that "make install" as root creates files owned by root and links are preserved.
+   # This is not a standard option, and it may have to be removed on old Unix flavors.
+-  !hpux {
+-    QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
+-  }
++#  !hpux {
++#    QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
++#  }
+ 
+   # Make much smaller libraries by removing debugging informations
+   QMAKE_CFLAGS_RELEASE -= -g
diff --git a/graphics/libqglviewer/pkg-plist b/graphics/libqglviewer/pkg-plist
index c454eb86fcde..6ffaea328f0b 100644
--- a/graphics/libqglviewer/pkg-plist
+++ b/graphics/libqglviewer/pkg-plist
@@ -3,7 +3,6 @@ include/QGLViewer/config.h
 include/QGLViewer/constraint.h
 include/QGLViewer/domUtils.h
 include/QGLViewer/frame.h
-include/QGLViewer/icon.h
 include/QGLViewer/keyFrameInterpolator.h
 include/QGLViewer/manipulatedCameraFrame.h
 include/QGLViewer/manipulatedFrame.h
@@ -12,126 +11,9 @@ include/QGLViewer/qglviewer.cw
 include/QGLViewer/qglviewer.h
 include/QGLViewer/quaternion.h
 include/QGLViewer/vec.h
+@dirrm include/QGLViewer
 lib/libQGLViewer.prl
 lib/libQGLViewer.so
 lib/libQGLViewer.so.2
-lib/libQGLViewer.so.2.0
-lib/libQGLViewer.so.2.0.0
-%%DOCSDIR%%/changeLog.html
-%%DOCSDIR%%/commented.html
-%%DOCSDIR%%/developer.html
-%%DOCSDIR%%/download.html
-%%DOCSDIR%%/faq.html
-%%DOCSDIR%%/features.html
-%%DOCSDIR%%/images/3dsViewer.jpg
-%%DOCSDIR%%/images/agora.jpg
-%%DOCSDIR%%/images/anaglyph.jpg
-%%DOCSDIR%%/images/animation.jpg
-%%DOCSDIR%%/images/backgroundImage.jpg
-%%DOCSDIR%%/images/callback.jpg
-%%DOCSDIR%%/images/constrainedCamera.jpg
-%%DOCSDIR%%/images/constrainedFrame.jpg
-%%DOCSDIR%%/images/css.png
-%%DOCSDIR%%/images/designerplugin.jpg
-%%DOCSDIR%%/images/drawLight.jpg
-%%DOCSDIR%%/images/dvonn.jpg
-%%DOCSDIR%%/images/eventRecorder.jpg
-%%DOCSDIR%%/images/fastDraw.jpg
-%%DOCSDIR%%/images/frameTransform.jpg
-%%DOCSDIR%%/images/interface.jpg
-%%DOCSDIR%%/images/keyFrames.jpg
-%%DOCSDIR%%/images/keyboardAndMouse.jpg
-%%DOCSDIR%%/images/linux.png
-%%DOCSDIR%%/images/luxo.jpg
-%%DOCSDIR%%/images/mac.png
-%%DOCSDIR%%/images/manipulatedFrame.jpg
-%%DOCSDIR%%/images/mouseGrabber.jpg
-%%DOCSDIR%%/images/multiSelect.jpg
-%%DOCSDIR%%/images/multiView.jpg
-%%DOCSDIR%%/images/openGL.png
-%%DOCSDIR%%/images/qglviewer.ico
-%%DOCSDIR%%/images/qglviewer.icon.png
-%%DOCSDIR%%/images/qglviewer.png
-%%DOCSDIR%%/images/qglviewer.small.png
-%%DOCSDIR%%/images/qt.png
-%%DOCSDIR%%/images/quarto.jpg
-%%DOCSDIR%%/images/screenCoordSystem.jpg
-%%DOCSDIR%%/images/select.jpg
-%%DOCSDIR%%/images/simpleViewer.jpg
-%%DOCSDIR%%/images/sphere.png
-%%DOCSDIR%%/images/stereoViewer.jpg
-%%DOCSDIR%%/images/terrain.jpg
-%%DOCSDIR%%/images/textureViewer.jpg
-%%DOCSDIR%%/images/thumbnail.jpg
-%%DOCSDIR%%/images/windows.png
-%%DOCSDIR%%/images/x3dViewer.jpg
-%%DOCSDIR%%/images/xhtml.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/installUnix.html
-%%DOCSDIR%%/installWindows.html
-%%DOCSDIR%%/intro.html
-%%DOCSDIR%%/keyboard.html
-%%DOCSDIR%%/mouse.html
-%%DOCSDIR%%/qglviewer.css
-%%DOCSDIR%%/refManual/annotated.html
-%%DOCSDIR%%/refManual/classQGLViewer-members.html
-%%DOCSDIR%%/refManual/classQGLViewer.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1AxisPlaneConstraint-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1AxisPlaneConstraint.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Camera-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Camera.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1CameraConstraint-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1CameraConstraint.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Constraint-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Constraint.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Frame-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Frame.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1KeyFrameInterpolator-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1KeyFrameInterpolator.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1LocalConstraint-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1LocalConstraint.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1ManipulatedCameraFrame-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1ManipulatedCameraFrame.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1ManipulatedFrame-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1ManipulatedFrame.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1MouseGrabber-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1MouseGrabber.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Quaternion-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Quaternion.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Vec-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1Vec.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1WorldConstraint-members.html
-%%DOCSDIR%%/refManual/classqglviewer_1_1WorldConstraint.html
-%%DOCSDIR%%/refManual/doxygen.css
-%%DOCSDIR%%/refManual/doxygen.png
-%%DOCSDIR%%/refManual/functions.html
-%%DOCSDIR%%/refManual/functions_0x62.html
-%%DOCSDIR%%/refManual/functions_0x63.html
-%%DOCSDIR%%/refManual/functions_0x64.html
-%%DOCSDIR%%/refManual/functions_0x65.html
-%%DOCSDIR%%/refManual/functions_0x66.html
-%%DOCSDIR%%/refManual/functions_0x67.html
-%%DOCSDIR%%/refManual/functions_0x68.html
-%%DOCSDIR%%/refManual/functions_0x69.html
-%%DOCSDIR%%/refManual/functions_0x6b.html
-%%DOCSDIR%%/refManual/functions_0x6c.html
-%%DOCSDIR%%/refManual/functions_0x6d.html
-%%DOCSDIR%%/refManual/functions_0x6e.html
-%%DOCSDIR%%/refManual/functions_0x6f.html
-%%DOCSDIR%%/refManual/functions_0x70.html
-%%DOCSDIR%%/refManual/functions_0x71.html
-%%DOCSDIR%%/refManual/functions_0x72.html
-%%DOCSDIR%%/refManual/functions_0x73.html
-%%DOCSDIR%%/refManual/functions_0x74.html
-%%DOCSDIR%%/refManual/functions_0x75.html
-%%DOCSDIR%%/refManual/functions_0x76.html
-%%DOCSDIR%%/refManual/functions_0x77.html
-%%DOCSDIR%%/refManual/functions_0x7a.html
-%%DOCSDIR%%/refManual/functions_0x7e.html
-%%DOCSDIR%%/refManual/hierarchy.html
-%%DOCSDIR%%/refManual/index.html
-%%DOCSDIR%%/techFaq.html
-@dirrm %%DOCSDIR%%/refManual
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%
-@dirrm include/QGLViewer
+lib/libQGLViewer.so.2.1
+lib/libQGLViewer.so.2.1.1