Index: head/x11/XFree86/Makefile
===================================================================
--- head/x11/XFree86/Makefile	(revision 58543)
+++ head/x11/XFree86/Makefile	(revision 58544)
@@ -1,114 +1,115 @@
 # New ports collection makefile for:    XFree86
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
 PORTNAME=	XFree86
 PORTVERSION=	3.3.6
 PORTREVISION=	11
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTFILES=	X336src-1.tgz X336src-2.tgz
 .if defined(BUILD_XDIST)
 DISTFILES+=	X336src-3.tgz
 .endif
 
 PATCH_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,jmz,g}
 PATCHFILES=	3.3.6-3.3.6a.diffs.gz
 
 MAINTAINER=	jmz@FreeBSD.org
 
+LATEST_LINK=	XFree86-3
 WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
 SCRIPTDIR=	${WRKDIR}/scripts
 INSTALLS_SHLIB=	yes
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 .if defined(BUILD_XDIST)
 INSTALL_TARGET+=	install.linkkit
 .endif
 DIST_SUBDIR=	xc
 SCRIPTS_ENV=	OSVERSION=${OSVERSION} MACHINE=${MACHINE} \
 		MACHINE_ARCH=${MACHINE_ARCH}
 MAKE_ARGS=	WORLDOPTS=
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .if (${MACHINE} == "pc98")
 PLIST=		${PKGDIR}/pkg-plist.pc98
 .endif
 .if (${MACHINE} == "alpha")
 PLIST=		${PKGDIR}/pkg-plist.alpha
 .endif
 
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
 	@${ECHO}
 	@${ECHO} You must set variable USA_RESIDENT to YES or NO.
 	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch:
 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=	X336src-1.tgz X336src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
 .if ${USA_RESIDENT} == YES
 pre-fetch:
 	@${ECHO}
 	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
 .endif
 .endif
 
 post-extract:
 	@${MV} ${WRKSRC}/programs/Xserver/hw/xfree86/vga256/drivers/i810/os-support/linux/agpgart.h ${WRKSRC}/programs/Xserver/hw/xfree86/vga256/drivers/i810/
 .if defined(BUILD_XDIST)
 	@${CP} ${WRKSRC}/programs/Xserver/hw/xfree86/LinkKit/README \
 		${WRKSRC}/programs/Xserver/hw/xfree86/doc/sgml
 	@${MV} ${WRKSRC}/programs/Xserver/hw/xfree86/doc/sgml/DGux.sgml \
 		${WRKSRC}/programs/Xserver/hw/xfree86/doc/sgml/DGUX.sgml
 .endif
 	@if [ -r ${FILESDIR}/config ]; then \
 		${ECHO} Using your existing ${FILESDIR}/config ; \
 		${CP} ${FILESDIR}/config ${WRKDIR}/config ; \
 	fi
 
 .include <bsd.port.pre.mk>
 
 .if !defined(BUILD_XDIST) && !exists(${FILESDIR}/config)
 IS_INTERACTIVE=	yes	# configure script asks questions
 .endif
 
 pre-configure:
 	@${MKDIR} ${SCRIPTDIR}
 .if defined(BUILD_XDIST)
 	@${CP} ${MASTERDIR}/scripts/configure.build_xdist ${SCRIPTDIR}/configure
 .else
 	@${CP} ${MASTERDIR}/scripts/configure ${SCRIPTDIR}
 .endif
 
 pre-install:
 	${MKDIR} ${X11BASE}
 
 post-install:
 .if ${PORTOBJFORMAT} == "aout"
 .for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub
 	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in X11 Xaw Xtst
 	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in Xp
 	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in ICE Xext
 	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/x11/XFree86/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.100
\ No newline at end of property
+1.101
\ No newline at end of property
Index: head/x11/XFree86-4/Makefile
===================================================================
--- head/x11/XFree86-4/Makefile	(revision 58543)
+++ head/x11/XFree86-4/Makefile	(revision 58544)
@@ -1,40 +1,40 @@
 # New ports collection makefile for:    XFree86
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
 PORTNAME=	XFree86
 PORTVERSION=	4.2.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
 LIB_DEPENDS=	Xft.1:${PORTSDIR}/x11/XFree86-4-libraries
 RUN_DEPENDS=	xvinfo:${PORTSDIR}/x11/XFree86-4-clients \
 	${X11BASE}/lib/X11/doc/ddx.TXT:${PORTSDIR}/x11/XFree86-4-documents \
 	${FONT100DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font100dpi \
 	${FONT75DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font75dpi \
 	${FONTCYR}:${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic \
 	${FONTDEFAULT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps \
 	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
 	${X11BASE}/bin/xfs:${PORTSDIR}/x11-servers/XFree86-4-FontServer \
 	${X11BASE}/bin/xf86cfg:${PORTSDIR}/x11-servers/XFree86-4-Server
 
 MAINTAINER=	jmz@FreeBSD.org
 
 NO_BUILD=	yes
-LATEST_LINK=	XFree86-4
+LATEST_LINK=	XFree86
 FONT100DPI=	${X11BASE}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
 FONT75DPI=	${X11BASE}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
 FONTCYR=	${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz
 FONTDEFAULT=	${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
 FONTSCALE=	${X11BASE}/lib/X11/fonts/PEX/Roman.phont
 
 do-install:	# empty
 
 .include <bsd.port.mk>

Property changes on: head/x11/XFree86-4/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.145
\ No newline at end of property
+1.146
\ No newline at end of property