Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Aug 2012 15:09:46 -0400
From:      Curtis Villamizar <curtis@occnc.com>
To:        freebsd-ports@freebsd.org
Cc:        rooneg@electricjellyfish.net, curtis@occnc.com
Subject:   patches for subversion Makefile and pkg-plist
Message-ID:  <201208111909.q7BJ9kRe036596@gateway.ipv6.occnc.com>

next in thread | raw e-mail | index | archive | help

FYI-

Doing a make packages on devel/subversion fails if BOOK is defined in
the options.  The two small patches below fixes this.

No bug has been reported.  The port maintainer is on the Cc.

BTW - there is a line with two tabs on it and nothing else.  This is
line 47, right before the existing "BOOK_VERSION=" line.  The two tabs
should be removed as well, but they do no harm.

Curtis


--- Makefile.orig	2012-07-23 13:42:59.000000000 -0400
+++ Makefile	2012-08-11 14:30:47.000000000 -0400
@@ -80,6 +80,7 @@
 BOOK_PDF=	svn-book-r${BOOK_VERSION}.pdf
 DISTFILES+=	${BOOK_HTML}:book ${BOOK_PDF}:book
 PLIST_SUB+=	BOOK=""
+PLIST_SUB+=	BOOK_VERSION="${BOOK_VERSION}"
 .else
 PLIST_SUB+=	BOOK="@comment "
 .endif
--- pkg-plist.orig	2012-07-23 13:43:00.000000000 -0400
+++ pkg-plist	2012-08-11 14:11:20.000000000 -0400
@@ -148,7 +148,7 @@
 %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/warning.png
 %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/styles.css
 %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/svn-book.html
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book.pdf
+%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-r%%BOOK_VERSION%%.pdf
 %%WITHOUT_GETTEXT%%share/locale/de/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/es/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/fr/LC_MESSAGES/subversion.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208111909.q7BJ9kRe036596>