3 files changed, 61 insertions, 63 deletions

diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index e770eb3406e8..fd6a34f1a123 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	quesa
-PORTVERSION=	1.6d19
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}lib-${PORTVERSION}
-.ifdef (WITH_QUESA_EXAMPLES)
+.ifdef (WITH_EXAMPLES)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}examples-${PORTVERSION}${EXTRACT_SUFX}
 .endif
@@ -20,32 +18,31 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	ip@doom.homeunix.org
 COMMENT=	High level 3D graphics library compatible with Apple's QuickDraw(TM)
 
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GL=		yes
 USE_X_PREFIX=	yes
-.ifdef (WITH_QUESA_EXAMPLES)
+.ifdef (WITH_EXAMPLES)
 USE_GNOME=	gtk12
 .endif
 INSTALLS_SHLIB=	yes
 
 WRKSRC_EXAMPLES=	${WRKDIR}/${PORTNAME}examples-${PORTVERSION}
 
-.if !defined (WITH_QUESA_EXAMPLES)
-PLIST_SUB=	WITH_QUESA_EXAMPLES="@comment "
+.if !defined (WITH_EXAMPLES)
+PLIST_SUB=	WITH_EXAMPLES="@comment "
 .else
-PLIST_SUB=	WITH_QUESA_EXAMPLES=""
+PLIST_SUB=	WITH_EXAMPLES=""
 .endif
 
-.ifndef (WITH_QUESA_EXAMPLES)
+.ifndef (WITH_EXAMPLES)
 pre-everything::
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Define WITH_QUESA_EXAMPLES=yes to build and install Quesa example programs"
+	@${ECHO_CMD} "Define WITH_EXAMPLES=yes to build and install Quesa example programs"
 	@${ECHO_CMD} ""
 .endif
 
-.ifdef (WITH_QUESA_EXAMPLES)
+.ifdef (WITH_EXAMPLES)
 post-patch:
 	@${REINPLACE_CMD} -e 's|-I/usr/local/include/quesa|-I${WRKSRC}/APIincludes|g; \
 			      s|-L/usr/local/lib|-L${LOCALBASE}/lib -L${WRKSRC}|g; \
@@ -59,7 +56,7 @@ pre-configure:
 		${WRKSRC}/Source/Core/System/E3IOData.c \
 		${WRKSRC}/Source/Core/System/E3View.c
 
-.ifdef (WITH_QUESA_EXAMPLES)
+.ifdef (WITH_EXAMPLES)
 post-configure:
 	cd ${WRKSRC_EXAMPLES} && \
 	${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
diff --git a/graphics/quesa/distinfo b/graphics/quesa/distinfo
index 6e13525252b6..68a512c37a6d 100644
--- a/graphics/quesa/distinfo
+++ b/graphics/quesa/distinfo
@@ -1,6 +1,6 @@
-MD5 (quesalib-1.6d19.tar.gz) = a96cfc5595a0e07c7cbe54582fd1429d
-SHA256 (quesalib-1.6d19.tar.gz) = a9f1d1387950e7508b3e528b45100269e276e9645611f63856dc5e659149a5b6
-SIZE (quesalib-1.6d19.tar.gz) = 1074436
-MD5 (quesaexamples-1.6d19.tar.gz) = c2bc8e799871d394f813e9b8508770ae
-SHA256 (quesaexamples-1.6d19.tar.gz) = 26fa89a81b3b87888b474eaf676c35210ea4f6080b6340f0cf6e37c78451487f
-SIZE (quesaexamples-1.6d19.tar.gz) = 782129
+MD5 (quesa-1.7.tar.gz) = 70b54e77e66eaddaa4b20c4179cb68f9
+SHA256 (quesa-1.7.tar.gz) = 79da268775256f382b997947951b8e7a0911bad5ce9d137d6f2d8db8d0e9f6ab
+SIZE (quesa-1.7.tar.gz) = 1127552
+MD5 (quesaexamples-1.7.tar.gz) = 58a903f13f15d9206e40b5bca07bb08a
+SHA256 (quesaexamples-1.7.tar.gz) = d2ce7640d0b043c52546fb18fe09d72edc1d10628ed331a8ed0fd9018461fd6d
+SIZE (quesaexamples-1.7.tar.gz) = 793835
diff --git a/graphics/quesa/pkg-plist b/graphics/quesa/pkg-plist
index 8e20ef9eabba..6ff3c9a104f0 100644
--- a/graphics/quesa/pkg-plist
+++ b/graphics/quesa/pkg-plist
@@ -1,48 +1,49 @@
-include/quesalib/Quesa.h
-include/quesalib/QuesaCamera.h
-include/quesalib/QuesaController.h
-include/quesalib/QuesaCustomElements.h
-include/quesalib/QuesaDrawContext.h
-include/quesalib/QuesaErrors.h
-include/quesalib/QuesaExtension.h
-include/quesalib/QuesaGeometry.h
-include/quesalib/QuesaGroup.h
-include/quesalib/QuesaIO.h
-include/quesalib/QuesaLight.h
-include/quesalib/QuesaMath.h
-include/quesalib/QuesaMemory.h
-include/quesalib/QuesaPick.h
-include/quesalib/QuesaRenderer.h
-include/quesalib/QuesaSet.h
-include/quesalib/QuesaShader.h
-include/quesalib/QuesaStorage.h
-include/quesalib/QuesaString.h
-include/quesalib/QuesaStyle.h
-include/quesalib/QuesaTransform.h
-include/quesalib/QuesaView.h
-include/quesalib/QuesaViewer.h
+include/quesa/CQ3ObjectRef.h
+include/quesa/Quesa.h
+include/quesa/QuesaCamera.h
+include/quesa/QuesaController.h
+include/quesa/QuesaCustomElements.h
+include/quesa/QuesaDrawContext.h
+include/quesa/QuesaErrors.h
+include/quesa/QuesaExtension.h
+include/quesa/QuesaGeometry.h
+include/quesa/QuesaGroup.h
+include/quesa/QuesaIO.h
+include/quesa/QuesaLight.h
+include/quesa/QuesaMath.h
+include/quesa/QuesaMemory.h
+include/quesa/QuesaPick.h
+include/quesa/QuesaRenderer.h
+include/quesa/QuesaSet.h
+include/quesa/QuesaShader.h
+include/quesa/QuesaStorage.h
+include/quesa/QuesaString.h
+include/quesa/QuesaStyle.h
+include/quesa/QuesaTransform.h
+include/quesa/QuesaView.h
+include/quesa/QuesaViewer.h
 lib/libquesa.a
 lib/libquesa.la
 lib/libquesa.so
 lib/libquesa.so.0
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Images/1.tga
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Images/2.tga
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Images/3.tga
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Images/4.tga
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Images/5.tga
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Images/6.tga
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Images/Quesa.tga
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Models/F15.3dmf
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Models/F18.3dmf
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Models/PodRacer.3dmf
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/Models/QuesaLogo.3dmf
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/bin/cameratest
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/bin/dumpgroup
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/bin/geomtest
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/bin/importtest
-%%WITH_QUESA_EXAMPLES%%%%EXAMPLESDIR%%/bin/lighttest
-%%WITH_QUESA_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/bin
-%%WITH_QUESA_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Models
-%%WITH_QUESA_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Images
-%%WITH_QUESA_EXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm include/quesalib
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/1.tga
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/2.tga
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/3.tga
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/4.tga
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/5.tga
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/6.tga
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/Quesa.tga
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/F15.3dmf
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/F18.3dmf
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/PodRacer.3dmf
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/QuesaLogo.3dmf
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/cameratest
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/dumpgroup
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/geomtest
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/importtest
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/lighttest
+%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/bin
+%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Models
+%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Images
+%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm include/quesa