3 files changed, 11 insertions, 46 deletions

diff --git a/www/drupal5-taxonomy_access/Makefile b/www/drupal5-taxonomy_access/Makefile
index 1d5e2128eae1..fc30c5b01b1d 100644
--- a/www/drupal5-taxonomy_access/Makefile
+++ b/www/drupal5-taxonomy_access/Makefile
@@ -1,22 +1,23 @@
-# New ports collection makefile for:	drupal-taxonomy_access
-# Date created:				26 Jan 2007
+# New ports collection makefile for:	drupal5-taxonomy_access
+# Date created:				26 Mar 2007
 # Whom:					Nick Hilliard <nick@foobar.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	taxonomy_access
-DISTVERSION=	4.7.x-1.x-dev
-PORTREVISION=	20070205
-PORTEPOCH=	2
+DISTVERSION=	5.x-1.x-dev
+PORTREVISION=	20070217
 CATEGORIES=	www security
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav/drupal
 
 MAINTAINER=	nick@foobar.org
 COMMENT=	Access control system for the Drupal based on Taxonomy classification
 
-DRUPAL_MODULE=	yes
-MODULE_FILES=	taxonomy_access.install taxonomy_access.module taxonomy_access_admin.inc
+DRUPAL5_MODULE=	yes
+MODULE_FILES=	admin.css taxonomy_access.info taxonomy_access.install \
+		taxonomy_access.module taxonomy_access_admin.inc
 DOC_FILES=	INSTALL.txt LICENSE.txt README.txt UPDATE.txt
 
 .include <bsd.port.pre.mk>
diff --git a/www/drupal5-taxonomy_access/distinfo b/www/drupal5-taxonomy_access/distinfo
index 5154d539c6e7..606201034783 100644
--- a/www/drupal5-taxonomy_access/distinfo
+++ b/www/drupal5-taxonomy_access/distinfo
@@ -1,3 +1,3 @@
-MD5 (drupal/taxonomy_access-4.7.x-1.x-dev.tar.gz) = c52607b2ddf7562c1bd1eadc51099317
-SHA256 (drupal/taxonomy_access-4.7.x-1.x-dev.tar.gz) = 0ad2ffb09bc838c330b3fd28d571196916d38f4e055c0ceaaedac3366dc119c9
-SIZE (drupal/taxonomy_access-4.7.x-1.x-dev.tar.gz) = 32330
+MD5 (drupal/taxonomy_access-5.x-1.x-dev.tar.gz) = 65c010a69664dfdcaa4debce45da293f
+SHA256 (drupal/taxonomy_access-5.x-1.x-dev.tar.gz) = e096e6a5eabd9de1b6fa36e8ec53869f2942dd50b55b55fd9fd0f1e61243db55
+SIZE (drupal/taxonomy_access-5.x-1.x-dev.tar.gz) = 31484
diff --git a/www/drupal5-taxonomy_access/files/patch-taxonomy_access_admin.inc b/www/drupal5-taxonomy_access/files/patch-taxonomy_access_admin.inc
deleted file mode 100644
index d592fe4e2b5e..000000000000
--- a/www/drupal5-taxonomy_access/files/patch-taxonomy_access_admin.inc
+++ /dev/null
@@ -1,36 +0,0 @@
---- taxonomy_access_admin.inc.orig	Sat Nov  4 22:50:38 2006
-+++ taxonomy_access_admin.inc	Fri Feb 23 10:57:47 2007
-@@ -127,7 +127,7 @@
-         $form['taxonomy_access'][$vocab->vid]['default'][$grant] = array(
-           '#type' => 'radios', 
-           '#options' => $radios,
--          '#default_value' => $default[$vocab->vid][$grant],
-+          '#default_value' => isset($default[$vocab->vid][$grant]) ? $default[$vocab->vid][$grant] : 0,
-          );
-       }
-       foreach (array('create', 'list') as $grant) {
-@@ -137,7 +137,7 @@
-          );
-         $form['taxonomy_access'][$vocab->vid]['default'][$grant] = array(
-           '#type' => 'checkbox', 
--          '#default_value' => $default[$vocab->vid][$grant],
-+          '#default_value' => isset($default[$vocab->vid][$grant]) ? $default[$vocab->vid][$grant] : 0,
-          );
-        }
- 
-@@ -150,13 +150,13 @@
-             $form['taxonomy_access'][$vocab->vid]['term'][$term->tid][$grant] = array(
-               '#type' => 'radios', 
-               '#options' => $radios,
--              '#default_value' => $perm[$term->tid][$grant],
-+              '#default_value' => isset($perm[$term->tid][$grant]) ? $perm[$term->tid][$grant] : 0,
-              );
-           }
-           foreach (array('create', 'list') as $grant) {
-             $form['taxonomy_access'][$vocab->vid]['term'][$term->tid][$grant] = array (
-               '#type' => 'checkbox', 
--              '#default_value' => $perm[$term->tid][$grant],
-+              '#default_value' => isset($perm[$term->tid][$grant]) ? $perm[$term->tid][$grant] : 0,
-              );
-           }
-         }