www/tidy-devel: upgrading to 030220

PR:		ports/48549
Submitted by:	Thierry Thomas <thierry@pompo.net>

1 files changed, 36 insertions, 12 deletions

diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 3f40a260c5c7..01fbafd2a829 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -5,43 +5,64 @@
 # $FreeBSD$
 #
 
-PORTNAME=	tidy
-PORTVERSION=	030217
+PORTNAME?=	tidy
+PORTVERSION=	030220
 CATEGORIES=	www
 MASTER_SITES=	http://tidy.sourceforge.net/src/%SUBDIR%/	\
-		http://tidy.sourceforge.net/docs/
+		http://tidy.sourceforge.net/docs/:docs
 MASTER_SITE_SUBDIR=	. old
-PKGNAMESUFFIX=	-devel
+PKGNAMESUFFIX?=	-devel
 DISTNAME=	tidy_src
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}_${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	thierry@pompo.net
-COMMENT=	Utility to clean up and pretty print HTML/XHTML/XML
+MAINTAINER?=	thierry@pompo.net
+COMMENT?=	Utility to clean up and pretty print HTML/XHTML/XML
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+.if !defined(WITH_SHLIB)
 USE_GMAKE=	yes
+PLIST_SUB=	SHLIB="@comment "
+.else
+USE_AUTOMAKE_VER=	15
+AUTOMAKE_ARGS+=	-a -c --foreign
+USE_AUTOCONF=	yes
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
+PLIST_SUB=	SHLIB=""
+.endif
+
+DESCR=		${.CURDIR}/pkg-descr
+
+BIN2STRIP=	tidy tab2space
 
 #MAN1=		tidy.1
 
 .if !defined(NOPORTDOCS)
 DOCVER=		030216
-DISTFILES+=	tidy_docs_${DOCVER}${EXTRACT_SUFX}
+DISTFILES+=	tidy_docs_${DOCVER}${EXTRACT_SUFX}:docs
 DOCFILES=	Overview.html faq.html grid.gif pending.html	\
 		quickref.html release-notes.html tidy.css tidy.gif
 APIEXT=		css html js png
 .endif
 
-BIN2STRIP=	tidy tab2space
-
-post-extract:
-	@${CP} -p ${WRKSRC}/build/gmake/Makefile ${WRKSRC}
+post-patch:
+.if !defined(WITH_SHLIB)
+	@${CP} ${WRKSRC}/build/gmake/Makefile ${WRKSRC}
+.else
+	@${CP} -R -f ${WRKSRC}/build/gnuauto/* ${WRKSRC}
+	(cd ${WRKSRC}	\
+	&& ${LOCALBASE}/bin/libtoolize --force --copy	\
+	&& ${ACLOCAL})
+.endif
 
 pre-install:
 	@if [ -f ${LOCALBASE}/bin/tidy ]; then \
 		${ECHO_MSG} "" ; \
-		${ECHO_MSG} "Conflict: please deinstall the port bin/tidy." ; \
+		${ECHO_MSG} "Conflict: another tidy has been found; please deinstall it." ; \
+		${ECHO_MSG} "(`pkg_info -W ${LOCALBASE}/bin/tidy`)" ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
@@ -50,6 +71,9 @@ post-install:
 .for pgm in ${BIN2STRIP}
 	@${STRIP_CMD} ${PREFIX}/bin/${pgm}
 .endfor
+.if defined(WITH_SHLIB)
+	@${STRIP_CMD} ${PREFIX}/lib/libtidy-0.99.so.0
+.endif
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${DOCSDIR}