6 files changed, 64 insertions, 57 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 86eca1bba5bb..fadae0e93212 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -190,8 +191,8 @@ do-install:	.SILENT
 		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${WWWDIR}/contrib/{}" \;
 .endif
 # This are empty directories but they are needed,
-# else ckecksetup.pl does not work as expected!
-	${MKDIR} ${WWWDIR}/lib ${WWWDIR}/t
+# else ckecksetup.pl will fail!
+	${MKDIR} ${WWWDIR}/lib ${WWWDIR}/t ${WWWDIR}/xt
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/bugzilla/Makefile.common b/devel/bugzilla/Makefile.common
index 1c090a3bc882..dcd5b01bd8b9 100644
--- a/devel/bugzilla/Makefile.common
+++ b/devel/bugzilla/Makefile.common
@@ -2,6 +2,8 @@
 # $FreeBSD$
 #
 
+DIST_SUBDIR=	${PORTNAME}
+
 CONFLICTS=	bugzilla-3.*
 
 PORTSCOUT=	limitw:1,even
diff --git a/devel/bugzilla/distinfo b/devel/bugzilla/distinfo
index 8238f8694f03..f7e13e78701c 100644
--- a/devel/bugzilla/distinfo
+++ b/devel/bugzilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugzilla-4.0.1.tar.gz) = 7be2f05bb187c4e15caef2a98497e12c87a69ad5aeaf654b2197ae5b48e93209
-SIZE (bugzilla-4.0.1.tar.gz) = 2985506
+SHA256 (bugzilla/bugzilla-4.0.1.tar.gz) = 7be2f05bb187c4e15caef2a98497e12c87a69ad5aeaf654b2197ae5b48e93209
+SIZE (bugzilla/bugzilla-4.0.1.tar.gz) = 2985506
diff --git a/devel/bugzilla/pkg-plist b/devel/bugzilla/pkg-plist
index 96424cc2701c..ebd13b73a8cd 100644
--- a/devel/bugzilla/pkg-plist
+++ b/devel/bugzilla/pkg-plist
@@ -377,30 +377,22 @@
 %%WWWDIR%%/index.cgi
 %%WWWDIR%%/install-module.pl
 %%WWWDIR%%/jobqueue.pl
+%%WWWDIR%%/js/TUI.js
+%%WWWDIR%%/js/attachment.js
+%%WWWDIR%%/js/bug.js
+%%WWWDIR%%/js/change-columns.js
+%%WWWDIR%%/js/comments.js
+%%WWWDIR%%/js/expanding-tree.js
+%%WWWDIR%%/js/field.js
+%%WWWDIR%%/js/flag.js
+%%WWWDIR%%/js/global.js
+%%WWWDIR%%/js/params.js
+%%WWWDIR%%/js/productform.js
+%%WWWDIR%%/js/util.js
 %%WWWDIR%%/js/yui/animation/animation-min.js
-%%WWWDIR%%/js/yui/assets/skins/sam/autocomplete.css
-%%WWWDIR%%/js/yui/assets/skins/sam/button.css
-%%WWWDIR%%/js/yui/assets/skins/sam/calendar.css
-%%WWWDIR%%/js/yui/assets/skins/sam/carousel.css
-%%WWWDIR%%/js/yui/assets/skins/sam/colorpicker.css
-%%WWWDIR%%/js/yui/assets/skins/sam/container.css
-%%WWWDIR%%/js/yui/assets/skins/sam/datatable.css
-%%WWWDIR%%/js/yui/assets/skins/sam/editor.css
-%%WWWDIR%%/js/yui/assets/skins/sam/imagecropper.css
-%%WWWDIR%%/js/yui/assets/skins/sam/layout.css
-%%WWWDIR%%/js/yui/assets/skins/sam/logger.css
-%%WWWDIR%%/js/yui/assets/skins/sam/menu.css
-%%WWWDIR%%/js/yui/assets/skins/sam/paginator.css
-%%WWWDIR%%/js/yui/assets/skins/sam/profilerviewer.css
-%%WWWDIR%%/js/yui/assets/skins/sam/progressbar.css
-%%WWWDIR%%/js/yui/assets/skins/sam/resize.css
-%%WWWDIR%%/js/yui/assets/skins/sam/simpleeditor.css
-%%WWWDIR%%/js/yui/assets/skins/sam/slider.css
-%%WWWDIR%%/js/yui/assets/skins/sam/tabview.css
-%%WWWDIR%%/js/yui/assets/skins/sam/treeview.css
-%%WWWDIR%%/js/yui/assets/skins/sam/yuitest.css
 %%WWWDIR%%/js/yui/assets/skins/sam/ajax-loader.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/asc.gif
+%%WWWDIR%%/js/yui/assets/skins/sam/autocomplete.css
 %%WWWDIR%%/js/yui/assets/skins/sam/back-h.png
 %%WWWDIR%%/js/yui/assets/skins/sam/back-v.png
 %%WWWDIR%%/js/yui/assets/skins/sam/bar-h.png
@@ -408,67 +400,87 @@
 %%WWWDIR%%/js/yui/assets/skins/sam/bg-h.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/bg-v.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/blankimage.png
+%%WWWDIR%%/js/yui/assets/skins/sam/button.css
+%%WWWDIR%%/js/yui/assets/skins/sam/calendar.css
+%%WWWDIR%%/js/yui/assets/skins/sam/carousel.css
 %%WWWDIR%%/js/yui/assets/skins/sam/check0.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/check1.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/check2.gif
+%%WWWDIR%%/js/yui/assets/skins/sam/colorpicker.css
+%%WWWDIR%%/js/yui/assets/skins/sam/container.css
+%%WWWDIR%%/js/yui/assets/skins/sam/datatable.css
 %%WWWDIR%%/js/yui/assets/skins/sam/desc.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/dt-arrow-dn.png
 %%WWWDIR%%/js/yui/assets/skins/sam/dt-arrow-up.png
 %%WWWDIR%%/js/yui/assets/skins/sam/editor-knob.gif
-%%WWWDIR%%/js/yui/assets/skins/sam/editor-sprite.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/editor-sprite-active.gif
+%%WWWDIR%%/js/yui/assets/skins/sam/editor-sprite.gif
+%%WWWDIR%%/js/yui/assets/skins/sam/editor.css
 %%WWWDIR%%/js/yui/assets/skins/sam/header_background.png
 %%WWWDIR%%/js/yui/assets/skins/sam/hue_bg.png
+%%WWWDIR%%/js/yui/assets/skins/sam/imagecropper.css
+%%WWWDIR%%/js/yui/assets/skins/sam/layout.css
 %%WWWDIR%%/js/yui/assets/skins/sam/layout_sprite.png
 %%WWWDIR%%/js/yui/assets/skins/sam/loading.gif
+%%WWWDIR%%/js/yui/assets/skins/sam/logger.css
+%%WWWDIR%%/js/yui/assets/skins/sam/menu-button-arrow-disabled.png
+%%WWWDIR%%/js/yui/assets/skins/sam/menu-button-arrow.png
+%%WWWDIR%%/js/yui/assets/skins/sam/menu.css
 %%WWWDIR%%/js/yui/assets/skins/sam/menubaritem_submenuindicator.png
 %%WWWDIR%%/js/yui/assets/skins/sam/menubaritem_submenuindicator_disabled.png
-%%WWWDIR%%/js/yui/assets/skins/sam/menu-button-arrow.png
-%%WWWDIR%%/js/yui/assets/skins/sam/menu-button-arrow-disabled.png
 %%WWWDIR%%/js/yui/assets/skins/sam/menuitem_checkbox.png
 %%WWWDIR%%/js/yui/assets/skins/sam/menuitem_checkbox_disabled.png
 %%WWWDIR%%/js/yui/assets/skins/sam/menuitem_submenuindicator.png
 %%WWWDIR%%/js/yui/assets/skins/sam/menuitem_submenuindicator_disabled.png
+%%WWWDIR%%/js/yui/assets/skins/sam/paginator.css
 %%WWWDIR%%/js/yui/assets/skins/sam/picker_mask.png
-%%WWWDIR%%/js/yui/assets/skins/sam/split-button-arrow.png
+%%WWWDIR%%/js/yui/assets/skins/sam/profilerviewer.css
+%%WWWDIR%%/js/yui/assets/skins/sam/progressbar.css
+%%WWWDIR%%/js/yui/assets/skins/sam/resize.css
+%%WWWDIR%%/js/yui/assets/skins/sam/simpleeditor.css
+%%WWWDIR%%/js/yui/assets/skins/sam/slider.css
 %%WWWDIR%%/js/yui/assets/skins/sam/split-button-arrow-active.png
 %%WWWDIR%%/js/yui/assets/skins/sam/split-button-arrow-disabled.png
 %%WWWDIR%%/js/yui/assets/skins/sam/split-button-arrow-focus.png
 %%WWWDIR%%/js/yui/assets/skins/sam/split-button-arrow-hover.png
+%%WWWDIR%%/js/yui/assets/skins/sam/split-button-arrow.png
 %%WWWDIR%%/js/yui/assets/skins/sam/sprite.png
+%%WWWDIR%%/js/yui/assets/skins/sam/tabview.css
 %%WWWDIR%%/js/yui/assets/skins/sam/treeview-loading.gif
 %%WWWDIR%%/js/yui/assets/skins/sam/treeview-sprite.gif
+%%WWWDIR%%/js/yui/assets/skins/sam/treeview.css
 %%WWWDIR%%/js/yui/assets/skins/sam/wait.gif
+%%WWWDIR%%/js/yui/assets/skins/sam/yuitest.css
 %%WWWDIR%%/js/yui/autocomplete/autocomplete-min.js
-%%WWWDIR%%/js/yui/base/base.css
 %%WWWDIR%%/js/yui/base/base-min.css
+%%WWWDIR%%/js/yui/base/base.css
 %%WWWDIR%%/js/yui/button/button-min.js
 %%WWWDIR%%/js/yui/calendar/calendar-min.js
 %%WWWDIR%%/js/yui/carousel/carousel-min.js
 %%WWWDIR%%/js/yui/charts/charts-min.js
 %%WWWDIR%%/js/yui/colorpicker/colorpicker-min.js
-%%WWWDIR%%/js/yui/connection/connection_core-min.js
 %%WWWDIR%%/js/yui/connection/connection-min.js
 %%WWWDIR%%/js/yui/connection/connection.swf
-%%WWWDIR%%/js/yui/container/container_core-min.js
+%%WWWDIR%%/js/yui/connection/connection_core-min.js
 %%WWWDIR%%/js/yui/container/container-min.js
+%%WWWDIR%%/js/yui/container/container_core-min.js
 %%WWWDIR%%/js/yui/cookie/cookie-min.js
 %%WWWDIR%%/js/yui/datasource/datasource-min.js
 %%WWWDIR%%/js/yui/datatable/datatable-min.js
 %%WWWDIR%%/js/yui/datemath/datemath-min.js
 %%WWWDIR%%/js/yui/dom/dom-min.js
 %%WWWDIR%%/js/yui/dragdrop/dragdrop-min.js
-%%WWWDIR%%/js/yui/element/element-min.js
 %%WWWDIR%%/js/yui/element-delegate/element-delegate-min.js
-%%WWWDIR%%/js/yui/event/event-min.js
+%%WWWDIR%%/js/yui/element/element-min.js
 %%WWWDIR%%/js/yui/event-delegate/event-delegate-min.js
 %%WWWDIR%%/js/yui/event-mouseenter/event-mouseenter-min.js
 %%WWWDIR%%/js/yui/event-simulate/event-simulate-min.js
-%%WWWDIR%%/js/yui/fonts/fonts.css
+%%WWWDIR%%/js/yui/event/event-min.js
 %%WWWDIR%%/js/yui/fonts/fonts-min.css
+%%WWWDIR%%/js/yui/fonts/fonts.css
 %%WWWDIR%%/js/yui/get/get-min.js
-%%WWWDIR%%/js/yui/grids/grids.css
 %%WWWDIR%%/js/yui/grids/grids-min.css
+%%WWWDIR%%/js/yui/grids/grids.css
 %%WWWDIR%%/js/yui/history/history-min.js
 %%WWWDIR%%/js/yui/imagecropper/imagecropper-min.js
 %%WWWDIR%%/js/yui/imageloader/imageloader-min.js
@@ -480,10 +492,10 @@
 %%WWWDIR%%/js/yui/profiler/profiler-min.js
 %%WWWDIR%%/js/yui/profilerviewer/profilerviewer-min.js
 %%WWWDIR%%/js/yui/progressbar/progressbar-min.js
-%%WWWDIR%%/js/yui/reset/reset.css
-%%WWWDIR%%/js/yui/reset/reset-min.css
-%%WWWDIR%%/js/yui/reset-fonts/reset-fonts.css
 %%WWWDIR%%/js/yui/reset-fonts-grids/reset-fonts-grids.css
+%%WWWDIR%%/js/yui/reset-fonts/reset-fonts.css
+%%WWWDIR%%/js/yui/reset/reset-min.css
+%%WWWDIR%%/js/yui/reset/reset.css
 %%WWWDIR%%/js/yui/resize/resize-min.js
 %%WWWDIR%%/js/yui/selector/selector-min.js
 %%WWWDIR%%/js/yui/slider/slider-min.js
@@ -491,28 +503,16 @@
 %%WWWDIR%%/js/yui/stylesheet/stylesheet-min.js
 %%WWWDIR%%/js/yui/swf/swf-min.js
 %%WWWDIR%%/js/yui/swfdetect/swfdetect-min.js
-%%WWWDIR%%/js/yui/swfstore/swfstore.swf
 %%WWWDIR%%/js/yui/swfstore/swfstore-min.js
+%%WWWDIR%%/js/yui/swfstore/swfstore.swf
 %%WWWDIR%%/js/yui/tabview/tabview-min.js
 %%WWWDIR%%/js/yui/treeview/treeview-min.js
 %%WWWDIR%%/js/yui/uploader/uploader-min.js
-%%WWWDIR%%/js/yui/yahoo/yahoo-min.js
 %%WWWDIR%%/js/yui/yahoo-dom-event/yahoo-dom-event.js
+%%WWWDIR%%/js/yui/yahoo/yahoo-min.js
 %%WWWDIR%%/js/yui/yuiloader/yuiloader-min.js
-%%WWWDIR%%/js/yui/yuitest/yuitest_core-min.js
 %%WWWDIR%%/js/yui/yuitest/yuitest-min.js
-%%WWWDIR%%/js/TUI.js
-%%WWWDIR%%/js/attachment.js
-%%WWWDIR%%/js/bug.js
-%%WWWDIR%%/js/change-columns.js
-%%WWWDIR%%/js/comments.js
-%%WWWDIR%%/js/expanding-tree.js
-%%WWWDIR%%/js/field.js
-%%WWWDIR%%/js/flag.js
-%%WWWDIR%%/js/global.js
-%%WWWDIR%%/js/params.js
-%%WWWDIR%%/js/productform.js
-%%WWWDIR%%/js/util.js
+%%WWWDIR%%/js/yui/yuitest/yuitest_core-min.js
 %%WWWDIR%%/jsonrpc.cgi
 %%WWWDIR%%/long_list.cgi
 %%WWWDIR%%/migrate.pl
@@ -537,6 +537,7 @@
 %%WWWDIR%%/showdependencygraph.cgi
 %%WWWDIR%%/showdependencytree.cgi
 %%WWWDIR%%/sidebar.cgi
+%%WWWDIR%%/skins/README
 %%WWWDIR%%/skins/contrib/Dusk/buglist.css
 %%WWWDIR%%/skins/contrib/Dusk/global.css
 %%WWWDIR%%/skins/contrib/Dusk/index.css
@@ -573,7 +574,6 @@
 %%WWWDIR%%/skins/standard/show_bug.css
 %%WWWDIR%%/skins/standard/show_multiple.css
 %%WWWDIR%%/skins/standard/summarize-time.css
-%%WWWDIR%%/skins/README
 %%WWWDIR%%/summarize_time.cgi
 %%WWWDIR%%/template/en/default/account/auth/login-small.html.tmpl
 %%WWWDIR%%/template/en/default/account/auth/login.html.tmpl
@@ -861,6 +861,7 @@
 %%WWWDIR%%/whineatnews.pl
 %%WWWDIR%%/xml.cgi
 %%WWWDIR%%/xmlrpc.cgi
+@dirrmtry %%WWWDIR%%/xt
 @dirrm %%WWWDIR%%/template/en/default/whine
 @dirrm %%WWWDIR%%/template/en/default/setup
 @dirrm %%WWWDIR%%/template/en/default/search
@@ -1030,5 +1031,6 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec mkdir -p %D/%%WWWDIR%%/xt
 @exec mkdir -p %D/%%WWWDIR%%/t
 @exec mkdir -p %D/%%WWWDIR%%/lib
diff --git a/devel/bugzilla3/Makefile.common b/devel/bugzilla3/Makefile.common
index 6ec6a277c2be..1bb4634ba701 100644
--- a/devel/bugzilla3/Makefile.common
+++ b/devel/bugzilla3/Makefile.common
@@ -2,6 +2,8 @@
 # $FreeBSD$
 #
 
+DIST_SUBDIR=	${PORTNAME}
+
 CONFLICTS=	bugzilla-4.*
 
 PORTSCOUT=	limitw:1,even
diff --git a/devel/bugzilla3/distinfo b/devel/bugzilla3/distinfo
index 73acd978fa99..6c6b98b10392 100644
--- a/devel/bugzilla3/distinfo
+++ b/devel/bugzilla3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugzilla-3.6.5.tar.gz) = 5f4cd43462110d5deef18454cfa52377c7123eabcca477a747982a52447da5f3
-SIZE (bugzilla-3.6.5.tar.gz) = 2633125
+SHA256 (bugzilla/bugzilla-3.6.5.tar.gz) = 5f4cd43462110d5deef18454cfa52377c7123eabcca477a747982a52447da5f3
+SIZE (bugzilla/bugzilla-3.6.5.tar.gz) = 2633125