Bug 54400 - [PATCH] Upgrade textproc/sablotron to 0.98
Summary: [PATCH] Upgrade textproc/sablotron to 0.98
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: skv
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-07-11 23:40 UTC by Melvyn Sopacua
Modified: 2003-07-14 17:20 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (747 bytes, patch)
2003-07-11 23:40 UTC, Melvyn Sopacua
no flags Details | Diff
patch-depends (2.27 KB, text/plain)
2003-07-12 10:55 UTC, Jens Rehsack
no flags Details
patch-depends (3.24 KB, text/plain)
2003-07-12 11:44 UTC, Jens Rehsack
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Melvyn Sopacua 2003-07-11 23:40:10 UTC
	Update to version 0.98 (april 2003)

Fix: Patch:
======= START HERE
Add file, files/patch-makefiles

======= START HERE


====== END HERE--6FW24RcfX35OhgpoXUitV2fhuF70HKtwvwj7e28ueBg0TqBF
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

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@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
Comment 1 Erwin Lansing freebsd_committer freebsd_triage 2003-07-12 10:16:40 UTC
Responsible Changed
From-To: freebsd-ports-bugs->skv

Over to maintainer
Comment 2 Jens Rehsack 2003-07-12 10:55:58 UTC
Don't forget to patch all dependent ports by upgrading the required 
libsablot :-)

Jens
Comment 3 Jens Rehsack 2003-07-12 11:44:11 UTC
Oops, sent patch which wont work. I generated it automatically, but this 
one works fine. It also recognizes new port lang/php5

Sorry 'bout my previous wrong patch

Jens
Comment 4 skv freebsd_committer freebsd_triage 2003-07-14 17:20:26 UTC
State Changed
From-To: open->closed

Committed with changes, thanks.