Fix building.

PR:		23301
Submitted by:	Mark van Woerkom <3d>

Clean up (mis-)use of $ARCH.

10 files changed, 49 insertions, 203 deletions

diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index df2dc249b261..bd7acdb70c2c 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -13,22 +13,31 @@ DISTNAME=	dx-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		netcdf.1:${PORTSDIR}/math/netcdf \
+		png.4:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		ttf.4:${PORTSDIR}/print/freetype
 
-USE_XLIB=	yes
+USE_AUTOMAKE=	yes
 USE_MESA=	yes
 USE_MOTIF=	yes
 USE_NEWGCC=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -Dfreebsd -I${PREFIX}/include" \
+USE_XLIB=	yes
+AUTOMAKE_ARGS=	-a -i
+CONFIGURE_ENV=	ARCH="" \
+		CFLAGS="${CFLAGS} -I${PREFIX}/include" \
 		CPPFLAGS="-I${PREFIX}/include" \
-		CXXFLAGS="${CFLAGS} -Dfreebsd -I${PREFIX}/include" \
+		CXXFLAGS="${CFLAGS} -I${PREFIX}/include" \
 		LDFLAGS="-L${PREFIX}/lib"
 NO_MTREE=	yes
-PLIST_SUB=	ARCH=${MACHINE_ARCH}
+PLIST_SUB=	ARCH=${OPSYS:L}
 
 post-patch:
-	@find ${WRKSRC} -name Makefile.in | \
-	  xargs ${PERL} -pi -e 's/-lXm /\$${MOTIFLIB} /g'
+	@find ${WRKSRC} -name Makefile.am | \
+	  xargs ${PERL} -pi -e "s;-lXm ;${MOTIFLIB} ;g"
+
+pre-configure:
+	@cd ${WRKSRC} && aclocal
 
 .include <bsd.port.mk>
diff --git a/graphics/opendx/files/patch-acinclude.m4 b/graphics/opendx/files/patch-acinclude.m4
new file mode 100644
index 000000000000..353168abb0ac
--- /dev/null
+++ b/graphics/opendx/files/patch-acinclude.m4
@@ -0,0 +1,22 @@
+--- acinclude.m4.orig	Fri Mar 17 16:32:15 2000
++++ acinclude.m4	Fri Mar 16 17:28:37 2001
+@@ -414,6 +414,10 @@
+ 	    DXEXEC_EXP='-Wl,-export-dynamic'
+ 	    AC_DEFINE_UNQUOTED(DXEXEC_EXP, $DXEXEC_EXP)
+ 	    ;;
++	freebsd)
++	    DXEXEC_EXP='-Wl,-export-dynamic'
++	    AC_DEFINE_UNQUOTED(DXEXEC_EXP, $DXEXEC_EXP)
++	    ;;
+     esac
+     AC_MSG_RESULT(done)
+ ])
+@@ -705,7 +709,7 @@
+ AC_CACHE_VAL(ac_cv_type_$1,
+ [AC_EGREP_CPP(dnl
+ changequote(<<,>>)dnl
+-<<$1[^a-zA-Z_0-9]>>dnl
++<<typedef.*[^a-zA-Z_0-9]$1[\\t ]*;>>dnl
+ changequote([,]), [#include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
diff --git a/graphics/opendx/files/patch-ae b/graphics/opendx/files/patch-ae
index 50e4cf76e652..3fb3e0b6df19 100644
--- a/graphics/opendx/files/patch-ae
+++ b/graphics/opendx/files/patch-ae
@@ -1,14 +1,5 @@
 --- src/exec/dpexec/Makefile.in.orig	Thu Jan  6 21:17:53 2000
 +++ src/exec/dpexec/Makefile.in	Sat Feb 12 15:22:32 2000
-@@ -90,7 +90,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../include -I../libdx -D@ARCH@
-+INCLUDES = -I../../../include -I../libdx
- 
- noinst_LIBRARIES = libDPEXEC.a
- 
 @@ -204,6 +204,7 @@
  	else :; fi
  yuiif.h: yuiif.c
diff --git a/graphics/opendx/files/patch-ah b/graphics/opendx/files/patch-ah
index 64e57265aa48..4f8e6029f656 100644
--- a/graphics/opendx/files/patch-ah
+++ b/graphics/opendx/files/patch-ah
@@ -1,17 +1,15 @@
---- bin/dxworker.in.orig	Sun Dec 19 00:22:09 1999
-+++ bin/dxworker.in	Fri Feb 11 19:21:17 2000
-@@ -22,8 +22,8 @@
- # determine the machine type, and set uiarch, exarch and thisver defaults
- switch ( $thissys )
-   case FreeBSD:
--    set exarch=freebsd
--    set uiarch=freebsd
-+    set exarch=$thismach
-+    set uiarch=$thismach
+--- bin/dxworker.in.orig	Mon Mar 13 23:48:28 2000
++++ bin/dxworker.in	Fri Mar 16 18:53:29 2001
+@@ -25,7 +25,7 @@
+     set exarch=freebsd
+     set uiarch=freebsd
  
-     set remote=/usr/bin/rsh
+-    set remote=/usr/bin/rsh
++    set remote=/usr/bin/ssh
  
-@@ -139,7 +139,7 @@
+     breaksw
+ 
+@@ -140,7 +140,7 @@
  
  # default to running locally, from /usr/lpp/dx  
  set exhost=$thishost
@@ -20,12 +18,3 @@
  set startup=1   # run the startup window by default
  
  
-@@ -1459,7 +1459,7 @@
-   case aviion:
-   case alphax:
-   case linux:
--  case freebsd:
-+  case i386:
-     breaksw
-   
-   default:
diff --git a/graphics/opendx/files/patch-ai b/graphics/opendx/files/patch-ai
deleted file mode 100644
index d4d0cc5fcf51..000000000000
--- a/graphics/opendx/files/patch-ai
+++ /dev/null
@@ -1,110 +0,0 @@
---- src/exec/libdx/Makefile.in.orig	Tue Sep 28 17:51:37 1999
-+++ src/exec/libdx/Makefile.in	Tue Sep 28 17:51:55 1999
-@@ -87,7 +87,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../include  -D@ARCH@
-+INCLUDES = -I../../../include
- 
- dxlibdir = $(prefix)/dx/lib_@ARCH@
- 
---- src/exec/dxmods/Makefile.in.orig	Tue Sep 28 17:52:52 1999
-+++ src/exec/dxmods/Makefile.in	Tue Sep 28 17:53:06 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../include -I../dpexec -I/usr/include -I/usr/local/include -D@ARCH@
-+INCLUDES = -I../../../include -I../dpexec -I/usr/include -I/usr/local/include
- 
- dxmdfdir = $(prefix)/dx/lib
- noinst_LIBRARIES = libDXMODS.a
---- src/exec/hwrender/Makefile.in.orig	Tue Sep 28 17:56:08 1999
-+++ src/exec/hwrender/Makefile.in	Tue Sep 28 17:56:18 1999
-@@ -88,7 +88,7 @@
- 
- SUBDIRS = opengl gl xgl starbase
- 
--INCLUDES = -I../../../include -I../libdx -I/usr/include -I/usr/local/include -D@ARCH@
-+INCLUDES = -I../../../include -I../libdx -I/usr/include -I/usr/local/include
- 
- noinst_LIBRARIES = libHW.a
- 
---- src/exec/dxexec/Makefile.in.orig	Tue Sep 28 17:59:10 1999
-+++ src/exec/dxexec/Makefile.in	Tue Sep 28 17:59:17 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../dpexec -D@ARCH@
-+INCLUDES = -I../dpexec
- 
- EXPARG = @EXPARG@
- 
---- src/uipp/base/Makefile.in.orig	Tue Sep 28 18:01:51 1999
-+++ src/uipp/base/Makefile.in	Tue Sep 28 18:02:01 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../widgets -I../../../include -D@ARCH@
-+INCLUDES = -I../widgets -I../../../include
- 
- noinst_LIBRARIES = libBASE.a
- 
---- src/uipp/dxl/Makefile.in.orig	Tue Sep 28 18:02:57 1999
-+++ src/uipp/dxl/Makefile.in	Tue Sep 28 18:03:11 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../include  -D@ARCH@
-+INCLUDES = -I../../../include
- 
- dxlibdir = $(prefix)/dx/lib_@ARCH@
- 
---- src/uipp/widgets/Makefile.in.orig	Tue Sep 28 18:04:05 1999
-+++ src/uipp/widgets/Makefile.in	Tue Sep 28 18:04:20 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../widgets -D@ARCH@
-+INCLUDES = -I../widgets
- 
- noinst_LIBRARIES = libWIDGETS.a
- 
---- src/uipp/dxui/Makefile.in.orig	Tue Sep 28 18:05:20 1999
-+++ src/uipp/dxui/Makefile.in	Tue Sep 28 18:05:30 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../base -I../../../include -I../dxuilib -D@ARCH@
-+INCLUDES = -I../base -I../../../include -I../dxuilib
- 
- dxbindir = $(prefix)/dx/bin_@ARCH@
- dxbin_PROGRAMS = dxui
---- src/uipp/tutor/Makefile.in.orig	Tue Sep 28 18:07:31 1999
-+++ src/uipp/tutor/Makefile.in	Tue Sep 28 18:07:41 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../include -I../base -D@ARCH@
-+INCLUDES = -I../../../include -I../base
- 
- dxbindir = $(prefix)/dx/bin_@ARCH@
- 
---- src/uipp/mb/Makefile.in.orig	Tue Sep 28 18:08:18 1999
-+++ src/uipp/mb/Makefile.in	Tue Sep 28 18:08:29 1999
-@@ -86,7 +86,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../include -I../base -I../widgets -D@ARCH@
-+INCLUDES = -I../../../include -I../base -I../widgets
- 
- dxbindir = $(prefix)/dx/bin_@ARCH@
- 
diff --git a/graphics/opendx/files/patch-aj b/graphics/opendx/files/patch-aj
deleted file mode 100644
index e76b237b5247..000000000000
--- a/graphics/opendx/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/exec/hwrender/opengl/ORIG/Makefile.in	Fri May 26 22:29:51 2000
-+++ src/exec/hwrender/opengl/Makefile.in	Fri May 26 22:30:49 2000
-@@ -100,7 +100,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../../include -I.. -I../../libdx -I/usr/include -I/usr/local/include -D@ARCH@
-+INCLUDES = -I../../../../include -I.. -I../../libdx -I/usr/include -I/usr/local/include
- 
- noinst_LIBRARIES = libOPENGL.a
- 
diff --git a/graphics/opendx/files/patch-ak b/graphics/opendx/files/patch-ak
deleted file mode 100644
index 6f3131312ebe..000000000000
--- a/graphics/opendx/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/uipp/dxuilib/ORIG/Makefile.in	Fri May 26 22:32:57 2000
-+++ src/uipp/dxuilib/Makefile.in	Fri May 26 22:33:44 2000
-@@ -100,7 +100,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../base -I../../../include -I../dxui -D@ARCH@
-+INCLUDES = -I../base -I../../../include -I../dxui
- 
- noinst_LIBRARIES = libDXUI.a
- 
diff --git a/graphics/opendx/files/patch-al b/graphics/opendx/files/patch-al
deleted file mode 100644
index 450eeed760f2..000000000000
--- a/graphics/opendx/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/uipp/prompter/ORIG/Makefile.in	Fri May 26 22:35:25 2000
-+++ src/uipp/prompter/Makefile.in	Fri May 26 22:36:01 2000
-@@ -100,7 +100,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../base -I../../../include -D@ARCH@
-+INCLUDES = -I../base -I../../../include
- 
- dxbindir = $(prefix)/dx/bin_@ARCH@
- 
diff --git a/graphics/opendx/files/patch-am b/graphics/opendx/files/patch-am
deleted file mode 100644
index 5dcb95f6da8e..000000000000
--- a/graphics/opendx/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/uipp/startup/ORIG/Makefile.in	Fri May 26 22:37:25 2000
-+++ src/uipp/startup/Makefile.in	Fri May 26 22:37:50 2000
-@@ -100,7 +100,7 @@
- YACC = @YACC@
- yakker = @yakker@
- 
--INCLUDES = -I../../../include -I../base -D@ARCH@
-+INCLUDES = -I../../../include -I../base
- 
- dxbindir = $(prefix)/dx/bin_@ARCH@
- 
diff --git a/graphics/opendx/files/patch-an b/graphics/opendx/files/patch-an
deleted file mode 100644
index d17da5bd6b96..000000000000
--- a/graphics/opendx/files/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/uipp/java/ORIG/Makefile.in	Fri May 26 22:38:50 2000
-+++ src/uipp/java/Makefile.in	Fri May 26 22:50:56 2000
-@@ -475,7 +475,7 @@
- 
- DXLink.o:  server.jar
- 	(cd dxsc; $(JAVAH) -d ../server server.DXServer server.DXServerThread)
--	(cd server; $(CC) $(DXABI) -o ../DXLink.o -I../../../../include -c -D@ARCH@ $(JNI_CFLAGS) @JINC@ DXLink.c)
-+	(cd server; $(CC) $(DXABI) -o ../DXLink.o -I../../../../include -c $(JNI_CFLAGS) @JINC@ DXLink.c)
- 
- distclean-local:
- 	rm -rf classes dxsc