Date: Fri, 21 Feb 2003 22:55:27 +0100 (CET) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48549: www/tidy-devel: upgrading to 030220 + new port www/tidy-lib. Message-ID: <20030221215527.365A3775F@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 48549 >Category: ports >Synopsis: www/tidy-devel: upgrading to 030220 + new port www/tidy-lib. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Feb 21 14:00:31 PST 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.7-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Sun Feb 16 20:58:08 CET 2003 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: . Upgrading www/tidy-devel to 030220; . Adding a knob WITH_SHLIB to build the shared lib; . Adding a slave port www/tidy-lib to trigger this knob. >How-To-Repeat: N/A. >Fix: 1) Upgrading www/tidy-devel: - removed file: files/patch-Makefile - new files: files/patch-build_gmake_Makefile files/patch-build_gnuauto_configure.in files/patch-build_gnuauto_include_Makefile.am files/patch-build_gnuauto_src_Makefile.am Please apply this patch: diff -urN www/tidy-devel.orig/Makefile www/tidy-devel/Makefile --- www/tidy-devel.orig/Makefile Wed Feb 19 01:43:41 2003 +++ www/tidy-devel/Makefile Fri Feb 21 22:35:29 2003 @@ -5,23 +5,38 @@ # $FreeBSD: ports/www/tidy-devel/Makefile,v 1.27 2003/02/19 00:43:41 leeym Exp $ # -PORTNAME= tidy -PORTVERSION= 030217 +PORTNAME?= tidy +PORTVERSION= 030220 CATEGORIES= www MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \ http://tidy.sourceforge.net/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 @@ -33,15 +48,21 @@ 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 @@ .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 -urN www/tidy-devel.orig/distinfo www/tidy-devel/distinfo --- www/tidy-devel.orig/distinfo Tue Feb 18 19:03:52 2003 +++ www/tidy-devel/distinfo Fri Feb 21 20:42:07 2003 @@ -1,2 +1,2 @@ -MD5 (tidy_src_030217.tgz) = df447cc6b32c49577fd2aee7f88176db +MD5 (tidy_src_030220.tgz) = 1386d1a54e4429d4ddbb5a8bb01b5bc7 MD5 (tidy_docs_030216.tgz) = b832e6a78836bf31b3eadca3d5301106 diff -urN www/tidy-devel.orig/files/patch-Makefile www/tidy-devel/files/patch-Makefile --- www/tidy-devel.orig/files/patch-Makefile Tue Feb 18 22:00:53 2003 +++ www/tidy-devel/files/patch-Makefile Thu Jan 1 01:00:00 1970 @@ -1,37 +0,0 @@ ---- Makefile.orig Tue Feb 18 08:57:03 2003 -+++ Makefile Tue Feb 18 21:59:51 2003 -@@ -58,8 +58,8 @@ - PROJECT=tidy - - # Installation variables. Spaces OK, only dir create and file copy operations. --runinst_prefix=/usr/local --devinst_prefix=/usr/local -+runinst_prefix=${PREFIX} -+devinst_prefix=${PREFIX} - - bininst = ${runinst_prefix}/bin - libinst = ${devinst_prefix}/lib -@@ -67,7 +67,7 @@ - maninst = ${devinst_prefix}/man - - # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names. --TOPDIR = ../.. -+TOPDIR = . - INCDIR = ${TOPDIR}/include - APPDIR = ${TOPDIR}/console - SRCDIR = ${TOPDIR}/src -@@ -76,10 +76,11 @@ - BINDIR = ${TOPDIR}/bin - - # CFLAGS etc.. --CC= gcc --CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR) -+#CC= gcc -+#CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR) -+CFLAGS+= -I $(INCDIR) - --# OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 -+OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 - ifdef SUPPORT_UTF16_ENCODINGS - CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS) - endif diff -urN www/tidy-devel.orig/files/patch-build_gmake_Makefile www/tidy-devel/files/patch-build_gmake_Makefile --- www/tidy-devel.orig/files/patch-build_gmake_Makefile Thu Jan 1 01:00:00 1970 +++ www/tidy-devel/files/patch-build_gmake_Makefile Wed Feb 19 22:19:05 2003 @@ -0,0 +1,37 @@ +--- 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 + + # Installation variables. Spaces OK, only dir create and file copy operations. +-runinst_prefix=/usr/local +-devinst_prefix=/usr/local ++runinst_prefix=${PREFIX} ++devinst_prefix=${PREFIX} + + bininst = ${runinst_prefix}/bin + libinst = ${devinst_prefix}/lib +@@ -67,7 +67,7 @@ + maninst = ${devinst_prefix}/man + + # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names. +-TOPDIR = ../.. ++TOPDIR = . + INCDIR = ${TOPDIR}/include + APPDIR = ${TOPDIR}/console + SRCDIR = ${TOPDIR}/src +@@ -76,10 +76,11 @@ + BINDIR = ${TOPDIR}/bin + + # CFLAGS etc.. +-CC= gcc +-CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR) ++#CC= gcc ++#CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR) ++CFLAGS+= -I $(INCDIR) + +-# OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 ++OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 + ifdef SUPPORT_UTF16_ENCODINGS + CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS) + endif diff -urN www/tidy-devel.orig/files/patch-build_gnuauto_configure.in www/tidy-devel/files/patch-build_gnuauto_configure.in --- www/tidy-devel.orig/files/patch-build_gnuauto_configure.in Thu Jan 1 01:00:00 1970 +++ www/tidy-devel/files/patch-build_gnuauto_configure.in Thu Feb 20 23:06:00 2003 @@ -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 -urN www/tidy-devel.orig/files/patch-build_gnuauto_include_Makefile.am www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am --- www/tidy-devel.orig/files/patch-build_gnuauto_include_Makefile.am Thu Jan 1 01:00:00 1970 +++ www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am Thu Feb 20 23:43:06 2003 @@ -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 -urN www/tidy-devel.orig/files/patch-build_gnuauto_src_Makefile.am www/tidy-devel/files/patch-build_gnuauto_src_Makefile.am --- www/tidy-devel.orig/files/patch-build_gnuauto_src_Makefile.am Thu Jan 1 01:00:00 1970 +++ www/tidy-devel/files/patch-build_gnuauto_src_Makefile.am Thu Feb 20 23:13:50 2003 @@ -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 -urN www/tidy-devel.orig/pkg-plist www/tidy-devel/pkg-plist --- www/tidy-devel.orig/pkg-plist Sun Feb 2 00:24:54 2003 +++ www/tidy-devel/pkg-plist Thu Feb 20 23:49:05 2003 @@ -6,6 +6,8 @@ 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 2) New slave port www/tidy-lib: Please execute the following shar file: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # www/tidy-lib # www/tidy-lib/Makefile # www/tidy-lib/pkg-descr # echo c - www/tidy-lib mkdir -p www/tidy-lib > /dev/null 2>&1 echo x - www/tidy-lib/Makefile sed 's/^X//' >www/tidy-lib/Makefile << 'END-of-www/tidy-lib/Makefile' X# New ports collection makefile for: tidy-lib X# Date created: 21 February 2003 X# Whom: Thierry Thomas <thierry@pompo.net> X# X# $FreeBSD$ X# X XPORTNAME= tidy XPKGNAMESUFFIX= -lib X XMAINTAINER= thierry@pompo.net XCOMMENT= Utility to clean up and pretty print HTML/XHTML/XML (with shared lib) X XMASTERDIR= ${.CURDIR}/../tidy-devel X XWITH_SHLIB= yes X X.include "${MASTERDIR}/Makefile" END-of-www/tidy-lib/Makefile echo x - www/tidy-lib/pkg-descr sed 's/^X//' >www/tidy-lib/pkg-descr << 'END-of-www/tidy-lib/pkg-descr' XThis is tidy-devel, built with a shared lib. X XWhen editing HTML it's easy to make mistakes. Wouldn't it be nice if Xthere was a simple way to fix these mistakes automatically and tidy up Xsloppy editing into nicely layed out markup? Well now there is thanks Xto Hewlett Packard's Dave Raggett. HTML TIDY is a free utility for Xdoing just that. It also works great on the attrociously hard to read Xmarkup generated by specialized HTML editors and conversion tools, and Xcan help you identify where you need to pay further attention on Xmaking your pages more accessible to people with disabilities. X XTidy is able to fix up a wide range of problems and to bring to your Xattention things that you need to work on yourself. Each item found is Xlisted with the line number and column so that you can see where the Xproblem lies in your markup. Tidy won't generate a cleaned up version Xwhen there are problems that it can't be sure of how to handle. These Xare logged as "errors" rather than "warnings". X XWWW: http://tidy.sourceforge.net/ END-of-www/tidy-lib/pkg-descr exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030221215527.365A3775F>