15 files changed, 92 insertions, 76 deletions

diff --git a/russian/Makefile b/russian/Makefile
index 590d55ad2454..5dca2db2448c 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -6,8 +6,8 @@
     SUBDIR += MT
     SUBDIR += artwiz-ru
     SUBDIR += aspell
-    SUBDIR += bugzilla-ru
-    SUBDIR += bugzilla3-ru
+    SUBDIR += bugzilla
+    SUBDIR += bugzilla3
     SUBDIR += calligra-l10n
     SUBDIR += d1489
     SUBDIR += eric4
diff --git a/russian/bugzilla-ru/Makefile b/russian/bugzilla-ru/Makefile
deleted file mode 100644
index 0219405fef39..000000000000
--- a/russian/bugzilla-ru/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	bugzilla-ru
-# Date created:	   28 Jul 2008
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bugzilla
-DISTVERSION=	4.0.5-ru-20120227
-CATEGORIES=	russian
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-4.0-ru/${PORTVERSION:R:R}
-PKGNAMESUFFIX=	-ru
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Russian localization for Bugzilla
-
-RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/r.*$/ru/}
-
-.include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
-
-do-install:
-	${MKDIR} ${WWWDIR}
-	(cd ${WRKSRC} && ${PAX} -r -w * ${WWWDIR})
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
-
-.include <bsd.port.mk>
diff --git a/russian/bugzilla-ru/distinfo b/russian/bugzilla-ru/distinfo
deleted file mode 100644
index 5296a6bb8127..000000000000
--- a/russian/bugzilla-ru/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bugzilla/bugzilla-4.0.5-ru-20120227.tar.gz) = 67f9c7e8ef581808b4c0a4edd27910492bab0c0230f68c0f30ad750ad6266700
-SIZE (bugzilla/bugzilla-4.0.5-ru-20120227.tar.gz) = 336890
diff --git a/russian/bugzilla/Makefile b/russian/bugzilla/Makefile
new file mode 100644
index 000000000000..381ec59ed4d6
--- /dev/null
+++ b/russian/bugzilla/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for:	bugzilla-ru
+# Date created:	   28 Jul 2008
+# Whom:		   Sergey Skvortsov <skv@protey.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	bugzilla
+PORTVERSION=	4.0.7
+CATEGORIES=	russian
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-${PORTVERSION:R}-ru/${PORTVERSION}
+DISTNAME=	bugzilla-${PORTVERSION}-ru-20120809
+
+MAINTAINER=	skv@FreeBSD.org
+COMMENT=	Russian localization for Bugzilla
+
+RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.ru
+
+.include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
+
+do-install:
+	${MKDIR} ${WWWDIR}
+	(cd ${WRKSRC}/ && ${PAX} -r -w * ${WWWDIR})
+.if !defined(BATCH)
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
+.endif
+
+# Maintainer
+plist:	patch
+	@( cd ${WRKSRC}/ && ${FIND} * -type f | ${AWK} '{print "%%WWWDIR%%/"$$1}' | ${SORT} > ${PLIST}.new )
+	@( cd ${WRKSRC}/ && ${FIND} * -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/"$$1}' | ${SORT} -r >> ${PLIST}.new )
+	@if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \
+		${ECHO_MSG} no pkg-plist changes; \
+		${RM} ${PLIST}.new ; \
+	fi
+
+.include <bsd.port.mk>
diff --git a/russian/bugzilla/distinfo b/russian/bugzilla/distinfo
new file mode 100644
index 000000000000..92c92111dde2
--- /dev/null
+++ b/russian/bugzilla/distinfo
@@ -0,0 +1,2 @@
+SHA256 (bugzilla/bugzilla-4.0.7-ru-20120809.tar.gz) = e10e3f2578705ed4433daa0c5b6c44dc43aff696aba9a5f83dbdfc11094a2a24
+SIZE (bugzilla/bugzilla-4.0.7-ru-20120809.tar.gz) = 336769
diff --git a/russian/bugzilla-ru/pkg-descr b/russian/bugzilla/pkg-descr
index 125062361afd..125062361afd 100644
--- a/russian/bugzilla-ru/pkg-descr
+++ b/russian/bugzilla/pkg-descr
diff --git a/russian/bugzilla-ru/pkg-message b/russian/bugzilla/pkg-message
index 356e24d70c10..356e24d70c10 100644
--- a/russian/bugzilla-ru/pkg-message
+++ b/russian/bugzilla/pkg-message
diff --git a/russian/bugzilla-ru/pkg-plist b/russian/bugzilla/pkg-plist
index eb5ddf0f568b..6c4c08ce702d 100644
--- a/russian/bugzilla-ru/pkg-plist
+++ b/russian/bugzilla/pkg-plist
@@ -286,4 +286,3 @@
 @dirrmtry %%WWWDIR%%/template
 @dirrmtry %%WWWDIR%%/help/ru
 @dirrmtry %%WWWDIR%%/help
-@dirrmtry %%WWWDIR%%
diff --git a/russian/bugzilla3-ru/Makefile b/russian/bugzilla3-ru/Makefile
deleted file mode 100644
index e116e4c7cb36..000000000000
--- a/russian/bugzilla3-ru/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	bugzilla-ru
-# Date created:	   28 Jul 2008
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bugzilla
-DISTVERSION=	3.6.9-ru-20120419
-CATEGORIES=	russian
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-3.6-ru/${PORTVERSION:R:R}
-PKGNAMESUFFIX=	-ru
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Russian localization for Bugzilla
-
-RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla3
-
-LATEST_LINK=	${PKGNAMEPREFIX}bugzilla3${PKGNAMESUFFIX}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/r.*$/ru/}
-
-.include "${.CURDIR}/../../devel/bugzilla3/Makefile.common"
-
-do-install:
-	${MKDIR} ${WWWDIR}
-	(cd ${WRKSRC} && ${PAX} -r -w * ${WWWDIR})
-.if !defined(BATCH)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
-
-.include <bsd.port.mk>
diff --git a/russian/bugzilla3-ru/distinfo b/russian/bugzilla3-ru/distinfo
deleted file mode 100644
index 507549f96d18..000000000000
--- a/russian/bugzilla3-ru/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bugzilla/bugzilla-3.6.9-ru-20120419.tar.gz) = a6c8fa4e70b5f0fb00fc1ba80a201d934b8ca1b214aef4006834655703b6544f
-SIZE (bugzilla/bugzilla-3.6.9-ru-20120419.tar.gz) = 323608
diff --git a/russian/bugzilla3/Makefile b/russian/bugzilla3/Makefile
new file mode 100644
index 000000000000..a9be46f5876e
--- /dev/null
+++ b/russian/bugzilla3/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:	bugzilla-ru
+# Date created:	   28 Jul 2008
+# Whom:		   Sergey Skvortsov <skv@protey.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	bugzilla
+PORTVERSION=	3.6.10
+CATEGORIES=	russian
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-${PORTVERSION:R}-ru/${PORTVERSION}
+DISTNAME=	bugzilla-${PORTVERSION}-ru-20120809
+
+MAINTAINER=	skv@FreeBSD.org
+COMMENT=	Russian localization for Bugzilla
+
+RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla3
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.ru
+
+.include "${.CURDIR}/../../devel/bugzilla3/Makefile.common"
+
+LATEST_LINK=	${PKGNAMEPREFIX}bugzilla3
+
+do-install:
+	${MKDIR} ${WWWDIR}
+	(cd ${WRKSRC}/ && ${PAX} -r -w * ${WWWDIR})
+.if !defined(BATCH)
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
+.endif
+
+# Maintainer
+plist:	patch
+	@( cd ${WRKSRC}/ && ${FIND} * -type f | ${AWK} '{print "%%WWWDIR%%/"$$1}' | ${SORT} > ${PLIST}.new )
+	@( cd ${WRKSRC}/ && ${FIND} * -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/"$$1}' | ${SORT} -r >> ${PLIST}.new )
+	@if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \
+		${ECHO_MSG} no pkg-plist changes; \
+		${RM} ${PLIST}.new ; \
+	fi
+
+.include <bsd.port.mk>
diff --git a/russian/bugzilla3/distinfo b/russian/bugzilla3/distinfo
new file mode 100644
index 000000000000..1104c65e95c2
--- /dev/null
+++ b/russian/bugzilla3/distinfo
@@ -0,0 +1,2 @@
+SHA256 (bugzilla/bugzilla-3.6.10-ru-20120809.tar.gz) = 398d5628f09b294623e64878ca0155fee54f30c22f69e69a0099d144529e7d7f
+SIZE (bugzilla/bugzilla-3.6.10-ru-20120809.tar.gz) = 323589
diff --git a/russian/bugzilla3-ru/pkg-descr b/russian/bugzilla3/pkg-descr
index 125062361afd..125062361afd 100644
--- a/russian/bugzilla3-ru/pkg-descr
+++ b/russian/bugzilla3/pkg-descr
diff --git a/russian/bugzilla3-ru/pkg-message b/russian/bugzilla3/pkg-message
index 356e24d70c10..356e24d70c10 100644
--- a/russian/bugzilla3-ru/pkg-message
+++ b/russian/bugzilla3/pkg-message
diff --git a/russian/bugzilla3-ru/pkg-plist b/russian/bugzilla3/pkg-plist
index fca943d8f53d..416592d4b04c 100644
--- a/russian/bugzilla3-ru/pkg-plist
+++ b/russian/bugzilla3/pkg-plist
@@ -290,4 +290,3 @@
 @dirrmtry %%WWWDIR%%/template
 @dirrmtry %%WWWDIR%%/help/ru
 @dirrmtry %%WWWDIR%%/help
-@dirrmtry %%WWWDIR%%