ports/54400: [PATCH] Upgrade textproc/sablotron to 0.98

[Melvyn Sopacua]

>Number:         54400
>Category:       ports
>Synopsis:       [PATCH] Upgrade textproc/sablotron to 0.98
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 11 15:40:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Melvyn Sopacua
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD ghost.lan.webteckies.org 4.8-STABLE FreeBSD 4.8-STABLE #0: Sat Jul 5 18:39:46 CEST 2003 root at ghost.lan.webteckies.org:/usr/obj/usr/src/sys/GHOST i386


	
>Description:
	Update to version 0.98 (april 2003)
>How-To-Repeat:
	
>Fix:


	Patch:
======= START HERE
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/sablotron/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile	27 Feb 2003 12:20:51 -0000	1.25
+++ Makefile	11 Jul 2003 22:14:53 -0000
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	Sablot
-PORTVERSION=	0.97
+PORTVERSION=	0.98
 CATEGORIES=	textproc
 MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} sablot-docs-02.10.01${EXTRACT_SUFX}
 
 MAINTAINER=	skv at FreeBSD.org
 COMMENT=	XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
@@ -26,15 +25,15 @@
 
 INSTALLS_SHLIB=	yes
 
-SHLIB_MAJOR=	70	# API changes counter
+SHLIB_MAJOR=	80	# API changes counter
 PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
+USE_AUTOMAKE_VER= 15
+AUTOMAKE_ARGS=	-a --foreign
+
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-AUTOMAKE_ARGS=	-a
-USE_LIBTOOL=	yes
 
 MAN1=	sabcmd.1
 
@@ -64,7 +63,11 @@
 CONFIGURE_ARGS+=	--enable-debugger
 .endif
 
-WRKSRCDOC=	${WRKDIR}/sablot-docs
+.ifndef(NOPORTDOCS)
+BUILD_DEPENDS+=	${SITE_PERL}/mach/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+CONFIGURE_ARGS+=	--with-html-dir=${DOCSDIR}
+.endif
+
 DOCSLIST=	README README_JS RELEASE
 DOCSDIRLIST=	jsdom-ref sablot sxp
 
@@ -72,20 +75,15 @@
 	@${PERL} -pi -e \
 	's!(?<=libsablot_la_LDFLAGS = -version-info )(\d+):(\d+):\1!${SHLIB_MAJOR}:$$1:${SHLIB_MAJOR}!;' \
 		${WRKSRC}/src/engine/Makefile.am
+.if defined(NOPORTDOCS)
 	@${ECHO} "SUBDIRS = man" > ${WRKSRC}/doc/Makefile.am
+.endif
 
 post-install:
 .ifndef(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
+	@${ECHO_MSG} "===>   Installing README files for ${PKGNAME}"
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DOCSLIST:S!^!${WRKSRC}/!}	${DOCSDIR}
-.for _DOCSDIR in ${DOCSDIRLIST}
-	@${MKDIR} ${DOCSDIR}/${_DOCSDIR}/apidocs
-	@${INSTALL_DATA} ${WRKSRCDOC}/${_DOCSDIR}/*.html ${DOCSDIR}/${_DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRCDOC}/${_DOCSDIR}/apidocs/*.css \
-		${WRKSRCDOC}/${_DOCSDIR}/apidocs/*.html \
-		${DOCSDIR}/${_DOCSDIR}/apidocs/
-.endfor
 .endif
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/sablotron/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	27 Feb 2003 12:20:51 -0000	1.16
+++ distinfo	11 Jul 2003 22:14:53 -0000
@@ -1,2 +1,2 @@
-MD5 (Sablot-0.97.tar.gz) = 253d5e7738d85beecc2c274478431529
+MD5 (Sablot-0.98.tar.gz) = b7ad9b3e0d70607bf18a20fc3d4e4448
 MD5 (sablot-docs-02.10.01.tar.gz) = 4777a9baec0d237fe4be0612eb44d9e7
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/sablotron/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- pkg-plist	27 Feb 2003 12:20:51 -0000	1.11
+++ pkg-plist	11 Jul 2003 22:14:53 -0000
@@ -79,6 +79,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc-abc.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc-grp.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sidebar-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/complete-frameset.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/sparse-frameset.html
 %%PORTDOCS%%%%DOCSDIR%%/sablot/complete-frameset.html
@@ -153,6 +154,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sparse-toc-abc.html
 %%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sparse-toc-grp.html
 %%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sparse-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/api-SablotGetOptions.html
+%%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sidebar-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-content.css
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-toc.css
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-.Building.html
@@ -213,6 +216,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/complete-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sparse-toc-abc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sparse-toc-grp.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sidebar-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/complete-frameset.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/sparse-frameset.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/jsdom-ref/apidocs
======= END HERE

	Add file, files/patch-makefiles

======= START HERE
diff -ur src/engine/Makefile.am Sablot-0.98/src/engine/Makefile.am
--- src/engine/Makefile.am.orig	Fri Jul 11 20:39:40 2003
+++ src/engine/Makefile.am	Fri Jul 11 20:43:07 2003
@@ -1,6 +1,5 @@
 EXPATH = @EXPATH@
 
-dnl CXXFLAGS = @CXXFLAGS@ -Wall -W -Winline -Wno-unused-parameter
 CXXFLAGS = @CXXFLAGS@ @CXXWARNING_FLAGS@
 
 lib_LTLIBRARIES = libsablot.la
--- src/engine/Makefile.in.orig	Mon Apr  7 12:24:19 2003
+++ src/engine/Makefile.in	Fri Jul 11 20:56:44 2003
@@ -480,7 +480,6 @@
 	uninstall-info-am uninstall-libLTLIBRARIES
 
 
-dnl CXXFLAGS = @CXXFLAGS@ -Wall -W -Winline -Wno-unused-parameter
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

====== END HERE

>Release-Note:
>Audit-Trail:
>Unformatted: