7 files changed, 76 insertions, 15 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}
diff --git a/www/tidy-devel/distinfo b/www/tidy-devel/distinfo
index 2f62c38d8ad0..11c6cabb52b4 100644
--- a/www/tidy-devel/distinfo
+++ b/www/tidy-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (tidy_src_030217.tgz) = df447cc6b32c49577fd2aee7f88176db
+MD5 (tidy_src_030220.tgz) = 1386d1a54e4429d4ddbb5a8bb01b5bc7
 MD5 (tidy_docs_030216.tgz) = b832e6a78836bf31b3eadca3d5301106
diff --git a/www/tidy-devel/files/patch-Makefile b/www/tidy-devel/files/patch-build_gmake_Makefile
index 28d5e905c4bf..93d71b5ecee7 100644
--- a/www/tidy-devel/files/patch-Makefile
+++ b/www/tidy-devel/files/patch-build_gmake_Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Feb 18 08:57:03 2003
-+++ Makefile	Tue Feb 18 21:59:51 2003
+--- build/gmake/Makefile.orig	Tue Feb 18 08:57:03 2003
++++ build/gmake/Makefile	Wed Feb 19 22:17:12 2003
 @@ -58,8 +58,8 @@
  PROJECT=tidy
  
diff --git a/www/tidy-devel/files/patch-build_gnuauto_configure.in b/www/tidy-devel/files/patch-build_gnuauto_configure.in
new file mode 100644
index 000000000000..1458f43b9b9a
--- /dev/null
+++ b/www/tidy-devel/files/patch-build_gnuauto_configure.in
@@ -0,0 +1,11 @@
+--- build/gnuauto/configure.in.orig	Sat Jan 18 15:23:43 2003
++++ build/gnuauto/configure.in	Thu Feb 20 23:05:17 2003
+@@ -58,7 +58,7 @@
+ if test $debug_build = yes; then
+ 	CFLAGS="$save_cflags -g"
+ else
+-	CFLAGS="$save_cflags -O2"
++	CFLAGS="$save_cflags"
+ fi
+ # 
+ # =============================================
diff --git a/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am b/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am
new file mode 100644
index 000000000000..3b6dac467ef6
--- /dev/null
+++ b/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am
@@ -0,0 +1,13 @@
+--- build/gnuauto/include/Makefile.am.orig	Sat Jan 18 15:23:43 2003
++++ build/gnuauto/include/Makefile.am	Thu Feb 20 23:42:21 2003
+@@ -53,8 +53,8 @@
+ #  acknowledgment is not required but would be appreciated.
+ #
+ 
+-#tidyincdir = $(includedir)/tidy
+-tidyincdir = $(includedir)
++tidyincdir = $(includedir)/tidy
++#tidyincdir = $(includedir)
+ 
+ tidyinc_HEADERS = \
+ 	platform.h \
diff --git a/www/tidy-devel/files/patch-build_gnuauto_src_Makefile.am b/www/tidy-devel/files/patch-build_gnuauto_src_Makefile.am
new file mode 100644
index 000000000000..8e4ce60e6f81
--- /dev/null
+++ b/www/tidy-devel/files/patch-build_gnuauto_src_Makefile.am
@@ -0,0 +1,11 @@
+--- build/gnuauto/src/Makefile.am.orig	Sun Feb 16 20:33:04 2003
++++ build/gnuauto/src/Makefile.am	Thu Feb 20 23:13:11 2003
+@@ -68,7 +68,7 @@
+ 	tidylib.c
+ 
+ libtidy_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_LITE_AGE) \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ 	-release $(LT_RELEASE) -no-undefined -export-dynamic
+ 
+ HFILES = \
diff --git a/www/tidy-devel/pkg-plist b/www/tidy-devel/pkg-plist
index 64190c6fe975..9a57faa088d0 100644
--- a/www/tidy-devel/pkg-plist
+++ b/www/tidy-devel/pkg-plist
@@ -6,6 +6,8 @@ include/tidy/fileio.h
 include/tidy/platform.h
 include/tidy/tidy.h
 include/tidy/tidyenum.h
+%%SHLIB%%lib/libtidy-0.99.so.0
+%%SHLIB%%lib/libtidy.so
 lib/libtidy.a
 %%PORTDOCS%%share/doc/tidy/Overview.html
 %%PORTDOCS%%share/doc/tidy/faq.html