Move Horde's PHPLIB library into the horde subtree and protect it with

appropriate settings in horde.conf.

3 files changed, 34 insertions, 30 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index 12a64a41ac4..baf81573308 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/12 15:26:04 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/13 03:54:00 jlam Exp $
 
 DISTNAME=	horde-1.2.4
 CATEGORIES=	www
@@ -17,7 +17,7 @@ INSTALL_FILE=	${WRKDIR}/INSTALL
 CONFDIR=	${PREFIX}/etc/httpd
 DOCDIR=		${PREFIX}/share/doc/horde
 HORDEDIR=	${PREFIX}/share/horde
-PHPLIBDIR=	${PREFIX}/share/horde-phplib
+PHPLIBDIR=	${PREFIX}/share/horde/phplib
 
 MESSAGE_SUBST+=	HORDEDIR=${HORDEDIR}
 MESSAGE_SUBST+=	PHPLIBDIR=${PHPLIBDIR}
diff --git a/www/horde/files/horde.conf.dist b/www/horde/files/horde.conf.dist
index d9993e908ae..b1e98690e99 100644
--- a/www/horde/files/horde.conf.dist
+++ b/www/horde/files/horde.conf.dist
@@ -1,4 +1,4 @@
-# $NetBSD: horde.conf.dist,v 1.1.1.1 2001/02/12 15:26:04 jlam Exp $
+# $NetBSD: horde.conf.dist,v 1.2 2001/02/13 03:54:00 jlam Exp $
 #
 # Horde configuration file fragment for Apache
 
@@ -40,6 +40,10 @@
     Order deny,allow
     Deny from all
 </Directory>
+<Directory "@PHPLIBDIR@">
+    Order deny,allow
+    Deny from all
+</Directory>
 <Directory "@HORDEDIR@/scripts">
     Order deny,allow
     Deny from all
diff --git a/www/horde/pkg/PLIST b/www/horde/pkg/PLIST
index d1dede10bd6..031e728d96b 100644
--- a/www/horde/pkg/PLIST
+++ b/www/horde/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/02/12 15:26:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/13 03:54:00 jlam Exp $
 etc/httpd/horde.conf.dist
 sbin/horde_setup
 sbin/horde_secure
@@ -10,32 +10,6 @@ share/doc/horde/HELP
 share/doc/horde/INSTALL
 share/doc/horde/README
 share/doc/horde/SECURITY
-share/horde-phplib/README
-share/horde-phplib/ct_dba.inc
-share/horde-phplib/ct_dbm.inc
-share/horde-phplib/ct_file.inc
-share/horde-phplib/ct_informix.inc
-share/horde-phplib/ct_ldap.inc
-share/horde-phplib/ct_null.inc
-share/horde-phplib/ct_shm.inc
-share/horde-phplib/ct_split_sql.inc
-share/horde-phplib/ct_sql.inc
-share/horde-phplib/ct_sql_compat.inc
-share/horde-phplib/db_msql.inc
-share/horde-phplib/db_mssql.inc
-share/horde-phplib/db_mysql.inc
-share/horde-phplib/db_oci8.inc
-share/horde-phplib/db_odbc.inc
-share/horde-phplib/db_oracle.inc
-share/horde-phplib/db_pgsql.inc
-share/horde-phplib/db_sybase.inc
-share/horde-phplib/db_usql.inc
-share/horde-phplib/horde_loginform.ihtml
-share/horde-phplib/horde_perminvalid.ihtml
-share/horde-phplib/local.inc.dist
-share/horde-phplib/page.inc
-share/horde-phplib/prepend.php3.dist
-share/horde-phplib/session.inc
 share/horde/config/MOTD.html.dist
 share/horde/config/header.txt.dist
 share/horde/config/horde.php3.dist
@@ -194,6 +168,32 @@ share/horde/login.php3
 share/horde/logo.php3
 share/horde/menu.php3
 share/horde/modules.php3
+share/horde/phplib/README
+share/horde/phplib/ct_dba.inc
+share/horde/phplib/ct_dbm.inc
+share/horde/phplib/ct_file.inc
+share/horde/phplib/ct_informix.inc
+share/horde/phplib/ct_ldap.inc
+share/horde/phplib/ct_null.inc
+share/horde/phplib/ct_shm.inc
+share/horde/phplib/ct_split_sql.inc
+share/horde/phplib/ct_sql.inc
+share/horde/phplib/ct_sql_compat.inc
+share/horde/phplib/db_msql.inc
+share/horde/phplib/db_mssql.inc
+share/horde/phplib/db_mysql.inc
+share/horde/phplib/db_oci8.inc
+share/horde/phplib/db_odbc.inc
+share/horde/phplib/db_oracle.inc
+share/horde/phplib/db_pgsql.inc
+share/horde/phplib/db_sybase.inc
+share/horde/phplib/db_usql.inc
+share/horde/phplib/horde_loginform.ihtml
+share/horde/phplib/horde_perminvalid.ihtml
+share/horde/phplib/local.inc.dist
+share/horde/phplib/page.inc
+share/horde/phplib/prepend.php3.dist
+share/horde/phplib/session.inc
 share/horde/problem.php3
 share/horde/scripts/add_horde_string.pl
 share/horde/scripts/add_lang_string.pl