From 71e18d2d7ef5bfd4bae52fa5b4d3139cc7239d5c Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Thu, 11 Oct 2007 21:45:55 +0000 Subject: * Fix build with gcc42 * Minor port updates * Allow the build on amd64 PR: 117089 Submitted by: Dmitry Marakasov (maintainer) --- graphics/sharpconstruct/Makefile | 13 ++----------- graphics/sharpconstruct/files/patch-include-Optimized.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 graphics/sharpconstruct/files/patch-include-Optimized.h diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile index 64d397a39d9e..0ae4f249701a 100644 --- a/graphics/sharpconstruct/Makefile +++ b/graphics/sharpconstruct/Makefile @@ -9,7 +9,7 @@ PORTNAME= sharpconstruct PORTVERSION= 0.11 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= sharp3d MAINTAINER= amdmi3@amdmi3.ru @@ -23,12 +23,9 @@ USE_X_PREFIX= yes USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GCC= 3.4+ MAN1= sharpconstruct.1 -ONLY_FOR_ARCHS= i386 - post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/include/Align.hh @${REINPLACE_CMD} -e 's|"/sharpconstruct|"|' ${WRKSRC}/src/MainWindow.cc @@ -38,10 +35,4 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e '/^DEFS / s|$$| -DDATADIR=\\"${DATADIR}\\"|' -.include - -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - -.include +.include diff --git a/graphics/sharpconstruct/files/patch-include-Optimized.h b/graphics/sharpconstruct/files/patch-include-Optimized.h new file mode 100644 index 000000000000..7d46da59de34 --- /dev/null +++ b/graphics/sharpconstruct/files/patch-include-Optimized.h @@ -0,0 +1,11 @@ +--- include/Optimized.h.orig Sat Dec 31 06:26:59 2005 ++++ include/Optimized.h Thu Oct 11 02:07:55 2007 +@@ -193,7 +193,7 @@ + void Normalize( Point3D& ); + + typedef Point3D Normal3D; +- typedef std::vector< Point3D, Align< Point3D > > Point3DVector; ++ typedef std::vector< Point3D > Point3DVector; + + void Normalize( Point3DVector& ); + /*class Point3DVector -- cgit v1.2.3