summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-09-29 01:39:58 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-09-29 01:39:58 +0000
commitdb626527f309e7c98eaeaebca46282254aed5b0a (patch)
treea6c9afafaa561d94cc187ff8438a1b3733413a28 /x11
parentFreeBSD specific hack -- prefer OSREL from the environment over what (diff)
Don't try to package libOSMesa for FreeBSD versions < 4.1, since they
are skipped in the build. We can package XFree86-4-lib in 3-stable again! Reviewed by: maintainer
Notes
Notes: svn path=/head/; revision=33238
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-libraries/Makefile11
-rw-r--r--x11/XFree86-4-libraries/pkg-plist4
2 files changed, 12 insertions, 3 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 72327083fd8e..6ea4e62d1dae 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -34,6 +34,15 @@ MANCOMPRESSED= yes
MAN1= libxrx.1
MAN3= Xaw.3
+.include <bsd.port.pre.mk>
+
+# BuildXF86DRI is false for FreeBSD < 4.1
+.if ${OSVERSION} < 410000
+PLIST_SUB+= OSMESA:="@comment "
+.else
+PLIST_SUB+= OSMESA:=""
+.endif
+
.if defined(XDM_DES)
.if ${USA_RESIDENT} == YES
pre-fetch:
@@ -49,4 +58,4 @@ IGNOREFILES= Wraphelp.c
.endif
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 76dcf6bcd28d..0c83f2b2570a 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -459,8 +459,8 @@ lib/libGL.so.1
lib/libICE.a
lib/libICE.so
lib/libICE.so.6
-lib/libOSMesa.so
-lib/libOSMesa.so.3
+%%OSMESA:%%lib/libOSMesa.so
+%%OSMESA:%%lib/libOSMesa.so.3
lib/libPEX5.a
lib/libPEX5.so
lib/libPEX5.so.6