mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
Unbroke with latest XFree86-4.
Reported by: MANY
This commit is contained in:
parent
6382ed95e9
commit
f15b5bcca1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=44422
@ -35,7 +35,7 @@ PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
|
||||
.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_ENV= INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\
|
||||
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 @@ post-install:
|
||||
@${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>
|
||||
|
@ -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:
|
||||
|
@ -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 @@ include/GL/glut.h
|
||||
%%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
|
||||
|
@ -35,7 +35,7 @@ PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
|
||||
.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_ENV= INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\
|
||||
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 @@ post-install:
|
||||
@${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>
|
||||
|
@ -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:
|
||||
|
@ -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 @@ include/GL/glut.h
|
||||
%%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
|
||||
|
Loading…
Reference in New Issue
Block a user