2 files changed, 18 insertions, 0 deletions

diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index 5bb0ef687a42..489d0c74b547 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -334,6 +334,13 @@ pre-install:
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .endif
 
+	# Copy RCSID tag from conf.xml into conf.php to stop Horde complaining
+	@if ! ${GREP} -q -e "$$Horde.*conf\.xml" ${WRKSRC}/config/conf.php.dist; then \
+	  ${GREP} -h "$$Horde.*conf\.xml" ${WRKSRC} ${WRKSRC}/config/conf.xml \
+	    | ${SED} -e 's#^ *<!--#//#' -e 's# *--> *$$##g' \
+	    >> ${WRKSRC}/config/conf.php.dist; \
+	fi
+
 do-install:
 	@${MKDIR}  ${HORDEDIR}
 .for REP in ${SUB_DIRS}
diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist
index b6c9440b422b..48fa21e72c1d 100644
--- a/www/horde4-base/pkg-plist
+++ b/www/horde4-base/pkg-plist
@@ -1454,6 +1454,17 @@
 %%HORDEDIR%%/util/barcode.php
 %%HORDEDIR%%/util/icon_browser.php
 %%HORDEDIR%%/util/regex_test.php
+@exec mkdir -p %D/%%HORDEDIR%%/lib/File/tests
+@exec mkdir -p %D/%%HORDEDIR%%/lib/Horde/Text/tests
+@exec mkdir -p %D/%%HORDEDIR%%/lib/Horde/docs/examples
+@exec mkdir -p %D/%%HORDEDIR%%/lib/Horde/tests
+@exec mkdir -p %D/%%HORDEDIR%%/lib/Text/docs/examples
+@exec mkdir -p %D/%%HORDEDIR%%/lib/Text/tests
+@exec mkdir -p %D/%%HORDEDIR%%/lib/VFS/tests
+@exec mkdir -p %D/%%HORDEDIR%%/lib/XML/docs/examples
+@exec mkdir -p %D/%%HORDEDIR%%/lib/XML/tests
+@exec mkdir -p %D/%%HORDEDIR%%/lib/data
+@exec mkdir -p %D/%%HORDEDIR%%/lib/docs
 @dirrm %%HORDEDIR%%/util
 @dirrm %%HORDEDIR%%/themes/simplex/graphics
 @dirrm %%HORDEDIR%%/themes/simplex