Date: Tue, 17 Aug 2004 22:23:33 +0200 (CEST) From: Dejan Lesjak <dejan.lesjak@guest.arnes.si> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70589: [patch] x11-servers/XFree86-4-Server: fix PLIST_SUB variables for amd64 and i386 Message-ID: <20040817202333.9C25733C2D@idefix.ijs.si> Resent-Message-ID: <200408172030.i7HKUIOj077790@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70589
>Category: ports
>Synopsis: [patch] x11-servers/XFree86-4-Server: fix PLIST_SUB variables for amd64 and i386
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 17 20:30:18 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Dejan Lesjak
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD idefix.ijs.si 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Aug 12 23:21:04 CEST 2004 lesi@idefix.ijs.si:/usr/obj/usr/src/sys/IDEFIX i386
>Description:
The XFree86-4-Server Makefile wrongly sets PLIST_SUB for amd64 and i386, thus
some drivers are missing from generated plist and, more importantly from
packages. The attached patch fixes this. I'm sorry I missed this upon upgrading
ports.
>How-To-Repeat:
>Fix:
--- XFree86-4-Server.plistsub.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/local/freebsd-cvs/ports/x11-servers/XFree86-4-Server/Makefile,v
retrieving revision 1.158
diff -u -r1.158 Makefile
--- Makefile 10 Aug 2004 01:29:20 -0000 1.158
+++ Makefile 17 Aug 2004 16:12:46 -0000
@@ -125,7 +125,6 @@
.if ${ARCH} == amd64
PLIST_SUB+= AMD64_NA="@comment "
-PLIST_SUB+= AMD64_I386=""
MAN4+= apm.4 \
chips.4 \
cirrus.4 \
@@ -139,7 +138,6 @@
vesa.4
.else
PLIST_SUB+= AMD64_NA=""
-PLIST_SUB+= AMD64_I386="@comment "
.endif
.if ${ARCH} == ia64
@@ -167,7 +165,6 @@
.if ${ARCH} == i386
PLIST_SUB+= I386=""
-PLIST_SUB+= AMD64_I386=""
MAN1+= scanpci.1
MAN4+= apm.4 \
chips.4 \
@@ -186,6 +183,11 @@
vmware.4
.else
PLIST_SUB+= I386="@comment "
+.endif
+
+.if ${ARCH} == i386 || ${ARCH} == amd64
+PLIST_SUB+= AMD64_I386=""
+.else
PLIST_SUB+= AMD64_I386="@comment "
.endif
--- XFree86-4-Server.plistsub.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040817202333.9C25733C2D>