summaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorDejan Lesjak <lesi@FreeBSD.org>2004-08-21 05:16:12 +0000
committerDejan Lesjak <lesi@FreeBSD.org>2004-08-21 05:16:12 +0000
commit2578633dc2544d3398a74f15a01080aea1ee2391 (patch)
treee97af9ad10078421c40bf8af7a4a563c44677187 /x11-servers
parentProperly pass environment variables to the command line. This fixes a (diff)
Fix PLIST_SUB variables in amd64 and i386 cases to generate proper plist
and thus include all drivers in package. Bump PORTREVISION, since package contents changed. PR: ports/70589 Approved by: anholt (mentor)
Notes
Notes: svn path=/head/; revision=116872
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 5b377c9d7c22..9d83c5bf9c15 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.4.0
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -125,7 +126,6 @@ PLIST_SUB+= ALPHA_NA=""
.if ${ARCH} == amd64
PLIST_SUB+= AMD64_NA="@comment "
-PLIST_SUB+= AMD64_I386=""
MAN4+= apm.4 \
chips.4 \
cirrus.4 \
@@ -139,7 +139,6 @@ MAN4+= apm.4 \
vesa.4
.else
PLIST_SUB+= AMD64_NA=""
-PLIST_SUB+= AMD64_I386="@comment "
.endif
.if ${ARCH} == ia64
@@ -167,7 +166,6 @@ MAN4+= glint.4 \
.if ${ARCH} == i386
PLIST_SUB+= I386=""
-PLIST_SUB+= AMD64_I386=""
MAN1+= scanpci.1
MAN4+= apm.4 \
chips.4 \
@@ -186,6 +184,11 @@ MAN4+= apm.4 \
vmware.4
.else
PLIST_SUB+= I386="@comment "
+.endif
+
+.if ${ARCH} == i386 || ${ARCH} == amd64
+PLIST_SUB+= AMD64_I386=""
+.else
PLIST_SUB+= AMD64_I386="@comment "
.endif