[pkgsrc/trunk]: pkgsrc/x11/lablgtk2 Change PKGNAME from lablgtk to lablgtk2.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90401b9a5e85
branches:  trunk
changeset: 500306:90401b9a5e85
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Oct 06 10:52:41 2005 +0000

description:
Change PKGNAME from lablgtk to lablgtk2.
This way the package can be installed at the same time as x11/lablgtk
(their PLISTs do not conflict), and as additional bonus, the PKGNAME
matches the directory name.

No dependencies, so no dependency PKGREVISION bumps needed.

XXX: I don't think I can record this change in doc/CHANGES, can I?

diffstat:

 x11/lablgtk2/Makefile      |   6 +++++-
 x11/lablgtk2/buildlink3.mk |  20 ++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diffs (55 lines):

diff -r c5e3a6e12234 -r 90401b9a5e85 x11/lablgtk2/Makefile
--- a/x11/lablgtk2/Makefile     Wed Oct 05 20:08:32 2005 +0000
+++ b/x11/lablgtk2/Makefile     Thu Oct 06 10:52:41 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/10/06 10:52:41 wiz Exp $
 #
 
 DISTNAME=      lablgtk-2.4.0
+PKGNAME=       ${DISTNAME:S/gtk/gtk2/}
 PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
@@ -15,6 +16,9 @@
 
 BUILDLINK_DEPMETHOD.ocaml=     full
 
+# previous name of this package; does not conflict with lablgtk-1.*
+CONFLICTS=     lablgtk-2.*
+
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
diff -r c5e3a6e12234 -r 90401b9a5e85 x11/lablgtk2/buildlink3.mk
--- a/x11/lablgtk2/buildlink3.mk        Wed Oct 05 20:08:32 2005 +0000
+++ b/x11/lablgtk2/buildlink3.mk        Thu Oct 06 10:52:41 2005 +0000
@@ -1,18 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/04 20:39:17 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/10/06 10:52:41 wiz Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-LABLGTK_BUILDLINK3_MK:=        ${LABLGTK_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+LABLGTK2_BUILDLINK3_MK:=       ${LABLGTK2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    lablgtk
+BUILDLINK_DEPENDS+=    lablgtk2
 .endif
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlablgtk}
-BUILDLINK_PACKAGES+=   lablgtk
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlablgtk2}
+BUILDLINK_PACKAGES+=   lablgtk2
 
-.if !empty(LABLGTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk+=    lablgtk>=2.4.0
-BUILDLINK_PKGSRCDIR.lablgtk?=  ../../x11/lablgtk2
-.endif # LABLGTK_BUILDLINK3_MK
+.if !empty(LABLGTK2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.lablgtk2+=   lablgtk2>=2.4.0
+BUILDLINK_PKGSRCDIR.lablgtk2?= ../../x11/lablgtk2
+.endif # LABLGTK2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}