- Update to 3.4.6 [1]

- Remove ja-bugzilla-2.* from CONFLICT entries of devel/bugzilla,
 devel/bugzilla2 and russian/bugzilla-ru [2]
- Change MAINTAINER address from tota@rtfm.jp to tota@FreeBSD.org

 [1] This port has been updated from the bugzilla Japanized patch to
    bugzilla Japanese language pack installation, both of which are
    maintained differently.
     * Japanized patch is not actively maintained anymore.
     * More sophisticated language pack framework has been introduced since
       Bugzilla 3.0.
 [2] This port no longer conflicts with those ports due to the new language
    pack framework.

Approved by:	maho (mentor)

1 files changed, 20 insertions, 109 deletions

diff --git a/japanese/bugzilla3/Makefile b/japanese/bugzilla3/Makefile
index ff2694fb8d7b..71a3f71dc718 100644
--- a/japanese/bugzilla3/Makefile
+++ b/japanese/bugzilla3/Makefile
@@ -6,128 +6,39 @@
 #
 
 PORTNAME=	bugzilla
-PORTVERSION=	2.16.8
-PORTREVISION=	2
-CATEGORIES=	japanese devel
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	webtools webtools/archived
+PORTVERSION=	3.4.6
+CATEGORIES=	japanese
+MASTER_SITES=	http://bug-ja.org/releases/3.4/ \
+		${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/bugzilla-ja|}
+PKGNAMESUFFIX=	-ja
+DISTNAME=	Bugzilla-ja-${PORTVERSION}-template-rel01
 
-PATCH_SITES=	http://hp.vector.co.jp/authors/VA013241/webapp/bugzilla/
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-to-${PORTVERSION}-ja-${PATCHVERSION}.diff.gz
-PATCH_DIST_STRIP=	-p1
+MAINTAINER=	tota@FreeBSD.org
+COMMENT=	Japanese localization for Bugzilla
 
-MAINTAINER=	tota@rtfm.jp
-COMMENT=	Bug-tracking system with Japanese patch
+RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla
 
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql \
-		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
-		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
-
-.if !defined(WITHOUT_BUG_CHARTING_MODULES)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
-		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart
-.endif
-
-.if defined(WITH_BUG_MAILING_MODULES)
-RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
-.endif
-
-.if defined(WITH_BUG_EXPORT_AND_IMPORT)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-.endif
+USE_BZIP2=	yes
 
 CONFLICTS=	bugzilla-2.*
-PATCHVERSION=	20050218
 
-USE_PERL5=	yes
+PORTSCOUT=	limitw:1,even
 
-.if defined(WITH_CONTRIB)
-PLIST_SUB+=	CONTRIB=""
+.if !defined(BUGZILLADIR)
+.if defined(APACHE_DATADIR)
+BUGZILLADIR=	${APACHE_DATADIR}/data/bugzilla
 .else
-PLIST_SUB+=	CONTRIB="@comment "
+BUGZILLADIR=	${PREFIX}/www/data/bugzilla
+.endif
 .endif
 
-NO_BUILD=	yes
-BINMODE=	700
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-BUGZILLADIR?=	www/data/bugzilla
-BUGZILLADOCS=	html images txt rel_notes.txt
-BONSAIPERLWC=	*.cgi *.pl *.pm processmail syncshadowdb contrib/*.pl
-SENDMAILWC=	*.pl *.pm processmail contrib/*.pl
-
-PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR}
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
-	@${ECHO_MSG} "                               charting support"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_MAILING_MODULES     install perl modules required for bug mailing"
-	@${ECHO_MSG} "                               support (contrib/bug_email.pl) interface"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_EXPORT_AND_IMPORT   install perl modules required for bug"
-	@${ECHO_MSG} "                               export/import feature to move bugs to or from"
-	@${ECHO_MSG} "                               other bugzilla installations"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_CONTRIB                 to install various user-contributed scripts,"
-	@${ECHO_MSG} "                               e.g. to import bugs from other databases, to"
-	@${ECHO_MSG} "                               allow follow-ups/submissions by e-mail etc."
-	@${ECHO_MSG} ""
-
-post-patch:
-	@${FIND} -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
-	@${FIND} -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
-	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
-.for i in ${BONSAIPERLWC}
-	@${REINPLACE_CMD} -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
-		${WRKSRC}/$i
-.endfor
-.for i in ${SENDMAILWC}
-	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
-		${WRKSRC}/$i
-.endfor
-	@${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
+PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
 
-pre-install:
-	@${FIND} ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
+NO_BUILD=	yes
 
 do-install:
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}
-	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
-		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
-	${TAR} -C ${WRKSRC} -cf - template css | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} --unlink -C ${DOCSDIR} -xf -
-.endif
-.if defined(WITH_CONTRIB)
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}/contrib ${PREFIX}/${BUGZILLADIR}/contrib/cmdline
-	cd ${WRKSRC}/contrib; ${INSTALL_SCRIPT} BugzillaEmail.pm bug_email.pl \
-		bugzilla_email_append.pl cvs-update.sh gnats2bz.pl jb2bz.py \
-		mysqld-watcher.pl yp_nomail.sh ${PREFIX}/${BUGZILLADIR}/contrib
-	cd ${WRKSRC}/contrib/cmdline; ${INSTALL_SCRIPT} buglist bugs \
-		query.conf ${PREFIX}/${BUGZILLADIR}/contrib/cmdline
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/contrib
-	cd ${WRKSRC}/contrib; ${INSTALL_DATA} README README.Mailif \
-		bugmail_help.html bugzilla.procmailrc ${DOCSDIR}/contrib
-.endif
-.endif
-
-post-install:
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
-		-e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g" \
-		-e "s:%%PORTDOCS%%:${PORTDOCS}:g" \
-		-e "s:%%DOCSDIR%%:${DOCSDIR}:g" \
-		${MASTERDIR}/pkg-message >${PKGMESSAGE}
+	-${MKDIR} ${BUGZILLADIR}/template
+	${CP} -pR ${WRKDIR}/ja-${PORTVERSION} ${BUGZILLADIR}/template/ja
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}