From 8e0aafa691990add38f3f4a96ba175b3e1508caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 15 Dec 2003 23:06:12 +0000 Subject: [PATCH] Upgrade to 1.63.0, and tidy up a little. --- textproc/docbook-xsl/Makefile | 25 ++++++++++++----------- textproc/docbook-xsl/distinfo | 2 +- textproc/docbook-xsl/files/pkg-install.in | 7 ++++--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile index a1d675d8cc60..7cc5ff7e71e6 100644 --- a/textproc/docbook-xsl/Makefile +++ b/textproc/docbook-xsl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= docbook-xsl -PORTVERSION= 1.62.4 +PORTVERSION= 1.63.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= docbook @@ -22,8 +22,8 @@ INSTDIR= share/xsl/docbook PINSTDIR= ${PREFIX}/${INSTDIR} COPYDIRS= common fo extensions html htmlhelp images \ javahelp lib manpages params template xhtml -PKGINSTALL= ${WRKSRC}/pkg-install -PKGDEINSTALL= ${WRKSRC}/pkg-deinstall +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall NO_BUILD= yes XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr @@ -32,6 +32,14 @@ CATALOG_PORTS= ${XMLDIR}/catalog.ports post-extract: ${FIND} ${WRKSRC} -name '.#*' -delete +post-configure: + @${SED} -e 's,@INSTDIR@,${INSTDIR},g ; \ + s,@XMLCATMGR@,${XMLCATMGR},g ; \ + s,@CATALOG_PORTS_XML@,${CATALOG_PORTS},g' \ + < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} + @${SED} -e 's,@XMLCATMGR@,${XMLCATMGR},g ; \ + s,@CATALOG_PORTS_XML@,${CATALOG_PORTS},g' \ + < ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL} do-install: .ifndef NOPORTDOCS ${MKDIR} ${DOCSDIR} @@ -43,14 +51,7 @@ do-install: ${TAR} -xf - -C${PINSTDIR}) post-install: - @${SED} -e 's,@INSTDIR@,${INSTDIR},g ; \ - s,@XMLCATMGR@,${XMLCATMGR},g ; \ - s,@CATALOG_PORTS_XML@,${CATALOG_PORTS},g' \ - < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's,@XMLCATMGR@,${XMLCATMGR},g ; \ - s,@CATALOG_PORTS_XML@,${CATALOG_PORTS},g' \ - < ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL} - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${ENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include diff --git a/textproc/docbook-xsl/distinfo b/textproc/docbook-xsl/distinfo index f36bdd1ad448..63c6a7689fd6 100644 --- a/textproc/docbook-xsl/distinfo +++ b/textproc/docbook-xsl/distinfo @@ -1 +1 @@ -MD5 (docbook-xsl-1.62.4.tar.gz) = 4f33db39db7fa95b50143ad609d734a0 +MD5 (docbook-xsl-1.63.0.tar.gz) = d33bf0f44aa9e52def169049752528a4 diff --git a/textproc/docbook-xsl/files/pkg-install.in b/textproc/docbook-xsl/files/pkg-install.in index a26b25a8b2f1..92443952c25d 100644 --- a/textproc/docbook-xsl/files/pkg-install.in +++ b/textproc/docbook-xsl/files/pkg-install.in @@ -4,8 +4,9 @@ # # Based on http://xmlsoft.org/buildDocBookCatalog file. # -# in vi/vim grab VERSIONS string with command: -# !!echo -n "VERSIONS='current ";fetch -qo - http://cvs.sf.net/cgi-bin/viewcvs.cgi/docbook/xsl/VERSION|sed -nE 's/.*Version (.*) released./\1/gp'|sort|sed -e '1,3d'|paste -sd ' ' -|tr \\n \' +# Run the following command to generate a new VERSIONS string: +# perl -n -e '/Version ([\d.]+) rel/ && print "$1\n"' work/*/ChangeLog | +# sort -n | tr '\n' ' ' # # -- Rui Lopes @@ -18,7 +19,7 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 fi -VERSIONS='current 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 1.48 1.49 1.50.0 1.50.1-EXP 1.50.1-EXP2 1.51.0 1.51.1 1.52.0 1.52.1 1.52.2 1.53.0 1.54.0 1.54.1 1.55.0 1.56.0 1.56.1 1.57.0 1.58.0 1.58.1 1.59.0 1.59.1 1.59.2 1.60.0 1.60.1 1.60.1 1.61.0 1.61.1 1.61.2 1.61.3' +VERSIONS='1.36 1.37 1.38 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 1.48 1.49 1.50.0 1.51.0 1.51.1 1.52.0 1.52.1 1.52.2 1.53.0 1.54.0 1.54.1 1.55.0 1.56.0 1.56.1 1.57.0 1.58.0 1.58.1 1.59.0 1.59.1 1.59.2 1.60.0 1.60.1 1.60.1 1.61.0 1.61.1 1.61.2 1.61.3 1.62.0 1.62.1 1.62.2 1.62.3 1.62.4 1.63.0' if [ ! -f ${CATALOG_XSL} ]; then ${XMLCATMGR} -c "${CATALOG_XSL}" create