Date: Thu, 11 Oct 2007 03:08:47 +0400 (MSD) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117089: [MAINTAINER] graphics/sharpconstruct: fix build with gcc42 Message-ID: <20071010230847.3A48A4079@hades.panopticon> Resent-Message-ID: <200710102310.l9ANA1s6073396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117089
>Category: ports
>Synopsis: [MAINTAINER] graphics/sharpconstruct: fix build with gcc42
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 10 23:10:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #0: Tue Jan 16 23:12:21 MSK 2007 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
* Fix build with gcc42
* Minor port updates
* Not sure why was ONLY_FOR_ARCHS there - needs test build on amd64
>How-To-Repeat:
>Fix:
--- sharpconstruct.patch begins here ---
diff -ruN sharpconstruct.orig/Makefile sharpconstruct/Makefile
--- sharpconstruct.orig/Makefile Wed Oct 10 22:01:31 2007
+++ sharpconstruct/Makefile Thu Oct 11 03:06:15 2007
@@ -9,7 +9,7 @@
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_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 @@
@${FIND} ${WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 \
${REINPLACE_CMD} -e '/^DEFS / s|$$| -DDATADIR=\\"${DATADIR}\\"|'
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN sharpconstruct.orig/files/patch-include-Optimized.h sharpconstruct/files/patch-include-Optimized.h
--- sharpconstruct.orig/files/patch-include-Optimized.h Thu Jan 1 03:00:00 1970
+++ sharpconstruct/files/patch-include-Optimized.h Thu Oct 11 02:08:45 2007
@@ -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
--- sharpconstruct.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071010230847.3A48A4079>