ports/70193: Fix pkg-plist build for x11/nvidia-driver & xorg

[Sergey N. Voronkov]

>Number:         70193
>Category:       ports
>Synopsis:       Fix pkg-plist build for x11/nvidia-driver & xorg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 09 03:40:03 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergey N. Voronkov
>Release:        FreeBSD 4.10-RELEASE-p2 i386
>Organization:
Sibitex JSC
>Environment:
System: FreeBSD sv.tech.sibitex.tmn.ru 4.10-RELEASE-p2 FreeBSD 4.10-RELEASE-p2 #3: Tue Aug 3 08:58:41 YEKST 2004 serg at sv.tech.sibitex.tmn.ru:/usr/obj/usr/src/sys/SV i386

>Description:
	Fix install of x11/nvidia-drivers over xorg package.
>How-To-Repeat:
	echo X_WINDOW_SYSTEM=xorg >> /etc/make.conf
	cd /usr/x11/xorg && make install clean
	cd /usr/x11/nvidia-driver && make install clean
>Fix:
--- Makefile.old        Mon Aug  9 09:29:44 2004
+++ Makefile    Mon Aug  9 09:31:08 2004
@@ -28,8 +28,8 @@
 
 # XXX Should use ${PKG_INFO} XXX
 #
-XSERVVERSION!= /usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || true
-XLIBVERSION!=  /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || true
+XSERVVERSION!= /usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || /usr/sbin/pkg_info -O x11-servers/xorg-server 2>/dev/null | ${GREP} server- || true
+XLIBVERSION!=  /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O x11/xorg-libraries 2>/dev/null | ${GREP} libraries- || true
 
 PLIST_SUB=     XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
                LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}

>Release-Note:
>Audit-Trail:
>Unformatted: