3 files changed, 57 insertions, 76 deletions

diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index d86820b8f909..491f256403ae 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -6,11 +6,10 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.4.6
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
-		http://svnbook.red-bean.com/en/1.2/:bookhtml \
-		http://svnbook.red-bean.com/en/1.2/images/:bookhtmlimg \
-		http://svnbook.red-bean.com/en/1.2/:bookpdf
+		http://svnbook.red-bean.com/en/${PORTVERSION:R}/:book
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
@@ -18,6 +17,8 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
+CONFLICTS=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_LDCONFIG=	yes
@@ -33,12 +34,8 @@ USE_RC_SUBR=	svnserve
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
-MANCOMPRESSED=	no
 
 TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
-.if !defined(NOPORTDOCS)
-PORTDOCS=	${TXT_DOCS}
-.endif
 
 OPTIONS=	PERL		"Perl bindings" off \
 		PYTHON		"Python bindings" off \
@@ -211,16 +208,12 @@ SUB_LIST+=	SVNSERVE_BIN_EXT=""
 .endif
 
 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
-PORTDOCS+=	book
-DISTFILES+=	svn-book.html:bookhtml \
-		ch01dia1.png:bookhtmlimg ch02dia1.png:bookhtmlimg \
-		ch02dia2.png:bookhtmlimg ch02dia3.png:bookhtmlimg \
-		ch02dia5.png:bookhtmlimg ch02dia6.png:bookhtmlimg \
-		ch02dia7.png:bookhtmlimg ch04dia1.png:bookhtmlimg \
-		ch04dia2.png:bookhtmlimg ch04dia3.png:bookhtmlimg \
-		ch04dia4.png:bookhtmlimg ch08dia1.png:bookhtmlimg \
-		ch08dia2.png:bookhtmlimg \
-		svn-book.pdf:bookpdf
+BOOK_HTML=	svn-book-html.tar.bz2
+BOOK_PDF=	svn-book.pdf
+DISTFILES+=	${BOOK_HTML}:book ${BOOK_PDF}:book
+PLIST_SUB+=	BOOK=""
+.else
+PLIST_SUB+=	BOOK="@comment "
 .endif
 
 .if defined(WITH_ASVN)
@@ -336,7 +329,7 @@ pre-everything::
 	@${ECHO_MSG} "You can install asvn from contrib by defining WITH_ASVN"
 .endif
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion"
+	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}}"
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/neon
@@ -345,8 +338,8 @@ post-extract:
 
 post-patch:
 .if ${PREFIX} != "/usr"
-	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
-	@${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
+	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
+	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
@@ -398,21 +391,18 @@ pre-install:
 .endif
 
 post-install:	${MKREPOS_TARGET}
-	@${MKDIR} ${PREFIX}/share/subversion
+	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/tools ; \
-	  tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
-	@${CHMOD} -R a-st,o+rX ${PREFIX}/share/subversion
+	  ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${DATADIR} -xf -
+	@${CHMOD} -R a-st,o+rX ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${TXT_DOCS}; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
+	  ${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
-	${MKDIR} ${DOCSDIR}/book
-	${MKDIR} ${DOCSDIR}/book/images
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/svn-book.html ${DOCSDIR}/book
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.png         ${DOCSDIR}/book/images
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/svn-book.pdf  ${DOCSDIR}/book
+	${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR}
+	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}
 .endif
 .endif
 .if defined(WITH_ASVN)
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index efda8a51b500..4d4cbe489ebe 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,48 +1,9 @@
 MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
 SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
 SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
-MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
-SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
-SIZE (subversion/svn-book.html) = 1151598
-MD5 (subversion/ch01dia1.png) = d5cf54020bcbb99fb12150481d94bffa
-SHA256 (subversion/ch01dia1.png) = cffbe5942f45561567b92899d61a3ee8251384667454a8eb9d7bf0cd54b9a5ad
-SIZE (subversion/ch01dia1.png) = 55406
-MD5 (subversion/ch02dia1.png) = 9f98bd2bd15fabc36d55db0572a7b32b
-SHA256 (subversion/ch02dia1.png) = 77b8551c1714539d083ce8f3a26e51392b53d1298255cdb82bfe4a67cd32ab16
-SIZE (subversion/ch02dia1.png) = 2544
-MD5 (subversion/ch02dia2.png) = 4c3e6e55f9a0c50d6925f5ca4587e47b
-SHA256 (subversion/ch02dia2.png) = 140e3517a6f770a5b12d4bd598171b8d4ea3a12edea1cc2f161dfda3bbd88a8b
-SIZE (subversion/ch02dia2.png) = 11754
-MD5 (subversion/ch02dia3.png) = e9cd778666a999ab329a069efed37500
-SHA256 (subversion/ch02dia3.png) = ede7d162f22e208b61f1350f923c2db10e8df73b0b7895d8619a5512640a7f86
-SIZE (subversion/ch02dia3.png) = 14307
-MD5 (subversion/ch02dia5.png) = f4ec352cd843cf130fe500cfdbc358ca
-SHA256 (subversion/ch02dia5.png) = bb0a96acc02c877b5129cce42feccec7287b226db474f5726551881571e1608c
-SIZE (subversion/ch02dia5.png) = 12176
-MD5 (subversion/ch02dia6.png) = d4eac305c63464419d945a616284c4ce
-SHA256 (subversion/ch02dia6.png) = 8a3b9952ad43945063faeb7c02b476ebde1b1095f7418073637b9ca22613019e
-SIZE (subversion/ch02dia6.png) = 4023
-MD5 (subversion/ch02dia7.png) = 067bb47f6fe3dcdeefac6755da876cdf
-SHA256 (subversion/ch02dia7.png) = 8d14d9d5634e2bcaa839a96295cbd351b366bd20cf84d09b14d6870248bf5a7e
-SIZE (subversion/ch02dia7.png) = 5495
-MD5 (subversion/ch04dia1.png) = a157a2c9fc737cab3db918aaf489bf7e
-SHA256 (subversion/ch04dia1.png) = 8af0c00ca180323ab6a343579400d40f804104d5d9524db477bec2e4d1be5a58
-SIZE (subversion/ch04dia1.png) = 2713
-MD5 (subversion/ch04dia2.png) = 5c6b571282ff05d99a99d69fdef50378
-SHA256 (subversion/ch04dia2.png) = c007babb6fcb339e741ee241c987375dc216cd2355c21edcdc68b49c8e346d47
-SIZE (subversion/ch04dia2.png) = 4127
-MD5 (subversion/ch04dia3.png) = 7226def64bf6dea42b547d968b853a08
-SHA256 (subversion/ch04dia3.png) = 258d1fd04ea2d2ec9ed6943130d802ffa28bffb066a9fba3ca78ea593fa7e4d3
-SIZE (subversion/ch04dia3.png) = 6537
-MD5 (subversion/ch04dia4.png) = 03cbad24eee5abe0cadc452be19c2613
-SHA256 (subversion/ch04dia4.png) = fbe91cc08a34630929bc9608d0121041c3135b9afcfe513e0fa1665e2cda7cdc
-SIZE (subversion/ch04dia4.png) = 3849
-MD5 (subversion/ch08dia1.png) = 870a5b07012b21f7b187fdb1d912d8d6
-SHA256 (subversion/ch08dia1.png) = 6217bba808c33d80ce2be59e4972d5387de267d21a4e7e96c79bab05d84320da
-SIZE (subversion/ch08dia1.png) = 2644
-MD5 (subversion/ch08dia2.png) = a72633f0cc8f6f83fa4d8a96b47202ca
-SHA256 (subversion/ch08dia2.png) = da286b9a8cd3224226d28b9662904ef2c362cf56dbec23a2f119e96e9fd36daf
-SIZE (subversion/ch08dia2.png) = 3910
-MD5 (subversion/svn-book.pdf) = 37ecce7fa958e320b9b7e09edc2e2d46
-SHA256 (subversion/svn-book.pdf) = 43e226b7210b71a1220e60ac425412405a184767ee363960ef3c4464605947d2
-SIZE (subversion/svn-book.pdf) = 1336362
+MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527
+SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0
+SIZE (subversion/svn-book-html.tar.bz2) = 366277
+MD5 (subversion/svn-book.pdf) = b4f04dfc6cae59212c255322e4fa27a4
+SHA256 (subversion/svn-book.pdf) = d3fffd8191d62faf2a571cfe96bdadc772ff90bd5e32364f888f9b2d7fd81b5d
+SIZE (subversion/svn-book.pdf) = 1462807
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index e0a7d65283da..fc91664407c5 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -98,6 +98,33 @@ lib/libsvn_wc-1.a
 lib/libsvn_wc-1.la
 lib/libsvn_wc-1.so
 lib/libsvn_wc-1.so.0
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COMMITTERS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%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/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
 %%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
@@ -225,6 +252,7 @@ lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
 %%WITH_JAVA%%lib/libsvnjavahl-1.a
+%%WITH_JAVA%%lib/libsvnjavahl-1.la
 %%WITH_JAVA%%lib/libsvnjavahl-1.so
 %%WITH_JAVA%%lib/libsvnjavahl-1.so.0
 %%WITH_JAVA%%lib/svn-javahl/svn-javahl.jar
@@ -363,6 +391,9 @@ lib/libsvn_wc-1.so.0
 %%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext
 %%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn
 %%WITH_RUBY%%@dirrm %%RUBY_SITELIBDIR%%/svn
+%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images
+%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%/bdb
 @dirrm %%DATADIR%%/client-side
@@ -381,5 +412,4 @@ lib/libsvn_wc-1.so.0
 @dirrm %%DATADIR%%/test-scripts/svntest
 @dirrm %%DATADIR%%/test-scripts
 @dirrm %%DATADIR%%/xslt
-@dirrm share/subversion
-
+@dirrm %%DATADIR%%