From db745590d0bfa768013880dc275528df821d66ef Mon Sep 17 00:00:00 2001
From: krion <krion@FreeBSD.org>
Date: Mon, 3 Nov 2003 19:26:41 +0000
Subject: - Fix build on -current

PR:		58877
Submitted by:	Ports Fury
---
 graphics/qslim/Makefile                           | 10 +-------
 graphics/qslim/files/patch-mixkit::src::MxAsp.cxx | 31 +++++++++++++++++++++++
 2 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 graphics/qslim/files/patch-mixkit::src::MxAsp.cxx

(limited to 'graphics/qslim')

diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index d86774640eca..c7357ff843bc 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -33,15 +33,7 @@ CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include \
 		-I${X11BASE}/include/X11 ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500034
 CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive
-.endif
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
 
 post-extract:
 	@${RM} -f ${WRKSRC}/mixkit/src/getopt.h
@@ -61,4 +53,4 @@ do-install:
 	@${MKDIR} ${PREFIX}/include/mixkit
 	${INSTALL_DATA} ${WRKSRC}/mixkit/src/*.h ${PREFIX}/include/mixkit
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx b/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx
new file mode 100644
index 000000000000..f2e842142240
--- /dev/null
+++ b/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx
@@ -0,0 +1,31 @@
+--- mixkit/src/MxAsp.cxx.orig	Sat Jan 23 06:50:45 1999
++++ mixkit/src/MxAsp.cxx	Mon Nov  3 22:09:45 2003
+@@ -53,8 +53,8 @@
+ }
+ 
+ #define asprint(V)\
+-out<< *as##.##V##_var; \
+-for(i=1; i<size; i++) out << " " << as##.##V##_var[i]
++out<< *as.V##_var; \
++for(i=1; i<size; i++) out << " " << as.V##_var[i]
+ 
+ ostream& MxAspVar::print(ostream& out) const
+ {
+@@ -79,7 +79,7 @@
+ #define defset(V, T) \
+ bool MxAspVar::set_##V(V val, uint i) \
+ {\
+-     if( type==T && i<size ) { as##.##V##_var[i]=val; return true; } \
++     if( type==T && i<size ) { as.V##_var[i]=val; return true; } \
+      else  return false; \
+ }
+ 
+@@ -94,7 +94,7 @@
+ #define defget(V, T) \
+ V *MxAspVar::get_##V(V *out, uint i) \
+ {\
+-     if( type==T && i<size ) { *out = as##.##V##_var[i]; return out; } \
++     if( type==T && i<size ) { *out = as.V##_var[i]; return out; } \
+      else  return NULL; \
+ } 
+ 
-- 
cgit