From ohauer@FreeBSD.org  Sun Jul 10 16:36:17 2011
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B977106564A;
	Sun, 10 Jul 2011 16:36:17 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65])
	by mx1.freebsd.org (Postfix) with ESMTP id 874568FC0A;
	Sun, 10 Jul 2011 16:36:16 +0000 (UTC)
Received: by p578be941.dip0.t-ipconnect.de (Postfix, from userid 1100)
	id 3A0EC20325; Sun, 10 Jul 2011 18:36:14 +0200 (CEST)
Message-Id: <20110710163614.3A0EC20325@p578be941.dip0.t-ipconnect.de>
Date: Sun, 10 Jul 2011 18:36:14 +0200 (CEST)
From: Olli Hauer <ohauer@FreeBSD.org>
Reply-To: Olli Hauer <ohauer@FreeBSD.org>
To: <FreeBSD-gnats-submit@freebsd.org>
Cc: <skv@FreeBSD.org>
Subject: [patch] devel/bugzilla fix checksetup plus add DIST_SUBDIR to Makefile.common
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         158766
>Category:       ports
>Synopsis:       [patch] devel/bugzilla fix checksetup plus add DIST_SUBDIR to Makefile.common
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    skv
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 10 16:40:14 UTC 2011
>Closed-Date:    Mon Jul 18 21:57:27 UTC 2011
>Last-Modified:  Mon Jul 18 22:00:22 UTC 2011
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:

>Description:
checksetup fails since the directory bugzilla/xt is missing
(file: Bugzilla/Install/Filesystem.pm line: 248)

Additional add directive DIST_SUBDIR to Makefile.common to keep all
bugzilla related files (bugzilla, translations) together.

>How-To-Repeat:

>Fix:

--- bugzilla_DIST_SUBDIR.diff begins here ---
Index: devel/bugzilla/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/bugzilla/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- devel/bugzilla/Makefile	11 Jun 2011 04:25:06 -0000	1.85
+++ devel/bugzilla/Makefile	5 Jul 2011 21:13:33 -0000
@@ -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 @@
 		${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}
Index: devel/bugzilla/Makefile.common
===================================================================
RCS file: /home/pcvs/ports/devel/bugzilla/Makefile.common,v
retrieving revision 1.2
diff -u -r1.2 Makefile.common
--- devel/bugzilla/Makefile.common	11 Jun 2011 04:25:06 -0000	1.2
+++ devel/bugzilla/Makefile.common	5 Jul 2011 21:13:33 -0000
@@ -2,6 +2,8 @@
 # $FreeBSD: ports/devel/bugzilla/Makefile.common,v 1.2 2011/06/11 04:25:06 tota Exp $
 #
 
+DIST_SUBDIR=	${PORTNAME}
+
 CONFLICTS=	bugzilla-3.*
 
 PORTSCOUT=	limitw:1,even
Index: devel/bugzilla/distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/bugzilla/distinfo,v
retrieving revision 1.44
diff -u -r1.44 distinfo
--- devel/bugzilla/distinfo	7 Jun 2011 13:30:00 -0000	1.44
+++ devel/bugzilla/distinfo	5 Jul 2011 21:13:33 -0000
@@ -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
Index: devel/bugzilla/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/bugzilla/pkg-plist,v
retrieving revision 1.38
diff -u -r1.38 pkg-plist
--- devel/bugzilla/pkg-plist	7 Jun 2011 13:30:00 -0000	1.38
+++ devel/bugzilla/pkg-plist	5 Jul 2011 21:13:33 -0000
@@ -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
Index: devel/bugzilla3/Makefile.common
===================================================================
RCS file: /home/pcvs/ports/devel/bugzilla3/Makefile.common,v
retrieving revision 1.2
diff -u -r1.2 Makefile.common
--- devel/bugzilla3/Makefile.common	11 Jun 2011 04:27:50 -0000	1.2
+++ devel/bugzilla3/Makefile.common	5 Jul 2011 21:13:33 -0000
@@ -2,6 +2,8 @@
 # $FreeBSD: ports/devel/bugzilla3/Makefile.common,v 1.2 2011/06/11 04:27:50 tota Exp $
 #
 
+DIST_SUBDIR=	${PORTNAME}
+
 CONFLICTS=	bugzilla-4.*
 
 PORTSCOUT=	limitw:1,even
Index: devel/bugzilla3/distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/bugzilla3/distinfo,v
retrieving revision 1.44
diff -u -r1.44 distinfo
--- devel/bugzilla3/distinfo	7 Jun 2011 13:30:00 -0000	1.44
+++ devel/bugzilla3/distinfo	5 Jul 2011 21:13:33 -0000
@@ -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
Index: german/bugzilla/Makefile
===================================================================
RCS file: /home/pcvs/ports/german/bugzilla/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- german/bugzilla/Makefile	11 Jun 2011 19:04:02 -0000	1.1
+++ german/bugzilla/Makefile	5 Jul 2011 21:13:33 -0000
@@ -11,7 +11,6 @@
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
 DISTNAME=	germzilla-${PORTVERSION}-1.utf-8
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	German localization for Bugzilla
Index: german/bugzilla3/Makefile
===================================================================
RCS file: /home/pcvs/ports/german/bugzilla3/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- german/bugzilla3/Makefile	11 Jun 2011 19:04:02 -0000	1.1
+++ german/bugzilla3/Makefile	5 Jul 2011 21:13:33 -0000
@@ -11,7 +11,6 @@
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
 DISTNAME=	germzilla-${PORTVERSION}-1.utf-8
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	German localization for Bugzilla
Index: japanese/bugzilla/distinfo
===================================================================
RCS file: /home/pcvs/ports/japanese/bugzilla/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- japanese/bugzilla/distinfo	11 Jun 2011 04:25:06 -0000	1.13
+++ japanese/bugzilla/distinfo	5 Jul 2011 21:13:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (Bugzilla-ja-4.0.1-template-rel01.tar.bz2) = c68514d54799b448822d1f4803b54b90f696d6ca0a56b526964feb76f50b72bf
-SIZE (Bugzilla-ja-4.0.1-template-rel01.tar.bz2) = 222662
+SHA256 (bugzilla/Bugzilla-ja-4.0.1-template-rel01.tar.bz2) = c68514d54799b448822d1f4803b54b90f696d6ca0a56b526964feb76f50b72bf
+SIZE (bugzilla/Bugzilla-ja-4.0.1-template-rel01.tar.bz2) = 222662
Index: japanese/bugzilla3/distinfo
===================================================================
RCS file: /home/pcvs/ports/japanese/bugzilla3/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- japanese/bugzilla3/distinfo	11 Jun 2011 04:27:50 -0000	1.14
+++ japanese/bugzilla3/distinfo	5 Jul 2011 21:13:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (Bugzilla-ja-3.6.5-template-rel01.tar.bz2) = 11bd87c336ae25418361e846863276565c9ab6cb063ccf179b49fcfc89f883c9
-SIZE (Bugzilla-ja-3.6.5-template-rel01.tar.bz2) = 215338
+SHA256 (bugzilla/Bugzilla-ja-3.6.5-template-rel01.tar.bz2) = 11bd87c336ae25418361e846863276565c9ab6cb063ccf179b49fcfc89f883c9
+SIZE (bugzilla/Bugzilla-ja-3.6.5-template-rel01.tar.bz2) = 215338
Index: russian/bugzilla-ru/distinfo
===================================================================
RCS file: /home/pcvs/ports/russian/bugzilla-ru/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- russian/bugzilla-ru/distinfo	7 Jun 2011 13:30:01 -0000	1.7
+++ russian/bugzilla-ru/distinfo	5 Jul 2011 21:13:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (bugzilla-4.0.1-ru-20110510.tar.gz) = 784096e60cfafd954df295f40ac3ea7d77af425c3edfbaf745fb59f6681de40a
-SIZE (bugzilla-4.0.1-ru-20110510.tar.gz) = 334496
+SHA256 (bugzilla/bugzilla-4.0.1-ru-20110510.tar.gz) = 784096e60cfafd954df295f40ac3ea7d77af425c3edfbaf745fb59f6681de40a
+SIZE (bugzilla/bugzilla-4.0.1-ru-20110510.tar.gz) = 334496
Index: russian/bugzilla3-ru/distinfo
===================================================================
RCS file: /home/pcvs/ports/russian/bugzilla3-ru/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- russian/bugzilla3-ru/distinfo	7 Jun 2011 13:30:01 -0000	1.7
+++ russian/bugzilla3-ru/distinfo	5 Jul 2011 21:13:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (bugzilla-3.6.5-ru-20110510.tar.gz) = 7f3095d73669224c8f622d27080978b01203ad92e86333d61a0fb50c8aa50840
-SIZE (bugzilla-3.6.5-ru-20110510.tar.gz) = 323139
+SHA256 (bugzilla/bugzilla-3.6.5-ru-20110510.tar.gz) = 7f3095d73669224c8f622d27080978b01203ad92e86333d61a0fb50c8aa50840
+SIZE (bugzilla/bugzilla-3.6.5-ru-20110510.tar.gz) = 323139
--- bugzilla_DIST_SUBDIR.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->skv 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 10 16:40:35 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158766 

From: TAKATSU Tomonari <tota@FreeBSD.org>
To: bug-followup@FreeBSD.org, ohauer@FreeBSD.org
Cc: skv@freebsd.org
Subject: Re: ports/158766: [patch] devel/bugzilla fix checksetup plus add
 DIST_SUBDIR to Makefile.common
Date: Mon, 11 Jul 2011 21:17:13 +0900

 I have confirmed japanese/bugzilla* and related parts of your patch.
 LGTM
 Please go ahead.
 
 Thanks,
 
 -- 
 TAKATSU Tomonari
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Mon Jul 18 21:56:52 UTC 2011 
State-Changed-Why:  
Comitted 



http://www.freebsd.org/cgi/query-pr.cgi?pr=158766 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158766: commit references a PR
Date: Mon, 18 Jul 2011 21:56:11 +0000 (UTC)

 ohauer      2011-07-18 21:56:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/bugzilla       Makefile Makefile.common distinfo 
                          pkg-plist 
     devel/bugzilla3      Makefile.common distinfo 
     german/bugzilla      Makefile 
     german/bugzilla3     Makefile 
     japanese/bugzilla    distinfo 
     japanese/bugzilla3   distinfo 
     russian/bugzilla-ru  distinfo 
     russian/bugzilla3-ru distinfo 
   Log:
   - create missing (empty) directory (bugzilla) so checksetup does not fail
   - use DIST_SUBDIR for bugzilla and all translations
   - sort pkg-plist (genplist)
   
   OK from bugzilla maintainers per PM.
   
   PR:             ports/158766
   Submitted by:   ohauer
   
   Revision  Changes    Path
   1.86      +3 -2      ports/devel/bugzilla/Makefile
   1.3       +3 -1      ports/devel/bugzilla/Makefile.common
   1.45      +2 -2      ports/devel/bugzilla/distinfo
   1.39      +53 -51    ports/devel/bugzilla/pkg-plist
   1.3       +3 -1      ports/devel/bugzilla3/Makefile.common
   1.45      +2 -2      ports/devel/bugzilla3/distinfo
   1.2       +0 -1      ports/german/bugzilla/Makefile
   1.2       +0 -1      ports/german/bugzilla3/Makefile
   1.14      +2 -2      ports/japanese/bugzilla/distinfo
   1.15      +2 -2      ports/japanese/bugzilla3/distinfo
   1.8       +2 -2      ports/russian/bugzilla-ru/distinfo
   1.8       +2 -2      ports/russian/bugzilla3-ru/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
