diff options
| -rw-r--r-- | devel/Makefile | 6 | ||||
| -rw-r--r-- | devel/anjuta/Makefile | 6 | ||||
| -rw-r--r-- | devel/glade-gnome/DESCR (renamed from devel/glade2-gnome/DESCR) | 0 | ||||
| -rw-r--r-- | devel/glade-gnome/MESSAGE (renamed from devel/glade2-gnome/MESSAGE) | 2 | ||||
| -rw-r--r-- | devel/glade-gnome/Makefile (renamed from devel/glade2-gnome/Makefile) | 8 | ||||
| -rw-r--r-- | devel/glade/DESCR (renamed from devel/glade2/DESCR) | 2 | ||||
| -rw-r--r-- | devel/glade/Makefile (renamed from devel/glade2/Makefile) | 4 | ||||
| -rw-r--r-- | devel/glade/Makefile.common (renamed from devel/glade2/Makefile.common) | 11 | ||||
| -rw-r--r-- | devel/glade/PLIST (renamed from devel/glade2/PLIST) | 2 | ||||
| -rw-r--r-- | devel/glade/distinfo (renamed from devel/glade2/distinfo) | 2 | ||||
| -rw-r--r-- | doc/CHANGES | 4 |
11 files changed, 25 insertions, 22 deletions
diff --git a/devel/Makefile b/devel/Makefile index 6b864bf4b78..d84359766a1 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.739 2006/03/11 22:00:30 wiz Exp $ +# $NetBSD: Makefile,v 1.740 2006/03/11 22:23:53 jmmv Exp $ # COMMENT= Development utilities @@ -160,8 +160,8 @@ SUBDIR+= gettext-m4 SUBDIR+= gettext-tools SUBDIR+= giblib SUBDIR+= gindent -SUBDIR+= glade2 -SUBDIR+= glade2-gnome +SUBDIR+= glade +SUBDIR+= glade-gnome SUBDIR+= glib SUBDIR+= glib2 SUBDIR+= glibmm diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 547b54cc15d..14d9445df7b 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2006/03/06 00:18:15 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2006/03/11 22:23:53 jmmv Exp $ DISTNAME= anjuta-1.2.3 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=anjuta/} @@ -12,7 +12,7 @@ COMMENT= Gnome based IDE for C and C++ DEPENDS+= autoconf>=2.59:../../devel/autoconf DEPENDS+= automake>=1.8.2:../../devel/automake DEPENDS+= gettext>=0.11.5:../../devel/gettext -DEPENDS+= glade2>=2.6.0:../../devel/glade2 +DEPENDS+= glade>=2.6.0:../../devel/glade DEPENDS+= gnome2-terminal>=2.4.2:../../x11/gnome2-terminal DEPENDS+= libtool>=1.5.2:../../devel/libtool DEPENDS+= yelp>=2.4.2:../../misc/yelp diff --git a/devel/glade2-gnome/DESCR b/devel/glade-gnome/DESCR index 92bf9e49087..92bf9e49087 100644 --- a/devel/glade2-gnome/DESCR +++ b/devel/glade-gnome/DESCR diff --git a/devel/glade2-gnome/MESSAGE b/devel/glade-gnome/MESSAGE index 72d350492c9..e5837a32af3 100644 --- a/devel/glade2-gnome/MESSAGE +++ b/devel/glade-gnome/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2004/12/29 12:58:26 jmmv Exp $ +$NetBSD: MESSAGE,v 1.1 2006/03/11 22:23:53 jmmv Exp $ You might want to install the libgail-gnome package for better gnome accessibility support. diff --git a/devel/glade2-gnome/Makefile b/devel/glade-gnome/Makefile index e1d3db1f78c..1002195c881 100644 --- a/devel/glade2-gnome/Makefile +++ b/devel/glade-gnome/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.8 2006/03/11 22:05:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.1 2006/03/11 22:23:53 jmmv Exp $ -.include "../../devel/glade2/Makefile.common" +.include "../../devel/glade/Makefile.common" -PKGNAME= ${DISTNAME:S/glade/glade2-gnome/} +PKGNAME= ${DISTNAME:S/glade/glade-gnome/} CATEGORIES+= gnome COMMENT+= and GNOME2 -CONFLICTS+= glade2-[0-9]* +CONFLICTS+= glade-[0-9]* #.include "../../databases/libgda/buildlink3.mk" #.include "../../databases/libgnomedb/buildlink3.mk" diff --git a/devel/glade2/DESCR b/devel/glade/DESCR index 261923c8fbe..d39b322076d 100644 --- a/devel/glade2/DESCR +++ b/devel/glade/DESCR @@ -4,4 +4,4 @@ is a library for creating graphical user interfaces for the X Window System. See http://www.gtk.org/) This package provides Glade built with GTK2 support only. If you want -GNOME2 support, install the glade2-gnome package instead. +GNOME2 support, install the glade-gnome package instead. diff --git a/devel/glade2/Makefile b/devel/glade/Makefile index 972f2d00def..c9855d09bb3 100644 --- a/devel/glade2/Makefile +++ b/devel/glade/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.39 2006/03/11 22:05:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.53 2006/03/11 22:23:53 jmmv Exp $ .include "Makefile.common" -CONFLICTS+= glade2-gnome-[0-9]* +CONFLICTS+= glade-gnome-[0-9]* CONFIGURE_ARGS+= --disable-gnome CONFIGURE_ARGS+= --disable-gnome-db diff --git a/devel/glade2/Makefile.common b/devel/glade/Makefile.common index f0b4fe3bce3..effe6844bb6 100644 --- a/devel/glade2/Makefile.common +++ b/devel/glade/Makefile.common @@ -1,7 +1,6 @@ -# $NetBSD: Makefile.common,v 1.8 2006/03/11 22:05:02 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.1 2006/03/11 22:23:53 jmmv Exp $ DISTNAME= glade-2.12.1 -PKGNAME= ${DISTNAME:S/-/2-/} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/2.12/} EXTRACT_SUFX= .tar.bz2 @@ -10,9 +9,11 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://glade.gnome.org/ COMMENT= User interface builder for the GTK2+ toolkit -DISTINFO_FILE= ${.CURDIR}/../../devel/glade2/distinfo -PATCHDIR= ${.CURDIR}/../../devel/glade2/patches -PLIST_SRC= ${.CURDIR}/../../devel/glade2/PLIST +DISTINFO_FILE= ${.CURDIR}/../../devel/glade/distinfo +PATCHDIR= ${.CURDIR}/../../devel/glade/patches +PLIST_SRC= ${.CURDIR}/../../devel/glade/PLIST + +CONFLICTS+= glade2-[0-9]* glade2-gnome-[0-9]* GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 diff --git a/devel/glade2/PLIST b/devel/glade/PLIST index 49bae4b46a5..f941522b74a 100644 --- a/devel/glade2/PLIST +++ b/devel/glade/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2006/03/11 22:05:02 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/03/11 22:23:53 jmmv Exp $ bin/glade-2 share/applications/glade-2.desktop share/glade-2/gtk/autogen.sh diff --git a/devel/glade2/distinfo b/devel/glade/distinfo index 21320b11ba8..c9e792bbc70 100644 --- a/devel/glade2/distinfo +++ b/devel/glade/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2006/03/11 22:05:02 jmmv Exp $ +$NetBSD: distinfo,v 1.7 2006/03/11 22:23:53 jmmv Exp $ SHA1 (glade-2.12.1.tar.bz2) = 19b0152da79c4ff24b5d5277370ffc3bda8ee07a RMD160 (glade-2.12.1.tar.bz2) = 302d729c207904063f01b89312181534fff44574 diff --git a/doc/CHANGES b/doc/CHANGES index f1cc0036ae4..2975c752656 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.13266 2006/03/11 22:05:26 jmmv Exp $ +$NetBSD: CHANGES,v 1.13267 2006/03/11 22:23:52 jmmv Exp $ Changes to the packages collection and infrastructure in 2006: @@ -1456,3 +1456,5 @@ Changes to the packages collection and infrastructure in 2006: Added devel/libsigsegv version 2.2 [wiz 2006-03-11] Updated devel/glade2 to 2.12.1 [jmmv 2006-03-11] Updated devel/glade2-gnome to 2.12.1 [jmmv 2006-03-11] + Renamed devel/glade2 to devel/glade [jmmv 2006-03-11] + Renamed devel/glade2-gnome to devel/glade-gnome [jmmv 2006-03-11] |