aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 20:57:04 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 20:57:04 +0000
commit73c51b67629e32170231351381a5e96704ef91f8 (patch)
treead39d6505946bed5b79bf2a77329b431b394f9bf /x11-drivers
parente53decf13873ea20e55f554c6921652d6adca790 (diff)
downloadports-73c51b67629e32170231351381a5e96704ef91f8.tar.gz
ports-73c51b67629e32170231351381a5e96704ef91f8.zip
Notes
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/Makefile23
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/distinfo6
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/pkg-plist2
-rw-r--r--x11-drivers/xf86-video-radeonhd/Makefile23
-rw-r--r--x11-drivers/xf86-video-radeonhd/distinfo6
-rw-r--r--x11-drivers/xf86-video-radeonhd/pkg-plist2
6 files changed, 52 insertions, 10 deletions
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 63b1e12485ad..357b6d6ca8b5 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -6,15 +6,34 @@
#
PORTNAME= xf86-video-radeonhd
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org ati RadeonHD display driver
+OPTIONS= UTILS "Install rhd_conntest and rhd_dump utilities" off
+
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= radeonhd.4x
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_UTILS)
+LIB_DEPENDS+= pci.2:${PORTSDIR}/devel/libpci
+PLIST_SUB= UTILS=""
+CONFIGURE_ENV+= PCIUTILS_CFLAGS="-I${LOCALBASE}/include -lpci -lz" \
+ PCIUTILS_LIBS="-L${LOCALBASE}/lib"
+.else
+PLIST_SUB= UTILS="@comment "
+.endif
+
+.if defined(WITH_UTILS)
+post-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${PREFIX}/sbin
+ ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${PREFIX}/sbin
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-radeonhd-devel/distinfo b/x11-drivers/xf86-video-radeonhd-devel/distinfo
index 4290ed8ad94f..6a9e12483949 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/distinfo
+++ b/x11-drivers/xf86-video-radeonhd-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-radeonhd-1.2.0.tar.bz2) = 6a932ec17da9ce5a6d9000c1649c3a7e
-SHA256 (xorg/driver/xf86-video-radeonhd-1.2.0.tar.bz2) = 87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27
-SIZE (xorg/driver/xf86-video-radeonhd-1.2.0.tar.bz2) = 511928
+MD5 (xorg/driver/xf86-video-radeonhd-1.2.1.tar.bz2) = 9db15e1f1f891f514ca72dd9a3cc360a
+SHA256 (xorg/driver/xf86-video-radeonhd-1.2.1.tar.bz2) = 2e06e8cd714e5345165c64e8a96ea0e7bae44ae2655760ef0eee17ab788ab388
+SIZE (xorg/driver/xf86-video-radeonhd-1.2.1.tar.bz2) = 512608
diff --git a/x11-drivers/xf86-video-radeonhd-devel/pkg-plist b/x11-drivers/xf86-video-radeonhd-devel/pkg-plist
index d28cfc8ccc03..115b3f129639 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/pkg-plist
+++ b/x11-drivers/xf86-video-radeonhd-devel/pkg-plist
@@ -1,5 +1,7 @@
lib/xorg/modules/drivers/radeonhd_drv.la
lib/xorg/modules/drivers/radeonhd_drv.so
+%%UTILS%%sbin/rhd_conntest
+%%UTILS%%sbin/rhd_dump
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index 63b1e12485ad..357b6d6ca8b5 100644
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ b/x11-drivers/xf86-video-radeonhd/Makefile
@@ -6,15 +6,34 @@
#
PORTNAME= xf86-video-radeonhd
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org ati RadeonHD display driver
+OPTIONS= UTILS "Install rhd_conntest and rhd_dump utilities" off
+
XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= radeonhd.4x
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_UTILS)
+LIB_DEPENDS+= pci.2:${PORTSDIR}/devel/libpci
+PLIST_SUB= UTILS=""
+CONFIGURE_ENV+= PCIUTILS_CFLAGS="-I${LOCALBASE}/include -lpci -lz" \
+ PCIUTILS_LIBS="-L${LOCALBASE}/lib"
+.else
+PLIST_SUB= UTILS="@comment "
+.endif
+
+.if defined(WITH_UTILS)
+post-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${PREFIX}/sbin
+ ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${PREFIX}/sbin
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-radeonhd/distinfo b/x11-drivers/xf86-video-radeonhd/distinfo
index 4290ed8ad94f..6a9e12483949 100644
--- a/x11-drivers/xf86-video-radeonhd/distinfo
+++ b/x11-drivers/xf86-video-radeonhd/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-radeonhd-1.2.0.tar.bz2) = 6a932ec17da9ce5a6d9000c1649c3a7e
-SHA256 (xorg/driver/xf86-video-radeonhd-1.2.0.tar.bz2) = 87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27
-SIZE (xorg/driver/xf86-video-radeonhd-1.2.0.tar.bz2) = 511928
+MD5 (xorg/driver/xf86-video-radeonhd-1.2.1.tar.bz2) = 9db15e1f1f891f514ca72dd9a3cc360a
+SHA256 (xorg/driver/xf86-video-radeonhd-1.2.1.tar.bz2) = 2e06e8cd714e5345165c64e8a96ea0e7bae44ae2655760ef0eee17ab788ab388
+SIZE (xorg/driver/xf86-video-radeonhd-1.2.1.tar.bz2) = 512608
diff --git a/x11-drivers/xf86-video-radeonhd/pkg-plist b/x11-drivers/xf86-video-radeonhd/pkg-plist
index d28cfc8ccc03..115b3f129639 100644
--- a/x11-drivers/xf86-video-radeonhd/pkg-plist
+++ b/x11-drivers/xf86-video-radeonhd/pkg-plist
@@ -1,5 +1,7 @@
lib/xorg/modules/drivers/radeonhd_drv.la
lib/xorg/modules/drivers/radeonhd_drv.so
+%%UTILS%%sbin/rhd_conntest
+%%UTILS%%sbin/rhd_dump
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg