- Fix build on 5-current

PR:		46419
Submitted by:	Ports Fury

7 files changed, 82 insertions, 37 deletions

diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index e279bcb75c50..b9b35517ff3f 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -7,11 +7,12 @@
 #
 
 PORTNAME=	dynamechs
-PORTVERSION=	4.0p1
+PORTVERSION=	4.0.p1
+PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/p/pre/}
+DISTNAME=	${PORTNAME}_${PORTVERSION:S/.p/pre/}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -23,6 +24,9 @@ MAKE_ENV=	OPENGLINCDIR="${X11BASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS}"
 ALL_TARGET=	freebsd
 
+do-configure:
+	@${CP} -f ${FILESDIR}/make.platform.freebsd ${WRKSRC}/make
+
 do-install:
 .for dir in dm dmu dmGL
 	@${MKDIR} ${PREFIX}/include/${PORTNAME}/${dir}
diff --git a/graphics/dynamechs/files/make.platform.freebsd b/graphics/dynamechs/files/make.platform.freebsd
new file mode 100644
index 000000000000..5e6913655227
--- /dev/null
+++ b/graphics/dynamechs/files/make.platform.freebsd
@@ -0,0 +1,25 @@
+CXXFLAGS += -D_BOOL -c -fPIC -D_POSIX_C_SOURCE=199506L -I/$(OPENGLINCDIR)
+# -pthreads
+DEPENDFLAGS := $(CXXFLAGS)
+
+LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${X11BASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL
+LDGLUT := -lglut
+
+# CXX := g++
+LINKER := $(CXX)
+SHLINKER := $(CXX)
+
+SHLKFLAG := -shared -fPIC
+
+space :=
+OBJNAMEARG := -o $(space)
+EXENAMEARG := -o $(space)
+SHLNAMEARG := -o $(space)
+LINKDIRARG := -L
+LINKLIBARG := -l
+LINKLIBSFX :=
+
+LIBSFX := so
+LIBPFX := lib
+EXESFX := 
+OBJSFX := o
diff --git a/graphics/dynamechs/files/patch-aquarobot::Gait.hpp b/graphics/dynamechs/files/patch-aquarobot::Gait.hpp
new file mode 100644
index 000000000000..b66e98a2082a
--- /dev/null
+++ b/graphics/dynamechs/files/patch-aquarobot::Gait.hpp
@@ -0,0 +1,15 @@
+--- aquarobot/Gait.hpp.orig	Thu Jul 19 08:40:44 2001
++++ aquarobot/Gait.hpp	Sat Dec 21 08:57:01 2002
+@@ -26,10 +26,11 @@
+ #include <windows.h>
+ #endif
+ 
+-#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91))
++#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) || (defined(__GNUC__) && (__GNUC__>=3))
+ #include <iostream>
+ #include <iomanip>
+ #include <fstream>
++using namespace std;
+ #else
+ #include <iostream.h>
+ #include <iomanip.h>
diff --git a/graphics/dynamechs/files/patch-dm::dm.h b/graphics/dynamechs/files/patch-dm::dm.h
new file mode 100644
index 000000000000..49c25777e1b3
--- /dev/null
+++ b/graphics/dynamechs/files/patch-dm::dm.h
@@ -0,0 +1,15 @@
+--- dm/dm.h.orig	Thu Jul 19 08:40:37 2001
++++ dm/dm.h	Sat Dec 21 08:58:14 2002
+@@ -51,10 +51,11 @@
+ // a bunch of hacks to select standard conforming iostream stuff if available
+ // on the platform
+ 
+-#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91))
++#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) || (defined(__GNUC__) && (__GNUC__>=3))
+ #include <iostream>
+ #include <iomanip>
+ #include <fstream>
++using namespace std;
+ #else
+ #include <iostream.h>
+ #include <iomanip.h>
diff --git a/graphics/dynamechs/files/patch-dmGL::dmGL.h b/graphics/dynamechs/files/patch-dmGL::dmGL.h
new file mode 100644
index 000000000000..9b2f70e75559
--- /dev/null
+++ b/graphics/dynamechs/files/patch-dmGL::dmGL.h
@@ -0,0 +1,14 @@
+--- dmGL/dmGL.h.orig	Thu Jul 19 08:40:38 2001
++++ dmGL/dmGL.h	Sat Dec 21 08:54:11 2002
+@@ -44,9 +44,10 @@
+ // a bunch of hacks to select standard conforming iostream stuff if available
+ // on the platform
+ 
+-#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91))
++#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) ||  (defined(__GNUC__) && (__GNUC__>=3))
+ #include <iostream>
+ #include <iomanip>
++using namespace std;
+ #else
+ #include <iostream.h>
+ #include <iomanip.h>
diff --git a/graphics/dynamechs/files/patch-make::make.platform.freebsd b/graphics/dynamechs/files/patch-make::make.platform.freebsd
deleted file mode 100644
index c9dac29d8578..000000000000
--- a/graphics/dynamechs/files/patch-make::make.platform.freebsd
+++ /dev/null
@@ -1,28 +0,0 @@
---- /dev/null	Thu Dec  6 21:05:22 2001
-+++ make/make.platform.freebsd	Thu Dec  6 21:09:26 2001
-@@ -0,0 +1,25 @@
-+CXXFLAGS += -D_BOOL -c -fPIC -D_POSIX_C_SOURCE=199506L -I/$(OPENGLINCDIR)
-+# -pthreads
-+DEPENDFLAGS := $(CXXFLAGS)
-+
-+LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL
-+LDGLUT := -lglut
-+
-+CXX := g++
-+LINKER := g++
-+SHLINKER := g++
-+
-+SHLKFLAG := -shared -fPIC
-+
-+space :=
-+OBJNAMEARG := -o $(space)
-+EXENAMEARG := -o $(space)
-+SHLNAMEARG := -o $(space)
-+LINKDIRARG := -L
-+LINKLIBARG := -l
-+LINKLIBSFX :=
-+
-+LIBSFX := so
-+LIBPFX := lib
-+EXESFX := 
-+OBJSFX := o
diff --git a/graphics/dynamechs/pkg-plist b/graphics/dynamechs/pkg-plist
index 98cb7942408f..f3bb7e7f2d1e 100644
--- a/graphics/dynamechs/pkg-plist
+++ b/graphics/dynamechs/pkg-plist
@@ -29,9 +29,6 @@ include/dynamechs/dm/dmSystem.hpp
 include/dynamechs/dm/dmTime.h
 include/dynamechs/dm/dmTreadmill.hpp
 include/dynamechs/dm/dmZScrewTxLink.hpp
-include/dynamechs/dmu/dmLoadFile.h
-include/dynamechs/dmu/dmu.h
-include/dynamechs/dmu/glLoadModels.h
 include/dynamechs/dmGL/dmGL.h
 include/dynamechs/dmGL/dmGLCamera.hpp
 include/dynamechs/dmGL/dmGLFlyCamera.hpp
@@ -39,10 +36,13 @@ include/dynamechs/dmGL/dmGLMouse.hpp
 include/dynamechs/dmGL/dmGLPolarCamera.hpp
 include/dynamechs/dmGL/dmGLPolarCamera_yup.hpp
 include/dynamechs/dmGL/dmGLPolarCamera_zup.hpp
-@dirrm include/dynamechs/dm
+include/dynamechs/dmu/dmLoadFile.h
+include/dynamechs/dmu/dmu.h
+include/dynamechs/dmu/glLoadModels.h
+lib/libdm.so
+lib/libdmGL.so
+lib/libdmu.so
 @dirrm include/dynamechs/dmu
 @dirrm include/dynamechs/dmGL
+@dirrm include/dynamechs/dm
 @dirrm include/dynamechs
-lib/libdm.so
-lib/libdmu.so
-lib/libdmGL.so