3 files changed, 37 insertions, 10 deletions

diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 4d8843568260..728930158e4f 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PERL_SITEDIR}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${PERL_SITEDIR}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql \
 		${PERL_SITEDIR}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
 
-.if defined(WITH_BUG_CHARTING_MODULES)
+.if !defined(WITHOUT_BUG_CHARTING_MODULES)
 RUN_DEPENDS+=	${PERL_SITEDIR}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${PERL_SITEDIR}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart
 .endif
@@ -28,9 +28,13 @@ RUN_DEPENDS+=	${PERL_SITEDIR}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 RUN_DEPENDS+=	${PERL_SITEDIR}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
 
+.if defined(WITH_BUG_EXPORT_AND_IMPORT)
+RUN_DEPENDS+=	${PERL_SITEDIR}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+.endif
+
 NO_BUILD=	yes
-SHAREOWN=	nobody
-SHAREGRP=	nogroup
+BINMODE=	700
+PKGMESSAGE=     ${WRKDIR}/pkg-message
 
 PERL_SITEDIR=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
@@ -42,10 +46,15 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following options:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "    WITH_BUG_CHARTING_MODULES    install perl modules required for bug"
-	@${ECHO_MSG} "                                 charting support"
-	@${ECHO_MSG} "    WITH_BUG_MAILING_MODULES     install perl modules required for bug mailing"
-	@${ECHO_MSG} "                                 support (contrib/bug_email.pl) interface"
+	@${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"
+	@${ECHO_MSG} "                                mailing 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} ""
 
 post-patch:
@@ -53,6 +62,7 @@ post-patch:
 	@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}
 	@${PERL} -pi -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
 		${WRKSRC}/$i
@@ -66,13 +76,19 @@ pre-install:
 do-install:
 	${MKDIR} ${BUGZILLADIR}
 	find ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
-		${INSTALL} ${COPY} -m 700 {} ${BUGZILLADIR} \;
+		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
 .if !defined(NOPORTSDOCS)
 	${MKDIR} ${DOCSDIR}
 	${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} --unlink -C ${DOCSDIR} -xf -
 .endif
 
 post-install:
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" pkg-message >${PKGMESSAGE}
+.if !defined(BATCH)
+	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO}
+.endif
 
 .include <bsd.port.mk>
+
diff --git a/devel/bugzilla3/files/patch-aa b/devel/bugzilla3/files/patch-aa
new file mode 100644
index 000000000000..f452750f681a
--- /dev/null
+++ b/devel/bugzilla3/files/patch-aa
@@ -0,0 +1,11 @@
+--- checksetup.pl~	Thu Oct  4 21:53:20 2001
++++ checksetup.pl	Thu Oct  4 21:53:26 2001
+@@ -305,7 +305,7 @@
+ # set this to "".
+ # If you set this to anything besides "", you will need to run checksetup.pl
+ # as root.
+-$webservergroup = "nobody";
++$webservergroup = "nogroup";
+ ');
+ 
+ 
diff --git a/devel/bugzilla3/pkg-message b/devel/bugzilla3/pkg-message
index 08e022f41af9..a5e56cf9b29f 100644
--- a/devel/bugzilla3/pkg-message
+++ b/devel/bugzilla3/pkg-message
@@ -12,11 +12,11 @@
            owner; <host> is a host there bugzilla is being setup;
            <password> is a database owner's password;
 
-  2. Change working directory to ${PREFIX}/www/data.default
+  2. Change working directory to %%PREFIX%%/www/data.default
   3. Run "./checksetup.pl" script as root user
   4. Read output carefully and follow all instructions
 
   For more complete database setup and post-installation instructions
   and security tips/notes please read Bugzilla Guide in
-  ${PREFIX}/share/doc/bugzilla (chapter 3: Installation)
+  %%PREFIX%%/share/doc/bugzilla (chapter 3: Installation)
 ==========================================================================