diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile index ca4aede2a6fe..e88bc17b2b79 100644 --- a/x11-drivers/xf86-video-radeonhd-devel/Makefile +++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile @@ -6,8 +6,8 @@ # PORTNAME= xf86-video-radeonhd -PORTVERSION= 1.2.4.20090301 -PORTREVISION= 1 +PORTVERSION= 1.2.5.20090412 +PORTREVISION= 0 CATEGORIES= x11-drivers MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nork @@ -18,14 +18,7 @@ COMMENT= X.Org ati RadeonHD display driver development version BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \ ${LOCALBASE}/libdata/pkgconfig/gl.pc:${PORTSDIR}/graphics/libGL - -BROKEN= does not compile - -.if !exists(${LOCALBASE}/lib/libpci.so.2) -OPTIONS= UTILS "Install rhd_conntest and rhd_dump utilities" off -.else -WITH_UTILS= yes -.endif +LIB_DEPENDS= pci.2:${PORTSDIR}/devel/libpci XORG_CAT= driver USE_XORG= damageproto videoproto xextproto xf86driproto @@ -37,24 +30,14 @@ MAN4= radeonhd.4x ACLOCAL_ARGS= --acdir=${LOCALBASE}/share/aclocal +CONFIGURE_ENV+= PCIUTILS_CFLAGS="-I${LOCALBASE}/include" \ + PCIUTILS_LIBS="-L${LOCALBASE}/lib -lpci -lz" + pre-configure: cd ${WRKSRC} && ${AUTORECONF} -i -.include - -.if defined(WITH_UTILS) -LIB_DEPENDS+= pci.2:${PORTSDIR}/devel/libpci -PLIST_SUB= UTILS="" -CONFIGURE_ENV+= PCIUTILS_CFLAGS="-I${LOCALBASE}/include" \ - PCIUTILS_LIBS="-L${LOCALBASE}/lib -lpci -lz" -.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 +.include diff --git a/x11-drivers/xf86-video-radeonhd-devel/distinfo b/x11-drivers/xf86-video-radeonhd-devel/distinfo index 7b5a745b69e7..4113e01428f1 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.4.20090301.tar.bz2) = fc3db7c0949e2708b9ff3a8e90428dd9 -SHA256 (xorg/driver/xf86-video-radeonhd-1.2.4.20090301.tar.bz2) = 13d3bb8bedaad11e97a7bd4f8dc0af376108a1b5b45b102fd8fda8259ba41432 -SIZE (xorg/driver/xf86-video-radeonhd-1.2.4.20090301.tar.bz2) = 376740 +MD5 (xorg/driver/xf86-video-radeonhd-1.2.5.20090412.tar.bz2) = 3bec2823c199e6b96f6ccf9bbab691a1 +SHA256 (xorg/driver/xf86-video-radeonhd-1.2.5.20090412.tar.bz2) = f6d75bde55668d9b8af0018dca49594d6436c4aa46005bba684a26514d55b38c +SIZE (xorg/driver/xf86-video-radeonhd-1.2.5.20090412.tar.bz2) = 382300 diff --git a/x11-drivers/xf86-video-radeonhd-devel/pkg-plist b/x11-drivers/xf86-video-radeonhd-devel/pkg-plist index 4e9d0e970dcf..8e392792786f 100644 --- a/x11-drivers/xf86-video-radeonhd-devel/pkg-plist +++ b/x11-drivers/xf86-video-radeonhd-devel/pkg-plist @@ -1,8 +1,8 @@ +sbin/rhd_conntest +sbin/rhd_dump lib/xorg/modules/drivers/radeonhd_drv.la lib/xorg/modules/drivers/radeonhd_drv.so lib/xorg/modules/drivers/radeonhd_drv.a -%%UTILS%%sbin/rhd_conntest -%%UTILS%%sbin/rhd_dump @dirrmtry lib/xorg/modules/drivers @dirrmtry lib/xorg/modules @dirrmtry lib/xorg