From owner-freebsd-ports@FreeBSD.ORG  Sat Aug 11 19:10:12 2012
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6A1CA106567A
	for <freebsd-ports@freebsd.org>; Sat, 11 Aug 2012 19:10:12 +0000 (UTC)
	(envelope-from curtis@occnc.com)
Received: from gateway.ipv6.occnc.com (gateway.ipv6.occnc.com
	[IPv6:2001:470:1f07:1545::1:132])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C3028FC08
	for <freebsd-ports@freebsd.org>; Sat, 11 Aug 2012 19:10:11 +0000 (UTC)
Received: from newharbor.ipv6.occnc.com (newharbor.ipv6.occnc.com
	[IPv6:2001:470:1f07:1545::1:320]) (authenticated bits=0)
	by gateway.ipv6.occnc.com (8.14.5/8.14.5) with ESMTP id q7BJ9kRe036596; 
	Sat, 11 Aug 2012 15:09:47 -0400 (EDT)
	(envelope-from curtis@occnc.com)
Message-Id: <201208111909.q7BJ9kRe036596@gateway.ipv6.occnc.com>
To: freebsd-ports@freebsd.org
From: Curtis Villamizar <curtis@occnc.com>
Date: Sat, 11 Aug 2012 15:09:46 -0400
Cc: rooneg@electricjellyfish.net, curtis@occnc.com
Subject: patches for subversion Makefile and pkg-plist
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: curtis@occnc.com
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2012 19:10:12 -0000


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