summaryrefslogtreecommitdiffstats
path: root/x11-servers/XFree86-4-NestServer
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2002-03-16 23:40:19 +0000
committerwill <will@FreeBSD.org>2002-03-16 23:40:19 +0000
commit8000decd33fa42446b251761b4a30ad93a26415b (patch)
treec71199fb37306568bd5d27821d5fa6e1c9b2e666 /x11-servers/XFree86-4-NestServer
parentd725a058bb4c13280b0f849576c979fc3d70f4a0 (diff)
downloadFreeBSD-ports-8000decd33fa42446b251761b4a30ad93a26415b.zip
FreeBSD-ports-8000decd33fa42446b251761b4a30ad93a26415b.tar.gz
XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades
[1] Upgrade to 4.2.0. [2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES by default. Submitted by: [1] sf, taguchi@tohoku.iij.ad.jp Approved by: [2] core
Diffstat (limited to 'x11-servers/XFree86-4-NestServer')
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile30
-rw-r--r--x11-servers/XFree86-4-NestServer/distinfo2
2 files changed, 11 insertions, 21 deletions
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 2a4e5cd..b975d5f 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -6,13 +6,17 @@
#
PORTNAME= NestServer
-PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTVERSION= 4.2.0
CATEGORIES= x11-servers
-MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.1.0
+MASTER_SITES= ${MASTER_SITE_XFREE} \
+ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+ ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap \
+ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X410src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES= Wraphelp.c
MAINTAINER= taguchi@tohoku.iij.ad.jp
@@ -28,21 +32,7 @@ INSTALL_TARGET= installXnest installXserver.man
MANCOMPRESSED= yes
MAN1= Xnest.1 Xserver.1
-HasXdmAuth?= DEFAULT
-
-.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-everything::
- @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.else
-MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
- ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
- ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY= X410src-1.tgz
-DISTFILES+= Wraphelp.c
-IGNOREFILES= Wraphelp.c
-.endif # USA_RESIDENT
-.endif # HasXdmAuth
+HasXdmAuth?= YES
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index 942f997..4766fc3 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/Wraphelp.c) = IGNORE
OpenPOWER on IntegriCloud