Tidy up ELF and a.out differences including creating ELF symlinks - this

fixes problems noted in recent bulk build.

Change from -fpic to -fPIC as this is the default for all architectures.

3 files changed, 67 insertions, 38 deletions

diff --git a/graphics/mgl/files/patch-sum b/graphics/mgl/files/patch-sum
index bf8e5415c5d..95d05a62aa5 100644
--- a/graphics/mgl/files/patch-sum
+++ b/graphics/mgl/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/12/15 04:12:20 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/05 09:20:54 skrll Exp $
 
-MD5 (patch-aa) = f3a2cde5f6f52ec3b3cc60c72c6d7b3c
+MD5 (patch-aa) = bd185aa82d90f0352998895e2b3faa4e
 MD5 (patch-ab) = 1d739194ec89cc45f159c32bb3564c29
 MD5 (patch-ac) = f0cc3aa6ab2f695e494462b13087c225
 MD5 (patch-ad) = a9d33a12eee4fb1f63ed9d27adf918fc
@@ -9,3 +9,4 @@ MD5 (patch-af) = 3ecec22e87bc414bf469c4b827b98437
 MD5 (patch-ag) = 3c2eb8da5eeca9f499ec011320d720c8
 MD5 (patch-ah) = 45ca383512ad3b919937d60d3fc49ac4
 MD5 (patch-ai) = a10964ca09fbb816a86093ae7361b02e
+MD5 (patch-aj) = aa1ee6651e0c833a29ca8bdcfa22d97d
diff --git a/graphics/mgl/patches/patch-aa b/graphics/mgl/patches/patch-aa
index 8f062385752..7efaa8055b2 100644
--- a/graphics/mgl/patches/patch-aa
+++ b/graphics/mgl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/05 09:20:55 skrll Exp $
 
---- conf/NetBSD.mk.orig	Thu Aug 31 14:06:52 2000
+--- conf/NetBSD.mk.orig	Thu Aug 31 13:06:52 2000
 +++ conf/NetBSD.mk
-@@ -1,33 +1,35 @@
+@@ -1,6 +1,6 @@
  INSTALL=install
  MAKEDEPEND=sh ../conf/mkdep.sh
 -INCS_X11= -I/usr/X11R6/include
@@ -10,63 +10,60 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
  
  # set ELFENV in config.mk
  # a.out env. -> 0
- # ELF env.   -> 1
--ifndef ELFENV
-+#HF#
-+#HF# Force -Wl,-rpath even on a.out
-+#HF#ifndef ELFENV
+@@ -9,29 +9,16 @@
  ELFENV=1
--endif
-+#HF#endif
+ endif
  
- ifeq (${ELFENV},1)
+-ifeq (${ELFENV},1)
 -LIBS_X11= -L/usr/X11R6/lib -Wl,-rpath,/usr/X11R6/lib -lX11
-+LIBS_X11= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -lX11
- else
+-else
 -LIBS_X11= -L/usr/X11R6/lib -lX11
-+LIBS_X11= -L${X11BASE}/lib -lX11
- endif
- 
+-endif
+-
 -INCS_CONS= -I/usr/pkg/include
-+INCS_CONS= -I${PREFIX}/include
- ifeq (${ELFENV},1)
+-ifeq (${ELFENV},1)
 -    LIBS_CONS= -L/usr/pkg/lib -Wl,-rpath /usr/pkg/lib
-+    LIBS_CONS= -L${PREFIX}/lib -Wl,-rpath ${PREFIX}/lib
- else
+-else
 -    LIBS_CONS= -L/usr/pkg/lib
-+    LIBS_CONS= -L${PREFIX}/lib
- endif
+-endif
++LIBS_X11= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -lX11
  
++INCS_CONS= -I${PREFIX}/include
++LIBS_CONS= -L${PREFIX}/lib -Wl,-rpath ${PREFIX}/lib
  ifndef LIBS_IM
 -INCS_IM = -I/usr/pkg/include
-+INCS_IM = -I${PREFIX}/include
-     ifeq (${ELFENV},1)
+-    ifeq (${ELFENV},1)
 -    LIBS_IM = -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -lcanna
-+    LIBS_IM = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lcanna
-     else
+-    else
 -    LIBS_IM = -L/usr/pkg/lib -lcanna
-+    LIBS_IM = -L${PREFIX}/lib -lcanna
-     endif
+-    endif
++INCS_IM = -I${PREFIX}/include
++    LIBS_IM = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lcanna
  endif
  
-@@ -63,16 +65,16 @@
+-SHLIB_CFLAGS=-fpic -DPIC
++SHLIB_CFLAGS=-fPIC -DPIC
+ ifeq (${ELFENV},1)
+     SHLIB_LDFLAGS = -shared
+     SHLIB_LD=${CC}
+@@ -62,17 +49,13 @@
+ 
  ifdef MGL_INSTALLED
  	INCS_MGL = -I${MGL_HEADER_DIR}
- 	ifeq (${ELFENV},1)
+-	ifeq (${ELFENV},1)
 -	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib  -lmgl2
-+	LIBS_MGL = -L${MGL_LIB_DIR} -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lmgl2
- 	else
+-	else
 -	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -L/usr/pkg/lib  -lmgl2	
-+	LIBS_MGL = -L${MGL_LIB_DIR} -L${X11BASE}/lib -L${PREFIX}/lib  -lmgl2	
- 	endif
+-	endif
++	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib  -lmgl2
  else
  	INCS_MGL = -I${SRCDIR}
  	ifeq (${ELFENV},1)
 -	LIBS_MGL = -L${SRCDIR} -rdynamic -L/usr/X11R6/lib -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -lmgl2 
-+	LIBS_MGL = -L${SRCDIR} -rdynamic -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lmgl2 
++	LIBS_MGL = -L${SRCDIR} -rdynamic -L/usr/X11R6/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib -lmgl2 
  	else
 -	LIBS_MGL = -L${SRCDIR} -L/usr/X11R6/lib -L/usr/pkg/lib -lmgl2 
-+	LIBS_MGL = -L${SRCDIR} -L${X11BASE}/lib -L${PREFIX}/lib -lmgl2 
++	LIBS_MGL = -L${SRCDIR} -L/usr/X11R6/lib -L${PREFIX}/lib -lmgl2 
  	endif
  endif
  
diff --git a/graphics/mgl/patches/patch-aj b/graphics/mgl/patches/patch-aj
new file mode 100644
index 00000000000..fb672b93039
--- /dev/null
+++ b/graphics/mgl/patches/patch-aj
@@ -0,0 +1,31 @@
+$NetBSD: patch-aj,v 1.1 2001/03/05 09:20:55 skrll Exp $
+
+--- lib/Makefile.orig	Thu Aug 31 13:06:50 2000
++++ lib/Makefile
+@@ -31,6 +31,8 @@
+ include ../conf/config.mk
+ include ../conf/${OSTYPE}.mk
+ 
++MAJ=2
++MIN=0
+ VER=2.0
+ 
+ all: libmgl2.so.${VER}
+@@ -132,11 +134,17 @@
+ 
+ libmgl2.so.${VER} : ${SOBJS}
+ 	${MGLPIC_LD} ${MGLPIC_LDFLAGS} -o libmgl2.so.${VER} ${SOBJS} ${DEFAULT_LIBS}
++ifeq (${ELFENV}, 1)
+ 	ln -sf libmgl2.so.${VER} libmgl2.so
++	ln -sf libmgl2.so.${VER} libmgl2.so.${MAJ}
++endif
+ 
+ install: mgl2.h mglcol.h libmgl2.so.${VER}  ${MGL_LIB_DIR} ${MGL_HEADER_DIR} ${MGLDIR}
+ 	${INSTALL} -c -s ${PRIV_BIN} libmgl2.so.${VER} ${MGL_LIB_DIR}
++ifeq (${ELFENV}, 1)
+ 	(cd ${MGL_LIB_DIR}; ln -sf libmgl2.so.${VER} libmgl2.so)
++	(cd ${MGL_LIB_DIR}; ln -sf libmgl2.so.${VER} libmgl2.so.${MAJ})
++endif
+ 	${INSTALL} -c ${PRIV_FILE} mgl2.h ${MGL_HEADER_DIR}
+ 	${INSTALL} -c ${PRIV_FILE} mglcol.h ${MGL_HEADER_DIR}
+ #ifdef SERVER_CONS