Date: Sun, 29 Jul 2012 05:32:10 -1000 From: Jan Beich <jbeich@tormail.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/170263: [patch] x11/nvidia-driver: use pkg-which(8) WITH_PKGNG Message-ID: <1SvVTB-000Mhj-14@internal.tormail.org> Resent-Message-ID: <201207292120.q6TLK9xY076284@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170263
>Category: ports
>Synopsis: [patch] x11/nvidia-driver: use pkg-which(8) WITH_PKGNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 29 21:20:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
WITHOUT_PKGTOOLS= # see src.conf(5)
WITH_PKGNG=
>Description:
>How-To-Repeat:
$ make install
[...]
===> lib (install)
pkg_info: not found
pkg_info: not found
pkg_info: not found
>Fix:
--- pkg_which.diff begins here ---
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile (revision 301674)
+++ x11/nvidia-driver/Makefile (working copy)
@@ -97,7 +97,15 @@ IGNORE= requires fairly recent FreeBSD-STABLE, or
LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x
.endif
+.if defined(WITH_PKGNG)
+PKG_WHICH= pkg which -q
+.else
+PKG_WHICH= pkg_info -qW
+.endif
+
post-patch: .SILENT
+ ${REINPLACE_CMD} -e 's,pkg_info -qW,${PKG_WHICH},' \
+ ${WRKSRC}/lib/Makefile
# We should support -CURRENT: kill the check
${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h
# Adjust legacy drivers for updated d_mmap() since early 9.X
--- pkg_which.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1SvVTB-000Mhj-14>