aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/Mesa3/Makefile25
-rw-r--r--graphics/Mesa3/files/patch-aa31
-rw-r--r--graphics/Mesa3/pkg-plist17
-rw-r--r--graphics/mesagl/Makefile25
-rw-r--r--graphics/mesagl/files/patch-aa31
-rw-r--r--graphics/mesagl/pkg-plist17
6 files changed, 112 insertions, 34 deletions
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index 638b2ce9e3e6..d74e86d067c4 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Feb 7 12:02:49 1995
# Whom: hsu
#
-# $Id: Makefile,v 1.26 1998/08/05 09:31:07 asami Exp $
+# $Id: Makefile,v 1.27 1998/08/12 22:52:25 asami Exp $
#
DISTNAME= MesaLib-3.0beta6
@@ -18,25 +18,36 @@ MANUAL_PACKAGE_BUILD= shlib version conflict
WRKSRC= ${WRKDIR}/Mesa-3.0
-ALL_TARGET= freebsd
USE_X_PREFIX= yes
LIBS= libMesaGL libMesaGLU
-SHLIB_VERSION= 14.0
NO_LATEST_LINK= yes
do-install:
.for file in ${LIBS}
${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
+ ${LN} -fs ${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/${file}.so
.endfor
${INSTALL_DATA} ${WRKSRC}/lib/libglut.a ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.3.7 ${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ${PREFIX}/lib
+ ${LN} -fs libglut.so.${GLUT_VERSION} ${PREFIX}/lib/libglut.so
.for file in GL GLU
- @ln -fs ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
- @ln -fs ${PREFIX}/lib/libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
+ @${LN} -fs libMesa${file}.a ${PREFIX}/lib/lib${file}.a
+ @${LN} -fs libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
+ @${LN} -fs libMesa${file}.so ${PREFIX}/lib/lib${file}.so
.endfor
@${MKDIR} ${PREFIX}/include/GL
${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
- ${LDCONFIG} -m ${PREFIX}/lib
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+ALL_TARGET= freebsd-elf
+SHLIB_VERSION= 14
+GLUT_VERSION= 3
+.else
+ALL_TARGET= freebsd
+SHLIB_VERSION= 14.0
+GLUT_VERSION= 3.7
+.endif
diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa
index 63ee39d3d1b4..51e0e0b1d268 100644
--- a/graphics/Mesa3/files/patch-aa
+++ b/graphics/Mesa3/files/patch-aa
@@ -1,10 +1,33 @@
---- Make-config.orig Fri Nov 21 20:05:40 1997
-+++ Make-config Fri Nov 21 20:06:25 1997
-@@ -1,6 +1,6 @@
+--- Make-config.orig Wed Jul 1 07:17:10 1998
++++ Make-config Thu Sep 24 19:23:41 1998
+@@ -1,8 +1,12 @@
# Make-config
-MAJOR=3
+MAJOR=14
MINOR=0
- VERSION=$MAJOR.$MINOR
++.if ${PORTOBJFORMAT} == "elf"
++VERSION=$(MAJOR)
++.else
+ VERSION=$(MAJOR).$(MINOR)
++.endif
+ # Mesa 3-D graphics library
+ # Copyright (C) 1995-1998 Brian Paul
+@@ -237,6 +241,16 @@
+ "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
+ "MAKELIB = ../mklib.freebsd" \
+ "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
++
++freebsd-elf:
++ $(MAKE) $(MFLAGS) targets \
++ "GL_LIB = libMesaGL.a" \
++ "GLU_LIB = libMesaGLU.a" \
++ "GLUT_LIB = libglut.a" \
++ "CC = gcc" \
++ "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
++ "MAKELIB = ../mklib.freebsd" \
++ "XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11"
+
+ freebsd-386:
+ $(MAKE) $(MFLAGS) targets \
diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist
index fbda8c719aa3..37a25b9d5cd2 100644
--- a/graphics/Mesa3/pkg-plist
+++ b/graphics/Mesa3/pkg-plist
@@ -15,15 +15,20 @@ include/GL/svgamesa.h
include/GL/wmesa.h
include/GL/xmesa.h
lib/libGL.a
-lib/libGL.so.14.0
+lib/libGL.so
+lib/libGL.so.14
lib/libGLU.a
-lib/libGLU.so.14.0
+lib/libGLU.so
+lib/libGLU.so.14
lib/libMesaGL.a
-lib/libMesaGL.so.14.0
+lib/libMesaGL.so
+lib/libMesaGL.so.14
lib/libMesaGLU.a
-lib/libMesaGLU.so.14.0
+lib/libMesaGLU.so
+lib/libMesaGLU.so.14
lib/libglut.a
+lib/libglut.so
lib/libglut.so.3.7
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm include/GL
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 638b2ce9e3e6..d74e86d067c4 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Feb 7 12:02:49 1995
# Whom: hsu
#
-# $Id: Makefile,v 1.26 1998/08/05 09:31:07 asami Exp $
+# $Id: Makefile,v 1.27 1998/08/12 22:52:25 asami Exp $
#
DISTNAME= MesaLib-3.0beta6
@@ -18,25 +18,36 @@ MANUAL_PACKAGE_BUILD= shlib version conflict
WRKSRC= ${WRKDIR}/Mesa-3.0
-ALL_TARGET= freebsd
USE_X_PREFIX= yes
LIBS= libMesaGL libMesaGLU
-SHLIB_VERSION= 14.0
NO_LATEST_LINK= yes
do-install:
.for file in ${LIBS}
${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
+ ${LN} -fs ${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/${file}.so
.endfor
${INSTALL_DATA} ${WRKSRC}/lib/libglut.a ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.3.7 ${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ${PREFIX}/lib
+ ${LN} -fs libglut.so.${GLUT_VERSION} ${PREFIX}/lib/libglut.so
.for file in GL GLU
- @ln -fs ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
- @ln -fs ${PREFIX}/lib/libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
+ @${LN} -fs libMesa${file}.a ${PREFIX}/lib/lib${file}.a
+ @${LN} -fs libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
+ @${LN} -fs libMesa${file}.so ${PREFIX}/lib/lib${file}.so
.endfor
@${MKDIR} ${PREFIX}/include/GL
${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
- ${LDCONFIG} -m ${PREFIX}/lib
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+ALL_TARGET= freebsd-elf
+SHLIB_VERSION= 14
+GLUT_VERSION= 3
+.else
+ALL_TARGET= freebsd
+SHLIB_VERSION= 14.0
+GLUT_VERSION= 3.7
+.endif
diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
index 63ee39d3d1b4..51e0e0b1d268 100644
--- a/graphics/mesagl/files/patch-aa
+++ b/graphics/mesagl/files/patch-aa
@@ -1,10 +1,33 @@
---- Make-config.orig Fri Nov 21 20:05:40 1997
-+++ Make-config Fri Nov 21 20:06:25 1997
-@@ -1,6 +1,6 @@
+--- Make-config.orig Wed Jul 1 07:17:10 1998
++++ Make-config Thu Sep 24 19:23:41 1998
+@@ -1,8 +1,12 @@
# Make-config
-MAJOR=3
+MAJOR=14
MINOR=0
- VERSION=$MAJOR.$MINOR
++.if ${PORTOBJFORMAT} == "elf"
++VERSION=$(MAJOR)
++.else
+ VERSION=$(MAJOR).$(MINOR)
++.endif
+ # Mesa 3-D graphics library
+ # Copyright (C) 1995-1998 Brian Paul
+@@ -237,6 +241,16 @@
+ "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
+ "MAKELIB = ../mklib.freebsd" \
+ "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
++
++freebsd-elf:
++ $(MAKE) $(MFLAGS) targets \
++ "GL_LIB = libMesaGL.a" \
++ "GLU_LIB = libMesaGLU.a" \
++ "GLUT_LIB = libglut.a" \
++ "CC = gcc" \
++ "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
++ "MAKELIB = ../mklib.freebsd" \
++ "XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11"
+
+ freebsd-386:
+ $(MAKE) $(MFLAGS) targets \
diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist
index fbda8c719aa3..37a25b9d5cd2 100644
--- a/graphics/mesagl/pkg-plist
+++ b/graphics/mesagl/pkg-plist
@@ -15,15 +15,20 @@ include/GL/svgamesa.h
include/GL/wmesa.h
include/GL/xmesa.h
lib/libGL.a
-lib/libGL.so.14.0
+lib/libGL.so
+lib/libGL.so.14
lib/libGLU.a
-lib/libGLU.so.14.0
+lib/libGLU.so
+lib/libGLU.so.14
lib/libMesaGL.a
-lib/libMesaGL.so.14.0
+lib/libMesaGL.so
+lib/libMesaGL.so.14
lib/libMesaGLU.a
-lib/libMesaGLU.so.14.0
+lib/libMesaGLU.so
+lib/libMesaGLU.so.14
lib/libglut.a
+lib/libglut.so
lib/libglut.so.3.7
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm include/GL
generated by cgit (git 2.34.1) at 2024-11-16 22:52:38 +0800