Date: Wed, 06 Jun 2001 16:45:31 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: portmgr@FreeBSD.org Subject: New XFree86-4 and USE_MESA bsd.port.mk macro Message-ID: <3B1E33FB.E799CE5C@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------A4E10A8285ADFC0B6222B1A2
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Hi folks,
Unlike previous versions, XFree86-4.1.0 now installs libGLU by itself
(but not libglut, so we still need Mesa3), so GLU.1 is not a valid for
a LIB_DEPENDS implied by USE_MESA anymore. Attached patch expected to
fix bsd.port.mk and Mesa3 ports. Please review/approve. Given the
small size of the patch and its importance (w/o it virtually all GL
ports are broken with XFree86-4) I think it should be tested on the
bento and committer into bsd.port.mk ASAP.
-Maxim
--------------A4E10A8285ADFC0B6222B1A2
Content-Type: text/plain; charset=koi8-r;
name="bsd.port.mk.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="bsd.port.mk.diff"
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.367
diff -d -u -r1.367 bsd.port.mk
--- bsd.port.mk 2001/05/23 02:46:52 1.367
+++ bsd.port.mk 2001/06/06 13:23:29
@@ -834,7 +834,7 @@
USE_XLIB= yes
.endif
.if defined(USE_MESA)
-LIB_DEPENDS+= GLU.1:${PORTSDIR}/graphics/Mesa3
+LIB_DEPENDS+= glut.3:${PORTSDIR}/graphics/Mesa3
.endif
XAWVER= 7
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/Mesa3/Makefile,v
retrieving revision 1.49
diff -d -u -r1.49 Makefile
--- Makefile 2001/05/19 14:03:21 1.49
+++ Makefile 2001/06/06 13:31:49
@@ -35,7 +35,7 @@
.include <bsd.port.pre.mk>
.if ${XFREE86_VERSION} == 3
-SUB_GL= src
+SUB_GL= src src-glu
INCLUDE_GL= include
GLVER= 14
PLIST_SUB+= XFREE3:=""
@@ -48,7 +48,7 @@
MAKE_ARGS= -e
.endif
-MAKE_ENV+= SUB_GL=${SUB_GL} \
+MAKE_ENV+= SUB_GL="${SUB_GL}" \
INCLUDE_GL=${INCLUDE_GL}
pre-patch:
@@ -62,9 +62,8 @@
@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
.endfor
.if ${XFREE86_VERSION} > 3
- @${MKDIR} ${PREFIX}/include/GL
- @cd ${WRKSRC}/include/GL && \
- ${INSTALL_DATA} glu.h glut.h ${PREFIX}/include/GL
+ ${MKDIR} ${PREFIX}/include/GL
+ ${INSTALL_DATA} ${WRKSRC}/include/GL/glut.h ${PREFIX}/include/GL
.endif
.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/Mesa3/pkg-plist,v
retrieving revision 1.18
diff -d -u -r1.18 pkg-plist
--- pkg-plist 2001/03/20 16:37:50 1.18
+++ pkg-plist 2001/06/06 13:31:49
@@ -1,7 +1,7 @@
%%XFREE3:%%etc/mesa.conf
%%XFREE3:%%include/GL/gl.h
%%XFREE3:%%include/GL/gl_mangle.h
-include/GL/glu.h
+%%XFREE3:%%include/GL/glu.h
%%XFREE3:%%include/GL/glu_mangle.h
include/GL/glut.h
%%XFREE3:%%include/GL/glx.h
@@ -13,8 +13,8 @@
%%XFREE3:%%include/GL/xmesa_xf86.h
%%XFREE3:%%lib/libGL.so
%%XFREE3:%%lib/libGL.so.%%GLVER%%
-lib/libGLU.so
-lib/libGLU.so.%%GLVER%%
+%%XFREE3:%%lib/libGLU.so
+%%XFREE3:%%lib/libGLU.so.%%GLVER%%
lib/libMesaGL.so
lib/libMesaGLU.so
lib/libglut.so
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/graphics/Mesa3/files/patch-ad,v
retrieving revision 1.1
diff -d -u -r1.1 patch-ad
--- files/patch-ad 2000/08/24 09:53:08 1.1
+++ files/patch-ad 2001/06/06 13:31:49
@@ -1,20 +1,23 @@
---- Makefile.in 2000/08/22 07:27:14 1.1
-+++ Makefile.in 2000/08/22 07:29:15
-@@ -92,7 +92,7 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig Thu May 17 01:28:53 2001
++++ Makefile.in Tue Jun 5 17:34:13 2001
+@@ -95,7 +95,7 @@
@NEED_GLUT_TRUE@SUB_GLUT = src-glut
-SUBDIRS = include src src-glu $(SUB_GLUT) $(DEMO_DIRS) util
-+SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu $(SUB_GLUT) $(DEMO_DIRS) util
++SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(SUB_GLUT) $(DEMO_DIRS) util
EXTRA_DIST = docs/INSTALL docs/INSTALL.GNU docs/CONFIG docs/IAFA-PACKAGE docs/RELNOTES docs/VERSIONS docs/CONFORM docs/COPYING docs/COPYRIGHT docs/README docs/README.3DFX docs/README.BEOS docs/README.GGI docs/README.MINGW32 docs/README.MITS docs/README.QUAKE docs/README.THREADS docs/README.X11 images/girl.rgb images/reflect.rgb images/tile.rgb
-@@ -110,7 +110,7 @@
+@@ -113,7 +113,7 @@
TAR = gtar
GZIP_ENV = --best
-DIST_SUBDIRS = include src src-glu src-glut book demos samples xdemos \
-+DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glu src-glut book demos samples xdemos \
++DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) src-glut book demos samples xdemos \
util
all: all-redirect
.SUFFIXES:
--------------A4E10A8285ADFC0B6222B1A2--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3B1E33FB.E799CE5C>