[pkgsrc/trunk]: pkgsrc/editors Do not set PKGREVISION in Makefile.common.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00b8da3cae84
branches:  trunk
changeset: 488874:00b8da3cae84
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 10 19:27:32 2005 +0000

description:
Do not set PKGREVISION in Makefile.common.
Set DIST_SUBDIR, since there were two versions of the abiword-2.2.3
distfile (difference is a "const").
Hi adam!

diffstat:

 editors/abiword-plugins/Makefile |  3 ++-
 editors/abiword-plugins/distinfo |  6 +++---
 editors/abiword/Makefile         |  4 ++--
 editors/abiword/Makefile.common  |  7 +++++--
 editors/abiword/distinfo         |  6 +++---
 5 files changed, 15 insertions(+), 11 deletions(-)

diffs (78 lines):

diff -r 8da4b109353c -r 00b8da3cae84 editors/abiword-plugins/Makefile
--- a/editors/abiword-plugins/Makefile  Thu Feb 10 19:11:07 2005 +0000
+++ b/editors/abiword-plugins/Makefile  Thu Feb 10 19:27:32 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/02/07 14:15:13 adam Exp $
+# $NetBSD: Makefile,v 1.6 2005/02/10 19:27:32 wiz Exp $
 
 .include "../../editors/abiword/Makefile.common"
 
 PKGNAME=       abiword-plugins-${ABIWORD_DIST_VERSION}
+PKGREVISION=   1
 COMMENT=       Plugins enhancing Abiword's capabilities
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/abiword-plugins
diff -r 8da4b109353c -r 00b8da3cae84 editors/abiword-plugins/distinfo
--- a/editors/abiword-plugins/distinfo  Thu Feb 10 19:11:07 2005 +0000
+++ b/editors/abiword-plugins/distinfo  Thu Feb 10 19:27:32 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/07 14:15:13 adam Exp $
+$NetBSD: distinfo,v 1.5 2005/02/10 19:27:32 wiz Exp $
 
-SHA1 (abiword-2.2.3.tar.bz2) = 0ad900f13e535a4b55faed41b8ab8d63400c7712
-Size (abiword-2.2.3.tar.bz2) = 23472285 bytes
+SHA1 (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 0ad900f13e535a4b55faed41b8ab8d63400c7712
+Size (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 23472285 bytes
diff -r 8da4b109353c -r 00b8da3cae84 editors/abiword/Makefile
--- a/editors/abiword/Makefile  Thu Feb 10 19:11:07 2005 +0000
+++ b/editors/abiword/Makefile  Thu Feb 10 19:27:32 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2005/01/11 11:09:26 adam Exp $
+# $NetBSD: Makefile,v 1.86 2005/02/10 19:27:32 wiz Exp $
 
 .include "Makefile.common"
-
 PKGNAME=       abiword-${ABIWORD_DIST_VERSION}
+PKGREVISION=   1
 COMMENT=       Open Source cross-platform word processor
 
 # GTK1 version and previous name of the GTK2 version
diff -r 8da4b109353c -r 00b8da3cae84 editors/abiword/Makefile.common
--- a/editors/abiword/Makefile.common   Thu Feb 10 19:11:07 2005 +0000
+++ b/editors/abiword/Makefile.common   Thu Feb 10 19:27:32 2005 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.11 2005/02/05 18:13:31 jklos Exp $
+# $NetBSD: Makefile.common,v 1.12 2005/02/10 19:27:32 wiz Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
 ABIWORD_DIST_VERSION=  2.2.3
 DISTNAME=      abiword-${ABIWORD_DIST_VERSION}
-PKGREVISION=   1
 
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=abiword/}
@@ -14,6 +13,10 @@
 
 BUILD_USES_MSGFMT=     yes
 
+# there were two versions of abiword-2.2.3 -- you can
+# remove this line during the next update
+DIST_SUBDIR=           abiword-2.2.3
+
 MAKEFILE=              GNUmakefile
 GNU_CONFIGURE=         yes
 USE_BUILDLINK3=                yes
diff -r 8da4b109353c -r 00b8da3cae84 editors/abiword/distinfo
--- a/editors/abiword/distinfo  Thu Feb 10 19:11:07 2005 +0000
+++ b/editors/abiword/distinfo  Thu Feb 10 19:27:32 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.34 2005/02/07 12:54:27 adam Exp $
+$NetBSD: distinfo,v 1.35 2005/02/10 19:27:32 wiz Exp $
 
-SHA1 (abiword-2.2.3.tar.bz2) = 0ad900f13e535a4b55faed41b8ab8d63400c7712
-Size (abiword-2.2.3.tar.bz2) = 23472285 bytes
+SHA1 (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 0ad900f13e535a4b55faed41b8ab8d63400c7712
+Size (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 23472285 bytes
 SHA1 (patch-aa) = e54908d64747a3fc78e13036ebbd909b2b1b64aa
 SHA1 (patch-ab) = 5957635eb05d4b6f9d623c8585ae252d9c484408
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5