From ce6263f97015f1238bc6d46f1b4d4e2c78c5dd02 Mon Sep 17 00:00:00 2001 From: edwin Date: Mon, 24 Feb 2003 07:48:05 +0000 Subject: www/tidy-devel: upgrading to 030220 PR: ports/48549 Submitted by: Thierry Thomas --- www/tidy-devel/Makefile | 48 ++++++++++++++++------ www/tidy-devel/distinfo | 2 +- www/tidy-devel/files/patch-Makefile | 37 ----------------- www/tidy-devel/files/patch-build_gmake_Makefile | 37 +++++++++++++++++ .../files/patch-build_gnuauto_configure.in | 11 +++++ .../files/patch-build_gnuauto_include_Makefile.am | 13 ++++++ .../files/patch-build_gnuauto_src_Makefile.am | 11 +++++ www/tidy-devel/pkg-plist | 2 + 8 files changed, 111 insertions(+), 50 deletions(-) delete mode 100644 www/tidy-devel/files/patch-Makefile create mode 100644 www/tidy-devel/files/patch-build_gmake_Makefile create mode 100644 www/tidy-devel/files/patch-build_gnuauto_configure.in create mode 100644 www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am create mode 100644 www/tidy-devel/files/patch-build_gnuauto_src_Makefile.am (limited to 'www/tidy-devel') diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile index 3f40a260c5c..01fbafd2a82 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 2f62c38d8ad..11c6cabb52b 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-Makefile deleted file mode 100644 index 28d5e905c4b..00000000000 --- a/www/tidy-devel/files/patch-Makefile +++ /dev/null @@ -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 --git a/www/tidy-devel/files/patch-build_gmake_Makefile b/www/tidy-devel/files/patch-build_gmake_Makefile new file mode 100644 index 00000000000..93d71b5ecee --- /dev/null +++ b/www/tidy-devel/files/patch-build_gmake_Makefile @@ -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 --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 00000000000..1458f43b9b9 --- /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 00000000000..3b6dac467ef --- /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 00000000000..8e4ce60e6f8 --- /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 64190c6fe97..9a57faa088d 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 -- cgit