- Use %%DATADIR%% to calm portlint - Remove whitespaces at end of lines to calm portlint - Remove USE_SIZE to calm portlint - Fix some typo in the preliminary notice - Add $FreeBSD$ tags where missing (patches and pkg-plist) - No longer build and install multi-file HTML Subversion Book as its broken but rather install the single-file HTML and PDF versions provided in the distribution [1] - Handle NOPORTDOCS/WITH_BOOK possible issues NOTE: The Subversion book knob has changed. It is now 'WITH_BOOK'. NOTE2: Should we bump PORTREVISION here? IMHO we shouldn't as the upgrade is probably not worth it for the end-user... Reported by: mah [1] Removed file(s): - files/patch-doc::book::Makefile Generated with FreeBSD Port Tools 0.63
Responsible Changed From-To: freebsd-ports-bugs->lev Over to maintainer.
Some improvements: - Bump PORTREVISION - Install the images from the book Reported by: bmah Index: Makefile =================================================================== RCS file: /var/fcvs/ports/devel/subversion/Makefile,v retrieving revision 1.73 diff -u -r1.73 Makefile --- Makefile 11 Nov 2004 06:50:34 -0000 1.73 +++ Makefile 31 Dec 2004 01:42:29 -0000 @@ -6,6 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ @@ -16,7 +17,6 @@ INSTALLS_SHLIB= yes -USE_SIZE= yes USE_BZIP2= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes @@ -96,7 +96,7 @@ #JAVA_BUILD= yes #JAVA_RUN= yes #.include "${PORTSDIR}/Mk/bsd.java.mk" -#CONFIGURE_ARGS+= --enable-javahl --with-jdk=${JAVA_HOME} +#CONFIGURE_ARGS+= --enable-javahl --with-jdk=${JAVA_HOME} #PLIST_SUB+= WITH_JAVA="" #.else #PLIST_SUB+= WITH_JAVA="@comment " @@ -108,7 +108,7 @@ CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} .else -CONFIGURE_ARGS+= --without-swig --disable-swig-bindings +CONFIGURE_ARGS+= --without-swig --disable-swig-bindings .endif .if defined(WITH_MOD_DAV_SVN) @@ -150,10 +150,8 @@ PLIST_SUB+= SVNSERVE_WRAPPER="@comment " .endif -.if defined(WITH_BOOK_HTML) +.if !defined(NOPORTDOCS) && defined(WITH_BOOK) PORTDOCS+= book -BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ - ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt .endif SCRIPTS= @@ -234,17 +232,17 @@ @${ECHO_MSG} "" @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'" @${ECHO_MSG} "You could change these settings by defining SVNREPOS and SVNGROUP" - @${ECHO_MSG} "" .endif @${ECHO_MSG} "" -.if defined(WITH_BOOK_HTML) - @${ECHO_MSG} "Subversion Book (HTML) enabled." +.if !defined(NOPORTDOCS) +.if defined(WITH_BOOK) + @${ECHO_MSG} "Subversion Book will be installed." .else - @${ECHO_MSG} "You can install the Subversion Book (HTML) by defining" - @${ECHO_MSG} "WITH_BOOK_HTML." + @${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK." +.endif .endif @${ECHO_MSG} "" - @${ECHO_MSG} "May useful scripts will be installed into ${PREFIX}/share/subversion" + @${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion" post-extract: @${RM} -r ${WRKSRC}/neon @@ -290,12 +288,6 @@ # cd ${WRKSRC} ; \ # ${MAKE} javahl #.endif -.if defined(WITH_BOOK_HTML) - cd ${WRKSRC}/doc/book/tools/ ; \ - ${LN} -s ${PREFIX}/share/xsl/docbook xsl - cd ${WRKSRC}/doc/book ; \ - ${MAKE} all-html -.endif .if defined(WITH_MOD_DAV_SVN) pre-install: @@ -311,9 +303,12 @@ for f in ${TXT_DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ done -.if defined(WITH_BOOK_HTML) - cd ${WRKSRC}/doc/book ; \ - ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR} +.if defined(WITH_BOOK) + @${MKDIR} ${DOCSDIR}/book/images + cd ${WRKSRC}/doc/book/book; \ + ${INSTALL_DATA} svn-book.html svn-book.pdf ${DOCSDIR}/book + cd ${WRKSRC}/doc/book/book/images; \ + ${INSTALL_DATA} *.png ${DOCSDIR}/book/images .endif .endif .if defined(WITH_PERL)
State Changed From-To: open->closed Committed with changes, thanks!