Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Aug 2012 20:38:50 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302361 - in head/russian: . bugzilla bugzilla-ru bugzilla3 bugzilla3-ru
Message-ID:  <201208092038.q79Kco4x051052@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Thu Aug  9 20:38:49 2012
New Revision: 302361
URL: http://svn.freebsd.org/changeset/ports/302361

Log:
  - update russian bugzilla templates to current version
  - remove redundand PKGNAMESUFFIX (-ru) since we have already PKGNAMEPREFIX?=ru-
  - use PORTVERSION and DISTNAME instead DISTVERSION so we end up with a pretty
    PKGNAME and INDEX entry
  
    Example output for bugzilla:
    make -V PKGNAME
     ru-bugzilla-4.0.7 (now)
     ru-bugzilla-ru-4.0.7.r.201200809 (before)
  
   The changes where done with the view to pkgNG, so users can do an easy
   install/update of the package.
  
  Approved by:	skv (impicit)

Added:
  head/russian/bugzilla/
     - copied from r302347, head/russian/bugzilla-ru/
  head/russian/bugzilla3/
     - copied from r302347, head/russian/bugzilla3-ru/
Deleted:
  head/russian/bugzilla-ru/
  head/russian/bugzilla3-ru/
Modified:
  head/russian/Makefile
  head/russian/bugzilla/Makefile
  head/russian/bugzilla/distinfo
  head/russian/bugzilla/pkg-plist
  head/russian/bugzilla3/Makefile
  head/russian/bugzilla3/distinfo
  head/russian/bugzilla3/pkg-plist

Modified: head/russian/Makefile
==============================================================================
--- head/russian/Makefile	Thu Aug  9 20:13:41 2012	(r302360)
+++ head/russian/Makefile	Thu Aug  9 20:38:49 2012	(r302361)
@@ -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

Modified: head/russian/bugzilla/Makefile
==============================================================================
--- head/russian/bugzilla-ru/Makefile	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/russian/bugzilla/Makefile	Thu Aug  9 20:38:49 2012	(r302361)
@@ -6,28 +6,37 @@
 #
 
 PORTNAME=	bugzilla
-DISTVERSION=	4.0.5-ru-20120227
+PORTVERSION=	4.0.7
 CATEGORIES=	russian
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-4.0-ru/${PORTVERSION:R:R}
-PKGNAMESUFFIX=	-ru
+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:C/r.*$/ru/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.ru
 
 .include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
 
 do-install:
 	${MKDIR} ${WWWDIR}
-	(cd ${WRKSRC} && ${PAX} -r -w * ${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>

Modified: head/russian/bugzilla/distinfo
==============================================================================
--- head/russian/bugzilla-ru/distinfo	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/russian/bugzilla/distinfo	Thu Aug  9 20:38:49 2012	(r302361)
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-4.0.5-ru-20120227.tar.gz) = 67f9c7e8ef581808b4c0a4edd27910492bab0c0230f68c0f30ad750ad6266700
-SIZE (bugzilla/bugzilla-4.0.5-ru-20120227.tar.gz) = 336890
+SHA256 (bugzilla/bugzilla-4.0.7-ru-20120809.tar.gz) = e10e3f2578705ed4433daa0c5b6c44dc43aff696aba9a5f83dbdfc11094a2a24
+SIZE (bugzilla/bugzilla-4.0.7-ru-20120809.tar.gz) = 336769

Modified: head/russian/bugzilla/pkg-plist
==============================================================================
--- head/russian/bugzilla-ru/pkg-plist	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/russian/bugzilla/pkg-plist	Thu Aug  9 20:38:49 2012	(r302361)
@@ -286,4 +286,3 @@
 @dirrmtry %%WWWDIR%%/template
 @dirrmtry %%WWWDIR%%/help/ru
 @dirrmtry %%WWWDIR%%/help
-@dirrmtry %%WWWDIR%%

Modified: head/russian/bugzilla3/Makefile
==============================================================================
--- head/russian/bugzilla3-ru/Makefile	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/russian/bugzilla3/Makefile	Thu Aug  9 20:38:49 2012	(r302361)
@@ -6,30 +6,39 @@
 #
 
 PORTNAME=	bugzilla
-DISTVERSION=	3.6.9-ru-20120419
+PORTVERSION=	3.6.10
 CATEGORIES=	russian
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-3.6-ru/${PORTVERSION:R:R}
-PKGNAMESUFFIX=	-ru
+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
 
-LATEST_LINK=	${PKGNAMEPREFIX}bugzilla3${PKGNAMESUFFIX}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/r.*$/ru/}
+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})
+	(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>

Modified: head/russian/bugzilla3/distinfo
==============================================================================
--- head/russian/bugzilla3-ru/distinfo	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/russian/bugzilla3/distinfo	Thu Aug  9 20:38:49 2012	(r302361)
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-3.6.9-ru-20120419.tar.gz) = a6c8fa4e70b5f0fb00fc1ba80a201d934b8ca1b214aef4006834655703b6544f
-SIZE (bugzilla/bugzilla-3.6.9-ru-20120419.tar.gz) = 323608
+SHA256 (bugzilla/bugzilla-3.6.10-ru-20120809.tar.gz) = 398d5628f09b294623e64878ca0155fee54f30c22f69e69a0099d144529e7d7f
+SIZE (bugzilla/bugzilla-3.6.10-ru-20120809.tar.gz) = 323589

Modified: head/russian/bugzilla3/pkg-plist
==============================================================================
--- head/russian/bugzilla3-ru/pkg-plist	Thu Aug  9 19:00:29 2012	(r302347)
+++ head/russian/bugzilla3/pkg-plist	Thu Aug  9 20:38:49 2012	(r302361)
@@ -290,4 +290,3 @@
 @dirrmtry %%WWWDIR%%/template
 @dirrmtry %%WWWDIR%%/help/ru
 @dirrmtry %%WWWDIR%%/help
-@dirrmtry %%WWWDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208092038.q79Kco4x051052>