[patch] re-implements two lines that were inadvertently deleted in the last patch

base-1.2.7-r1.diff (text/plain), 2.12 KB, created by Travis Post on 2006-12-17 02:53:48 UTC

--- base-1.2.7.ebuild	2006-12-17 02:13:15.000000000 -0800
+++ base-1.2.7-r1.ebuild	2006-12-17 02:45:39.000000000 -0800
@@ -11,14 +11,18 @@
 
 DESCRIPTION="A web-based front-end to the Snort IDS."
 HOMEPAGE="http://base.secureideas.net"
-SRC_URI="mirror://sourceforge/secureideas/${P}.tar.gz"
+DBTYPES="mssql mysql oracle postgres"
+IUSE="doc gd minimal ${DBTYPES}"
+
+SRC_URI="mirror://sourceforge/secureideas/${P}.tar.gz
+	doc? ( !minimal? ( 
+		http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz 
+	) )"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 # SLOT is intentionally omitted because this package uses webapp-config
 
-DBTYPES="mssql mysql oracle postgres"
-IUSE="gd ${DBTYPES}"
-
 # BASE *should* work with any php-driven web server, so only require Apache
 # when the user has an apache use-flag set.
 want_apache
@@ -152,12 +156,26 @@
 src_install() {
 	webapp_src_preinst
 
-	# Install the docs once in the standard /usr/share/doc/${PF}/DOCDESTREE
-	# location instead of installing them in every virtual host directory.
-	cd docs
-	dodoc *
+	if use doc; then
+		if ! use minimal; then
+			# Install the signature documentation
+			dodir ${MY_HTDOCSDIR}/signatures
+			insinto ${MY_HTDOCSDIR}/signatures
+			for TXT in ${WORKDIR}/doc/signatures/*; do
+				doins "${TXT}"
+			done
+		fi
+
+		# Install the docs once in the standard /usr/share/doc/${PF}/DOCDESTREE
+		# location instead of installing them in every virtual host directory.
+		cd docs
+		dodoc *
+	fi
+
 	cd "${S}"
-	rm -rf docs
+	for JUNK in docs doc rules; do
+		rm -rf "${JUNK}"
+	done
 
 	# Install the config files in the normal location (/etc/${PN}).
 	insinto ${CONF_DIR} || die "Unable to insinto ${CONF_DIR}"
@@ -181,7 +199,7 @@
 	# Notify the user of any problems at the very end.
 	if [ "${HTTPD_GROUP}" == "root" ]; then
 			ewarn ""
-			ewarn "It looks like you are not using Apache or Cherokee"
+			ewarn "It looks like you are not using Apache"
 			ewarn "as your web server. For BASE to work properly, you will"
 			ewarn "need to change the ownership of ${CONF_DIR}/${CONF_NEW} to"
 			ewarn "root:[www user] To use Apache, add \"apache\" or"