Rename libglade2 to libglade to match the upstream name.

7 files changed, 34 insertions, 33 deletions

diff --git a/devel/libglade2/DESCR b/devel/libglade/DESCR
index 99a77f0895d..99a77f0895d 100644
--- a/devel/libglade2/DESCR
+++ b/devel/libglade/DESCR
diff --git a/devel/libglade2/Makefile b/devel/libglade/Makefile
index de945aefcf7..00d7fad21de 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.53 2007/08/09 19:13:29 drochner Exp $
+# $NetBSD: Makefile,v 1.64 2007/09/21 12:58:54 wiz Exp $
 #
 
 DISTNAME=		libglade-2.6.2
-PKGNAME=		${DISTNAME:S/libglade/libglade2/}
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
 HOMEPAGE=		http://www.jamesh.id.au/software/libglade/
-COMMENT=		Runtime interpreter for GLADE GUI files (v2)
+COMMENT=		Runtime interpreter for GLADE GUI files
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,6 +17,8 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libglade-2.0.pc.in
 
+CONFLICTS+=		libglade-[0-9]*
+
 CONFIGURE_ARGS+=	--without-xml-catalog
 
 XML_ENTRIES=	system http://glade.gnome.org/glade-2.0.dtd \
diff --git a/devel/libglade2/PLIST b/devel/libglade/PLIST
index 93e12e90e3c..1f6b8133d39 100644
--- a/devel/libglade2/PLIST
+++ b/devel/libglade/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/12/20 07:37:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/09/21 12:58:55 wiz Exp $
 include/libglade-2.0/glade/glade-build.h
 include/libglade-2.0/glade/glade-init.h
 include/libglade-2.0/glade/glade-parser.h
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
new file mode 100644
index 00000000000..ca1fac122a9
--- /dev/null
+++ b/devel/libglade/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.13 2007/09/21 12:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBGLADE_BUILDLINK3_MK:=	${LIBGLADE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libglade
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade}
+BUILDLINK_PACKAGES+=	libglade
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglade
+
+.if !empty(LIBGLADE_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.3.6
+BUILDLINK_ABI_DEPENDS.libglade+=	libglade>=2.5.1nb4
+BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
+
+PRINT_PLIST_AWK+=	/^@dirrm lib\/libglade$$/ { next; }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/libglade\/2.0$$/ \
+				{ print "@comment in libglade: " $$0; next; }
+.endif	# LIBGLADE_BUILDLINK3_MK
+
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libglade2/distinfo b/devel/libglade/distinfo
index 7d3affeff5e..8b8421a01a2 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2007/08/09 19:13:29 drochner Exp $
+$NetBSD: distinfo,v 1.10 2007/09/21 12:58:55 wiz Exp $
 
 SHA1 (libglade-2.6.2.tar.bz2) = 99ffcf33bcd0fdd67191c99b117a0cefc26b84bc
 RMD160 (libglade-2.6.2.tar.bz2) = d6b25114cdbcc5c74412186a9a5a2cc9a140c4e7
diff --git a/devel/libglade2/patches/patch-aa b/devel/libglade/patches/patch-aa
index 1b270ffe363..9a5f9e60583 100644
--- a/devel/libglade2/patches/patch-aa
+++ b/devel/libglade/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2007/08/09 19:13:29 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2007/09/21 12:58:55 wiz Exp $
 
 --- configure.orig	2007-07-31 00:27:42.000000000 +0200
 +++ configure
diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk
deleted file mode 100644
index 60a5b76aa84..00000000000
--- a/devel/libglade2/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:44 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBGLADE2_BUILDLINK3_MK:=	${LIBGLADE2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libglade2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade2}
-BUILDLINK_PACKAGES+=	libglade2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libglade2
-
-.if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.3.6
-BUILDLINK_ABI_DEPENDS.libglade2+=	libglade2>=2.5.1nb4
-BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
-
-PRINT_PLIST_AWK+=	/^@dirrm lib\/libglade$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/libglade\/2.0$$/ \
-				{ print "@comment in libglade2: " $$0; next; }
-.endif	# LIBGLADE2_BUILDLINK3_MK
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}