summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/dasher/Makefile6
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_DasherViewSquare.cpp11
2 files changed, 5 insertions, 12 deletions
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 733f5b4f9..9fc58674e 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,7 +3,7 @@
# Whom: lewiz <purple@lewiz.net>
#
# $FreeBSD$
-# $MCom: ports/accessibility/dasher/Makefile,v 1.54 2007/05/19 21:35:52 marcus Exp $
+# $MCom: ports/accessibility/dasher/Makefile,v 1.55 2007/07/10 03:57:48 marcus Exp $
#
PORTNAME= dasher
@@ -49,5 +49,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|-O2||g'
+.if ${OSVERSION} >= 700042
+ @${REINPLACE_CMD} -e 's|__gnu_cxx::lldiv|lldiv|' \
+ ${WRKSRC}/Src/DasherCore/DasherViewSquare.cpp
+.endif
.include <bsd.port.post.mk>
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_DasherViewSquare.cpp b/accessibility/dasher/files/patch-Src_DasherCore_DasherViewSquare.cpp
deleted file mode 100644
index 13bcc487e..000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_DasherViewSquare.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/DasherCore/DasherViewSquare.cpp.orig 2007-07-09 23:30:03.000000000 -0400
-+++ Src/DasherCore/DasherViewSquare.cpp 2007-07-09 23:30:36.000000000 -0400
-@@ -781,7 +781,7 @@ inline myint CDasherViewSquare::CustomID
- else
- return quot;
- #else
-- lldiv_t res = __gnu_cxx::lldiv(iNumerator, iDenominator);
-+ lldiv_t res = lldiv(iNumerator, iDenominator);
-
- if(res.rem < 0)
- return res.quot - 1;