summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--meta-pkgs/gnome-base/Makefile4
-rw-r--r--x11/Makefile4
-rw-r--r--x11/gnome-terminal/DESCR (renamed from x11/gnome2-terminal/DESCR)0
-rw-r--r--x11/gnome-terminal/Makefile (renamed from x11/gnome2-terminal/Makefile)5
-rw-r--r--x11/gnome-terminal/PLIST (renamed from x11/gnome2-terminal/PLIST)2
-rw-r--r--x11/gnome-terminal/distinfo (renamed from x11/gnome2-terminal/distinfo)2
-rw-r--r--x11/gnome-terminal/patches/patch-aa (renamed from x11/gnome2-terminal/patches/patch-aa)2
-rw-r--r--x11/gnome-terminal/patches/patch-ab (renamed from x11/gnome2-terminal/patches/patch-ab)2
-rw-r--r--x11/gnome-terminal/patches/patch-ac (renamed from x11/gnome2-terminal/patches/patch-ac)2
10 files changed, 13 insertions, 14 deletions
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index b6acfbbf647..0103f3203cd 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2007/09/19 23:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2007/09/19 23:57:00 wiz Exp $
DISTNAME= anjuta-2.0.2
PKGREVISION= 6
@@ -13,7 +13,7 @@ DEPENDS+= autogen-[0-9]*:../../devel/autogen
DEPENDS+= autoconf>=2.59:../../devel/autoconf
DEPENDS+= automake>=1.8.2:../../devel/automake
DEPENDS+= glade>=2.6.0:../../devel/glade
-DEPENDS+= gnome2-terminal>=2.4.2:../../x11/gnome2-terminal
+DEPENDS+= gnome-terminal>=2.4.2:../../x11/gnome-terminal
DEPENDS+= libtool>=1.5.2:../../devel/libtool
DEPENDS+= yelp>=2.4.2:../../misc/yelp
diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index 8dbdbda7a8c..2fee76832f8 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/09/19 23:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/19 23:57:00 wiz Exp $
DISTNAME= gnome-base-2.18.1
CATEGORIES= meta-pkgs x11 gnome
@@ -75,7 +75,7 @@ DEPENDS+= gnome-applets>=2.18.0:../../x11/gnome2-applets
DEPENDS+= gnome-themes>=2.18.1:../../x11/gnome-themes
DEPENDS+= gnome-backgrounds>=2.15.92:../../graphics/gnome-backgrounds
DEPENDS+= vte>=0.16.1:../../x11/vte
-DEPENDS+= gnome2-terminal>=2.18.0:../../x11/gnome2-terminal
+DEPENDS+= gnome-terminal>=2.18.0:../../x11/gnome-terminal
DEPENDS+= gnome-session>=2.18.0:../../x11/gnome-session
EXTRACT_ONLY= # empty
diff --git a/x11/Makefile b/x11/Makefile
index 4bd1b3fdd9b..72de9b80839 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.522 2007/09/19 23:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.523 2007/09/19 23:57:00 wiz Exp $
#
COMMENT= Packages to support the X window system
@@ -58,10 +58,10 @@ SUBDIR+= gnome-mag
SUBDIR+= gnome-panel
SUBDIR+= gnome-screensaver
SUBDIR+= gnome-session
+SUBDIR+= gnome-terminal
SUBDIR+= gnome-themes
SUBDIR+= gnome-themes-extras
SUBDIR+= gnome2-applets
-SUBDIR+= gnome2-terminal
SUBDIR+= gnopernicus
SUBDIR+= gnustep-back
SUBDIR+= gnustep-gui
diff --git a/x11/gnome2-terminal/DESCR b/x11/gnome-terminal/DESCR
index d764558f8cb..d764558f8cb 100644
--- a/x11/gnome2-terminal/DESCR
+++ b/x11/gnome-terminal/DESCR
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome-terminal/Makefile
index 60441a040eb..712b6071f56 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2007/09/19 23:13:37 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2007/09/19 23:57:04 wiz Exp $
#
DISTNAME= gnome-terminal-2.18.1
-PKGNAME= ${DISTNAME:S/-/2-/}
PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.18/}
@@ -12,7 +11,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Xterm like terminal program for GNOME 2
-CONFLICTS= gnome-core-[0-9]*
+CONFLICTS= gnome-core-[0-9]* gnome2-terminal-[0-9]*
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
diff --git a/x11/gnome2-terminal/PLIST b/x11/gnome-terminal/PLIST
index 0698ef8edd6..3593f83b304 100644
--- a/x11/gnome2-terminal/PLIST
+++ b/x11/gnome-terminal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/07/06 18:44:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.1 2007/09/19 23:57:04 wiz Exp $
bin/gnome-terminal
lib/bonobo/servers/gnome-terminal.server
share/applications/gnome-terminal.desktop
diff --git a/x11/gnome2-terminal/distinfo b/x11/gnome-terminal/distinfo
index ea69d072603..8b68b885c7e 100644
--- a/x11/gnome2-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2007/07/06 18:44:10 drochner Exp $
+$NetBSD: distinfo,v 1.1 2007/09/19 23:57:04 wiz Exp $
SHA1 (gnome-terminal-2.18.1.tar.bz2) = 130af5f027f967116f86947ec54be66f0f974df6
RMD160 (gnome-terminal-2.18.1.tar.bz2) = fb99a2e42752ae67eda7e2b980c1127e104c849d
diff --git a/x11/gnome2-terminal/patches/patch-aa b/x11/gnome-terminal/patches/patch-aa
index 96c9d5fe126..553cc5603cc 100644
--- a/x11/gnome2-terminal/patches/patch-aa
+++ b/x11/gnome-terminal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2006/03/30 21:18:25 jmmv Exp $
+$NetBSD: patch-aa,v 1.1 2007/09/19 23:57:05 wiz Exp $
--- po/am.po.orig 2005-09-06 14:30:48.000000000 +0200
+++ po/am.po
diff --git a/x11/gnome2-terminal/patches/patch-ab b/x11/gnome-terminal/patches/patch-ab
index 7b087558658..faec0632ce6 100644
--- a/x11/gnome2-terminal/patches/patch-ab
+++ b/x11/gnome-terminal/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2006/03/30 21:18:25 jmmv Exp $
+$NetBSD: patch-ab,v 1.1 2007/09/19 23:57:05 wiz Exp $
--- po/ga.po.orig 2005-09-06 14:30:48.000000000 +0200
+++ po/ga.po
diff --git a/x11/gnome2-terminal/patches/patch-ac b/x11/gnome-terminal/patches/patch-ac
index 7fa58487db1..a63fbd61017 100644
--- a/x11/gnome2-terminal/patches/patch-ac
+++ b/x11/gnome-terminal/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2006/03/30 21:18:25 jmmv Exp $
+$NetBSD: patch-ac,v 1.1 2007/09/19 23:57:05 wiz Exp $
--- po/ms.po.orig 2005-09-06 14:30:48.000000000 +0200
+++ po/ms.po