- Upgrade to today's snapshot.

Changelog:
	The configuration option sort-attributes  has been added.
	Additionally, the option show-body-only  has been extended to
	accept "auto".

- Replace the old conflict check by the CONFLICTS line.

www/tidy-devel/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	tidy
-DISTVERSION=	070211-cvs
+DISTVERSION=	070614-cvs
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 #MASTER_SITES=	http://tidy.sourceforge.net/src/%SUBDIR%/	\
@@ -26,12 +26,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 .if !defined(WITH_SHLIB)
 USE_GMAKE=	yes
 PLIST_SUB=	SHLIB="@comment " NSHLIB=""
+CONFLICTS=	tidy-20000804* tidy-lib-[0-9]*
 .else
 USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:15
 AUTOMAKE_ARGS+=	-a -c --foreign
 CONFIGURE_TARGET=	 --target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=	yes
 PLIST_SUB=	SHLIB="" NSHLIB="@comment "
+CONFLICTS=	tidy-20000804* tidy-devel-[0-9]*
 .endif
 
 DESCR=		${.CURDIR}/pkg-descr
@@ -98,15 +100,6 @@ patch-autotools::
 	 done);
 .endif
 
-pre-install:
-	@if [ -f ${LOCALBASE}/bin/tidy ]; then \
-		${ECHO_MSG} "" ; \
-		${ECHO_MSG} "Conflict: another tidy has been found; please deinstall it." ; \
-		${ECHO_MSG} "(`pkg_info -W ${LOCALBASE}/bin/tidy`)" ; \
-		${ECHO_MSG} "" ; \
-		${FALSE} ; \
-	fi
-
 post-install:
 .for pgm in ${BIN2STRIP}
 	${STRIP_CMD} ${PREFIX}/bin/${pgm}

www/tidy-devel/distinfo

@@ -1,3 +1,3 @@
-MD5 (tidy-070211-cvs.tar.bz2) = ace1ea25b962f3a770bbcaddc6ec1113
-SHA256 (tidy-070211-cvs.tar.bz2) = 93139032d4c6fd9d7942b9c32ef7ab248486a2776acbd07ec37b5ebb0b4d95d9
-SIZE (tidy-070211-cvs.tar.bz2) = 370222
+MD5 (tidy-070614-cvs.tar.bz2) = 4fd12f22753fcca6a839baaab3303116
+SHA256 (tidy-070614-cvs.tar.bz2) = 51307c19992d3383a7eab62bb6158b35eee693e78b0addaddfde27933a61ec5d
+SIZE (tidy-070614-cvs.tar.bz2) = 372988