summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso@pkgsrc.org>2009-08-25 05:27:57 +0000
committerhasso <hasso@pkgsrc.org>2009-08-25 05:27:57 +0000
commit6ce84d577b74757a0a39bac4155872fe92c814c5 (patch)
treeae3aeee52fa5c3e9bec8c55ccd9520b19c0f6b94
parent1e39b9c3a26b055ea562299e5cff544be8a86532 (diff)
downloadpkgsrc-6ce84d577b74757a0a39bac4155872fe92c814c5.tar.gz
- Fix MESA_TINY missed in last version bump.
- Add INSTALL_LIB_DIR and INSTALL_INC_DIR to fix *.pc files. This should address issues mentioned in the PR 41895. While there make dri default for DragonFly. Bump PKGREVISION.
-rw-r--r--graphics/MesaLib/Makefile3
-rw-r--r--graphics/MesaLib/files/configs/default7
-rw-r--r--graphics/MesaLib/options.mk6
3 files changed, 12 insertions, 4 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 538b3d6c52a..3a5c61a7947 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2009/07/08 20:00:57 hasso Exp $
+# $NetBSD: Makefile,v 1.81 2009/08/25 05:27:57 hasso Exp $
PKGNAME= MesaLib-${MESA_PKGVERSION}
+PKGREVISION= 1
COMMENT= Graphics library similar to SGI's OpenGL
MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \
diff --git a/graphics/MesaLib/files/configs/default b/graphics/MesaLib/files/configs/default
index f76a4b993c2..c1cddb39b42 100644
--- a/graphics/MesaLib/files/configs/default
+++ b/graphics/MesaLib/files/configs/default
@@ -1,11 +1,11 @@
-# $NetBSD: default,v 1.3 2009/06/05 11:10:35 wiz Exp $
+# $NetBSD: default,v 1.4 2009/08/25 05:27:57 hasso Exp $
CONFIG_NAME = default
# Version info
MESA_MAJOR= 7
MESA_MINOR= 4
-MESA_TINY= 2
+MESA_TINY= 4
GLU_CFLAGS= # defined
@@ -56,6 +56,9 @@ APP_LIB_DEPS=\
-lm
INSTALL_DIR?= $(PREFIX)
+INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
+INSTALL_INC_DIR = $(INSTALL_DIR)/include
+
DRI_DRIVER_INSTALL_DIR?= $(PREFIX)/lib/dri
DRI_DRIVER_SEARCH_DIR?= $(LOCALBASE)/lib/dri
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index 54f842fcd2e..cba2a516042 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2009/08/08 15:03:18 drochner Exp $
+# $NetBSD: options.mk,v 1.15 2009/08/25 05:27:57 hasso Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
PKG_SUPPORTED_OPTIONS=
@@ -33,6 +33,10 @@ PKG_SUPPORTED_OPTIONS+= dri
PKG_SUGGESTED_OPTIONS+= dri
.endif
+.if ${OPSYS} == "DragonFly"
+PKG_SUGGESTED_OPTIONS+= dri
+.endif
+
.include "../../mk/bsd.options.mk"
###
### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much.