From owner-svn-ports-head@FreeBSD.ORG Tue Nov 5 22:16:35 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B720F611; Tue, 5 Nov 2013 22:16:35 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A42AF2B48; Tue, 5 Nov 2013 22:16:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5MGZFr064826; Tue, 5 Nov 2013 22:16:35 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5MGYNA064822; Tue, 5 Nov 2013 22:16:34 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201311052216.rA5MGYNA064822@svn.freebsd.org> From: Olli Hauer Date: Tue, 5 Nov 2013 22:16:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332919 - head/devel/subversion17 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 22:16:35 -0000 Author: ohauer Date: Tue Nov 5 22:16:34 2013 New Revision: 332919 URL: http://svnweb.freebsd.org/changeset/ports/332919 Log: - book is now a dedicated port Modified: head/devel/subversion17/Makefile head/devel/subversion17/Makefile.common head/devel/subversion17/distinfo head/devel/subversion17/pkg-plist Modified: head/devel/subversion17/Makefile ============================================================================== --- head/devel/subversion17/Makefile Tue Nov 5 22:10:00 2013 (r332918) +++ head/devel/subversion17/Makefile Tue Nov 5 22:16:34 2013 (r332919) @@ -9,11 +9,10 @@ CONFLICTS_INSTALL= subversion-1.[^7].[0- USE_RC_SUBR= svnserve -TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README +PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ - BOOK \ DOCS \ ENHANCED_KEYWORD\ FREEBSD_TEMPLATE\ @@ -37,7 +36,6 @@ OPTIONS_DEFAULT=P4_STYLE_MARKERS \ NEON BDB_DESC= Berkeley DB (deprected in 1.8.x) -BOOK_DESC= Install the Subversion Book ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GNOME_KEYRING_DESC= Build with GNOME Keyring auth support @@ -60,25 +58,15 @@ ENHANCED_KEYWORD_EXTRA_PATCHES= ${PATCHD .include "Makefile.common" -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SUB_FILES= pkg-install -BOOK_VERSION= 4515 - .if !${PORT_OPTIONS:MMAINTAINER_DEBUG} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in .endif -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK} -BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2 -BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf -DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book -.endif - .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" .else @@ -213,14 +201,8 @@ post-install: ${MKREPOS_TARGET} @${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${TXT_DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -. if ${PORT_OPTIONS:MBOOK} - ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${STAGEDIR}${DOCSDIR}/svn-book.pdf -. endif -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve Modified: head/devel/subversion17/Makefile.common ============================================================================== --- head/devel/subversion17/Makefile.common Tue Nov 5 22:10:00 2013 (r332918) +++ head/devel/subversion17/Makefile.common Tue Nov 5 22:16:34 2013 (r332919) @@ -5,12 +5,10 @@ PORTNAME= subversion PORTVERSION= 1.7.13 PORTREVISION?= 0 CATEGORIES+= devel -MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \ - ${MASTER_SITE_LOCAL:S/$/:book/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main +MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion17 -MASTER_SITE_SUBDIR= subversion/:main \ - lev/:book +MASTER_SITE_SUBDIR= subversion + #·setting·PKGSUFFIX·not·possible·wo.·having·a·Mk/Uses·file·and·fixing·a·bunch·of·ports #PKGNAMESUFFIX= 17 @@ -82,10 +80,6 @@ STATIC_CONFIGURE_ON= --enable-all-stati # =============================================================== .include -.if ${PORT_OPTIONS:MBOOK} && !${PORT_OPTIONS:MDOCS} -IGNORE= SVN book requires OPTION DOCS set to ON -.endif - .if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && !${PORT_OPTIONS:MMOD_DAV_SVN} IGNORE= to build mod_dontdothat OPTION mod_dav_svn is required .endif Modified: head/devel/subversion17/distinfo ============================================================================== --- head/devel/subversion17/distinfo Tue Nov 5 22:10:00 2013 (r332918) +++ head/devel/subversion17/distinfo Tue Nov 5 22:16:34 2013 (r332919) @@ -1,6 +1,2 @@ SHA256 (subversion17/subversion-1.7.13.tar.bz2) = e07b3b8559b7b74f8d8fd602424bfc9e4eef95b4ca415eab98a25439d97fe2e9 SIZE (subversion17/subversion-1.7.13.tar.bz2) = 6043884 -SHA256 (subversion17/svn-book-html-r4515.tar.bz2) = 666cef147abc9b917a6bb6527da4f4869221d793126289c715f002bfb2baa508 -SIZE (subversion17/svn-book-html-r4515.tar.bz2) = 473182 -SHA256 (subversion17/svn-book-r4515.pdf) = 962d524ae2c861ec48a45723c484f4f5e1826ee2f9ccfe58b07b96af67b0bf5e -SIZE (subversion17/svn-book-r4515.pdf) = 1943481 Modified: head/devel/subversion17/pkg-plist ============================================================================== --- head/devel/subversion17/pkg-plist Tue Nov 5 22:10:00 2013 (r332918) +++ head/devel/subversion17/pkg-plist Tue Nov 5 22:16:34 2013 (r332919) @@ -152,27 +152,6 @@ man/man8/svnserve.8.gz %%PORTDOCS%%%%DOCSDIR%%/COMMITTERS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch01dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia2.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia3.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia4.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia5.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia6.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia7.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia2.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia3.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia4.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia1.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia2.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/draft.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/note.png -%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/tip.png -%%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 %%NLS%%share/locale/de/LC_MESSAGES/subversion.mo %%NLS%%share/locale/es/LC_MESSAGES/subversion.mo %%NLS%%share/locale/fr/LC_MESSAGES/subversion.mo @@ -419,8 +398,6 @@ man/man8/svnserve.8.gz @dirrm %%DATADIR%%/bdb @dirrm %%DATADIR%%/backup @dirrm %%DATADIR%% -%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images -%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/subversion-1 %%TOOLS%%@dirrm bin/svn-tools