- Update to 1.6d19

PR:		ports/76514
Submitted by:	Igor Pokrovsky <ip@doom.homeunix.org> (maintainer)

8 files changed, 63 insertions, 188 deletions

diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index 6c1080e57f11..ca7ccdd5e9e6 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -6,19 +6,22 @@
 #
 
 PORTNAME=	quesa
-PORTVERSION=	1.6d18
+PORTVERSION=	1.6d19
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTNAME=	${PORTNAME}lib-${PORTVERSION}
+.ifdef (WITH_QUESA_EXAMPLES)
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}examples-${PORTVERSION}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	ip@doom.homeunix.org
 COMMENT=	High level 3D graphics library compatible with Apple's QuickDraw(TM)
 
 USE_REINPLACE=	yes
-WANT_AUTOCONF_VER?=	253
-WANT_AUTOMAKE_VER?=	15
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GL=		yes
 USE_X_PREFIX=	yes
 .ifdef (WITH_QUESA_EXAMPLES)
@@ -26,11 +29,9 @@ USE_GNOME=	gtk12
 .endif
 INSTALLS_SHLIB=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Development/Projects/Unix
-
-CSH?=		/bin/csh
+WRKSRC_EXAMPLES=	${WRKDIR}/${PORTNAME}examples-${PORTVERSION}
 
-.if !defined(WITH_QUESA_EXAMPLES)
+.if !defined (WITH_QUESA_EXAMPLES)
 PLIST_SUB=	WITH_QUESA_EXAMPLES="@comment "
 .else
 PLIST_SUB=	WITH_QUESA_EXAMPLES=""
@@ -43,49 +44,32 @@ pre-everything::
 	@${ECHO_CMD} ""
 .endif
 
-pre-patch:
-	@${FIND} ${WRKSRC} -type f -print0 |	\
-	${XARGS} -0 ${REINPLACE_CMD} -e "y/$$(${PRINTF} '\r')/\n/"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%ACLOCAL%%|${ACLOCAL}|g; \
-		      s|%%AUTOMAKE%%|${AUTOMAKE}|g; \
-		      s|%%AUTOMAKE_ENV%%|${AUTOMAKE_ENV}|g; \
-		      s|%%AUTOCONF%%|${AUTOCONF}|g; \
-		      s|%%AUTOCONF_ENV%%|${AUTOCONF_ENV}|g; \
-		      s|%%SETENV%%|${SETENV}|g' \
-		${WRKSRC}/Scripts/buildUnix.sh
 .ifdef (WITH_QUESA_EXAMPLES)
-	@${REINPLACE_CMD} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g' \
-		${WRKSRC}/Makefile.am.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; \
+			      s|prefix = /usr/local/Quesa|prefix = ${EXAMPLESDIR}|' \
+		${WRKSRC_EXAMPLES}/Makefile.in
 .endif
 
 pre-configure:
-	cd ${WRKSRC}/Scripts && \
-	${CSH} ./prepareUnixTree.sh && ${CSH} ./buildUnix.sh
-.ifdef (WITH_QUESA_EXAMPLES)
-	@(cd ${WRKSRC}/Examples && \
-		${SETENV}	CC="${CC}" CXX="${CXX}" \
-				CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-				INSTALL="${INSTALL}" \
-				INSTALL_DATA="${INSTALL_DATA}" \
-				INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-				INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
-.endif
+	@${REINPLACE_CMD} -e 's|-std=c99||g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|isfinite|finite|g' \
+		${WRKSRC}/Source/Core/System/E3IOData.c \
+		${WRKSRC}/Source/Core/System/E3View.c
 
 .ifdef (WITH_QUESA_EXAMPLES)
+post-configure:
+	cd ${WRKSRC_EXAMPLES} && \
+	${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+
 post-build:
-	@(cd ${WRKSRC}/Examples && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-				${MAKE_ARGS} ${ALL_TARGET})
-.endif
+	cd ${WRKSRC_EXAMPLES} && \
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 
-.ifdef (WITH_QUESA_EXAMPLES)
 post-install:
-	@(cd ${WRKSRC}/Examples && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-			${MAKE_ARGS} ${INSTALL_TARGET})
+	cd ${WRKSRC_EXAMPLES} && \
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/quesa/distinfo b/graphics/quesa/distinfo
index 3fc53c4e6c69..dbcdd5de1696 100644
--- a/graphics/quesa/distinfo
+++ b/graphics/quesa/distinfo
@@ -1,2 +1,4 @@
-MD5 (quesa_1.6d18.tar.gz) = 6c6740ef4459e2d6cbde7389a63f61b6
-SIZE (quesa_1.6d18.tar.gz) = 3457691
+MD5 (quesalib-1.6d19.tar.gz) = a96cfc5595a0e07c7cbe54582fd1429d
+SIZE (quesalib-1.6d19.tar.gz) = 1074436
+MD5 (quesaexamples-1.6d19.tar.gz) = c2bc8e799871d394f813e9b8508770ae
+SIZE (quesaexamples-1.6d19.tar.gz) = 782129
diff --git a/graphics/quesa/files/patch-.._.._Source_Platform_Unix_E3UnixPrefix.h b/graphics/quesa/files/patch-.._.._Source_Platform_Unix_E3UnixPrefix.h
deleted file mode 100644
index 17480e3c35e1..000000000000
--- a/graphics/quesa/files/patch-.._.._Source_Platform_Unix_E3UnixPrefix.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../../Source/Platform/Unix/E3UnixPrefix.h.orig	Wed Feb  4 10:52:24 2004
-+++ ../../Source/Platform/Unix/E3UnixPrefix.h	Wed Feb  4 10:52:51 2004
-@@ -44,7 +44,9 @@
- //-----------------------------------------------------------------------------
- // Build constants go here
- 
--
-+#ifdef __FreeBSD__
-+#define isfinite finite
-+#endif
- 
- 
- 
diff --git a/graphics/quesa/files/patch-Makefile.am b/graphics/quesa/files/patch-Makefile.am
deleted file mode 100644
index d60d3173381a..000000000000
--- a/graphics/quesa/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig	Wed Feb  4 08:19:51 2004
-+++ Makefile.am	Wed Feb  4 08:20:09 2004
-@@ -267,6 +267,6 @@
-              ${SRC}${PLATFORM}/E3UnixDrawContext.c       
- 
- 
--libquesa_la_CFLAGS= -std=c99 -DQUESA_OS_UNIX=1 $(WARN) $(QUESAINCLUDES)
-+libquesa_la_CFLAGS= -DQUESA_OS_UNIX=1 $(WARN) $(QUESAINCLUDES)
- libquesa_la_LIBADD= -lm -lc -lX11 -lGL -lGLU
- 
diff --git a/graphics/quesa/files/patch-Makefile.am.examples b/graphics/quesa/files/patch-Makefile.am.examples
deleted file mode 100644
index bf1b45675b60..000000000000
--- a/graphics/quesa/files/patch-Makefile.am.examples
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.am.examples.orig	Wed Feb  4 14:49:13 2004
-+++ Makefile.am.examples	Wed Feb  4 14:51:42 2004
-@@ -2,19 +2,19 @@
- 
- QUT= Qut
- GEOMTEST= GeomTest
--prefix = /usr/local/Quesa
-+prefix = %%EXAMPLESDIR%%
- 
--modelsdir=$(prefix)/Models
-+modelsdir=%%EXAMPLESDIR%%/Models
- 
- quesaexamples_commoncflags= -DQUESA_OS_UNIX=1 $(WARN) $(QUESAINCLUDES) $(GTK_CFLAGS)
--quesaexamples_commonldadd= -L/usr/local/lib -L. -lquesaqut -lquesa -lc -lGL -lGLU $(GTK_LIBS)
-+quesaexamples_commonldadd= -L../$(srcdir) -L. -lquesaqut -lquesa -lc -lGL -lGLU $(GTK_LIBS)
- 
- 
--bin_PROGRAMS= geomtest importtest cameratest dumpgroup lighttest
-+bin_PROGRAMS= geomtest importtest cameratest dumpgroup lighttest
- 
- noinst_LIBRARIES= libquesaqut.a
- 
--QUESAINCLUDES= -I/usr/local/include/quesa \
-+QUESAINCLUDES= -I../$(srcdir)/APIincludes \
- 			-I$(srcdir)/Qut
- 
- WARN= -Wall -Wpointer-arith -Wno-cast-qual -Waggregate-return         \
diff --git a/graphics/quesa/files/patch-Scripts_buildUnix.sh b/graphics/quesa/files/patch-Scripts_buildUnix.sh
deleted file mode 100644
index 0f1638356e3d..000000000000
--- a/graphics/quesa/files/patch-Scripts_buildUnix.sh
+++ /dev/null
@@ -1,58 +0,0 @@
---- Scripts/buildUnix.sh.orig	Wed Feb  4 09:16:35 2004
-+++ Scripts/buildUnix.sh	Wed Feb  4 09:17:32 2004
-@@ -28,11 +28,11 @@
- 
- # create the build system for libquesa
- ######################################
--aclocal
--automake --add-missing
--automake
--autoconf
--./configure
-+%%ACLOCAL%%
-+%%SETENV%% %%AUTOMAKE_ENV%% %%AUTOMAKE%% --add-missing
-+%%SETENV%% %%AUTOMAKE_ENV%% %%AUTOMAKE%% -i
-+%%SETENV%% %%AUTOCONF_ENV%% %%AUTOCONF%%
-+#./configure
- 
- # create the build system for the examples
- ######################################
-@@ -40,27 +40,25 @@
- pushd Examples || exit
- 
- # make sure we can find gtk-config
--PATH=${PATH}:/usr/local/bin
--
--export PATH
-+#setenv PATH ${PATH}:/usr/local/bin
- 
- # make sure we can find gtk.m4
--ACLOCALADDPATHS=
--if test -d /usr/local/share/aclocal; then
-- ACLOCALADDPATHS="${ACLOCALADDPATHS} -I /usr/local/share/aclocal"
--fi
-+#ACLOCALADDPATHS=
-+#if test -d /usr/local/share/aclocal; then
-+# ACLOCALADDPATHS="${ACLOCALADDPATHS} -I /usr/local/share/aclocal"
-+#fi
- 
--aclocal ${ACLOCALADDPATHS}
--automake --add-missing
--automake
--autoconf
--./configure
-+%%ACLOCAL%%
-+%%SETENV%% %%AUTOMAKE_ENV%% %%AUTOMAKE%% --add-missing
-+%%SETENV%% %%AUTOMAKE_ENV%% %%AUTOMAKE%% -i
-+%%SETENV%% %%AUTOCONF_ENV%% %%AUTOCONF%%
-+#./configure
- 
- popd
- 
- # build libquesa
- ######################################
--make
-+#make
- 
- popd
- 
diff --git a/graphics/quesa/files/patch-configure.in b/graphics/quesa/files/patch-configure.in
deleted file mode 100644
index d85fc4d12292..000000000000
--- a/graphics/quesa/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Wed Feb  4 09:49:14 2004
-+++ configure.in	Wed Feb  4 09:49:33 2004
-@@ -2,7 +2,7 @@
- AC_INIT(Quesa,1.6d18,quesa_list@designcommunity.com)
- 
- AC_CONFIG_SRCDIR(Source/Core/Glue/QD3DCamera.c)
--AM_INIT_AUTOMAKE([no-dependencies])
-+AM_INIT_AUTOMAKE(quesa,1.6d18)
- AM_MAINTAINER_MODE
- 
- dnl Checks for programs.
diff --git a/graphics/quesa/pkg-plist b/graphics/quesa/pkg-plist
index e6de00822fe0..d91dbe1ca49c 100644
--- a/graphics/quesa/pkg-plist
+++ b/graphics/quesa/pkg-plist
@@ -1,29 +1,36 @@
-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
+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
 lib/libquesa.a
 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
@@ -35,5 +42,6 @@ lib/libquesa.so.0
 %%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/quesa
+@dirrm include/quesalib