aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-29 12:04:27 +0000
committerFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-29 12:04:27 +0000
commit10427f38633c0f24c0247cb77f05bfe26e85adfa (patch)
treecbf40551ac7cf3840f9ca24f9b009799695d906d
parent69445cf3d35db26959026e9009b94b8819688ed2 (diff)
downloadports-10427f38633c0f24c0247cb77f05bfe26e85adfa.tar.gz
ports-10427f38633c0f24c0247cb77f05bfe26e85adfa.zip
o fix MASTER_SITE_SUBDIR.
o unbreak -clients when USA_RESIDENT does not set. Submitted by: Mori Kouji <mori@tri.asanuma.co.jp>
Notes
Notes: svn path=/head/; revision=40526
Diffstat
-rw-r--r--devel/imake-4/Makefile1
-rw-r--r--x11-fonts/XFree86-4-font100dpi/Makefile1
-rw-r--r--x11-fonts/XFree86-4-font75dpi/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontCyrillic/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontEncodings/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontLatin2/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontScalable/Makefile1
-rw-r--r--x11-servers/XFree86-4-FontServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server/Makefile2
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile2
-rw-r--r--x11/XFree86-4-clients/Makefile4
-rw-r--r--x11/XFree86-4-documents/Makefile2
-rw-r--r--x11/XFree86-4-libraries/Makefile2
-rw-r--r--x11/XFree86-4-manuals/Makefile2
18 files changed, 19 insertions, 11 deletions
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index da29f8857634..e7e48cdbf2e2 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -9,6 +9,7 @@ PORTNAME= imake
PORTVERSION= 4.0.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
DISTFILES= X402src-1.tgz
PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index da5a9206fd22..e103a20f3aa4 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -9,6 +9,7 @@ PORTNAME= font100dpi
PORTVERSION= 4.0.3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-2.tgz
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index 27e1c8893349..ad651aa7373b 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -9,6 +9,7 @@ PORTNAME= font75dpi
PORTVERSION= 4.0.3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-2.tgz
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 587ec89817db..c18ca68e83f8 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -9,6 +9,7 @@ PORTNAME= fontCyrillic
PORTVERSION= 4.0.3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-2.tgz
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index dbc78c4b3275..a91c5600f408 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -9,6 +9,7 @@ PORTNAME= fontDefaultBitmaps
PORTVERSION= 4.0.3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz X402src-2.tgz
EXTRACT_ONLY= X402src-2.tgz
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index acc884cfc203..4b82a3ff71e2 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -9,6 +9,7 @@ PORTNAME= fontEncodings
PORTVERSION= 4.0.3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-2.tgz
diff --git a/x11-fonts/XFree86-4-fontLatin2/Makefile b/x11-fonts/XFree86-4-fontLatin2/Makefile
index da311b0fbc80..ae7d645bd330 100644
--- a/x11-fonts/XFree86-4-fontLatin2/Makefile
+++ b/x11-fonts/XFree86-4-fontLatin2/Makefile
@@ -9,6 +9,7 @@ PORTNAME= fontLatin2
PORTVERSION= 4.0.3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-2.tgz
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 51fc9a8892e7..e03bd31c799b 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -9,6 +9,7 @@ PORTNAME= fontScalable
PORTVERSION= 4.0.3
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-2.tgz
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index e8f947dcb132..7058667186e3 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= FontServer
PORTVERSION= 4.0.3
CATEGORIES= x11-servers x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 9d013751cee1..a97e28ef39b0 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= NestServer
PORTVERSION= 4.0.3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index d7a448684043..778861201d9c 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= PrintServer
PORTVERSION= 4.0.3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 6e425c0e7244..7df0e390ef5c 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Server
PORTVERSION= 4.0.3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 6e425c0e7244..7df0e390ef5c 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -9,7 +9,7 @@ PORTNAME= Server
PORTVERSION= 4.0.3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 99cf5368d5ae..995829a0b18b 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= VirtualFramebufferServer
PORTVERSION= 4.0.3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index fcfaab2804c8..2dd1840828fc 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -9,7 +9,7 @@ PORTNAME= clients
PORTVERSION= 4.0.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz X402src-2.tgz
EXTRACT_ONLY= X402src-1.tgz
@@ -58,7 +58,7 @@ HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if ${USA_RESIDENT} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
pre-fetch:
@${ECHO}
@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index fcef66f2fbd4..e3aed18d494a 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -9,7 +9,7 @@ PORTNAME= documents
PORTVERSION= 4.0.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz X402src-2.tgz X402src-3.tgz
EXTRACT_ONLY= X402src-2.tgz X402src-3.tgz
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index ee0df8594a45..b046ec1580e0 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 4.0.3
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 14387eccb4bf..4f35b3f3c569 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -9,7 +9,7 @@ PORTNAME= manuals
PORTVERSION= 4.0.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITE_SUBDIR= 4.0.2
PKGNAMEPREFIX= XFree86-
DISTFILES= X402src-1.tgz
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 12:25:47 +0000