summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2005-02-18 21:15:26 +0000
committernetchild <netchild@FreeBSD.org>2005-02-18 21:15:26 +0000
commitda7b25d8caad8eb9b5756632cea1c0fa88eea3fc (patch)
tree74e609adf7c64532b1354e66d7c45875286f8df7 /graphics
parent1056398796c8322f0b70cf29473acd1cab64ca42 (diff)
downloadFreeBSD-ports-da7b25d8caad8eb9b5756632cea1c0fa88eea3fc.zip
FreeBSD-ports-da7b25d8caad8eb9b5756632cea1c0fa88eea3fc.tar.gz
Don't install (ln -s) libGL.so and libGLU.so, they get already installed
by some other port. We lose the ability to _compile_ linux programs with Mesa3 support by specifying "-lGL -lGLU", but someone who needs to do this can use "-lMesaGL -lMesaGLU" instead (or come up with a better solution). Noticed by: pointyhat
Diffstat (limited to 'graphics')
-rw-r--r--graphics/linux_mesa3/Makefile3
-rw-r--r--graphics/linux_mesa3/pkg-plist2
2 files changed, 1 insertions, 4 deletions
diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile
index 029870d..dce4508 100644
--- a/graphics/linux_mesa3/Makefile
+++ b/graphics/linux_mesa3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mesa
PORTVERSION= 3.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics linux
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
@@ -73,7 +73,6 @@ post-install:
${STRIP_CMD} ${PREFIX}/usr/X11R6/lib/libglut.so.${GLUT_MAJOR_VER}.${GLUT_MINOR_VER}.0
@for R in GL GLU; do \
${STRIP_CMD} ${PREFIX}/usr/X11R6/lib/lib$$R.so.${GL_MAJOR_VER}.${GL_MINOR_VER}.0; \
- ${LN} -s lib$$R.so ${PREFIX}/usr/X11R6/lib/libMesa$$R.so; \
${LN} -s lib$$R.so.${GL_MAJOR_VER} ${PREFIX}/usr/X11R6/lib/libMesa$$R.so.${LIBMESA_MAJOR_VER}; \
done
${LINUXBASE}/sbin/ldconfig
diff --git a/graphics/linux_mesa3/pkg-plist b/graphics/linux_mesa3/pkg-plist
index 564113b..2cfb560 100644
--- a/graphics/linux_mesa3/pkg-plist
+++ b/graphics/linux_mesa3/pkg-plist
@@ -1,10 +1,8 @@
usr/X11R6/lib/libGL.so.%%GL_MAJOR_VER%%.%%GL_MINOR_VER%%.0
usr/X11R6/lib/libGL.so.%%GL_MAJOR_VER%%
-usr/X11R6/lib/libGL.so
usr/X11R6/lib/libGL.la
usr/X11R6/lib/libGLU.so.%%GL_MAJOR_VER%%.%%GL_MINOR_VER%%.0
usr/X11R6/lib/libGLU.so.%%GL_MAJOR_VER%%
-usr/X11R6/lib/libGLU.so
usr/X11R6/lib/libGLU.la
usr/X11R6/lib/libglut.so.%%GLUT_MAJOR_VER%%.%%GLUT_MINOR_VER%%.0
usr/X11R6/lib/libglut.so.%%GLUT_MAJOR_VER%%
OpenPOWER on IntegriCloud