summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--editors/gedit/Makefile (renamed from editors/gedit2/Makefile)3
-rw-r--r--editors/gedit/distinfo (renamed from editors/gedit2/distinfo)0
-rw-r--r--editors/gedit/files/patch-configure (renamed from editors/gedit2/files/patch-configure)0
-rw-r--r--editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c (renamed from editors/gedit2/files/patch-plugins_spell_gedit-spell-checker.c)0
-rw-r--r--editors/gedit/pkg-descr (renamed from editors/gedit2/pkg-descr)0
-rw-r--r--editors/gedit/pkg-plist (renamed from editors/gedit2/pkg-plist)0
-rw-r--r--x11/gnome2-lite/Makefile2
-rw-r--r--x11/gnome2-lite/pkg-install2
-rw-r--r--x11/gnome2/Makefile2
-rw-r--r--x11/gnome2/pkg-install2
10 files changed, 5 insertions, 6 deletions
diff --git a/editors/gedit2/Makefile b/editors/gedit/Makefile
index c528a94bc..6ee07b0e3 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit/Makefile
@@ -5,12 +5,11 @@
# $FreeBSD$
#
-PORTNAME= gedit2
+PORTNAME= gedit
PORTVERSION= 2.9.4
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9
-DISTNAME= gedit-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit2/distinfo b/editors/gedit/distinfo
index f4c0b0282..f4c0b0282 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit/distinfo
diff --git a/editors/gedit2/files/patch-configure b/editors/gedit/files/patch-configure
index 91c1e9a65..91c1e9a65 100644
--- a/editors/gedit2/files/patch-configure
+++ b/editors/gedit/files/patch-configure
diff --git a/editors/gedit2/files/patch-plugins_spell_gedit-spell-checker.c b/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c
index 5110fb708..5110fb708 100644
--- a/editors/gedit2/files/patch-plugins_spell_gedit-spell-checker.c
+++ b/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c
diff --git a/editors/gedit2/pkg-descr b/editors/gedit/pkg-descr
index 85018482c..85018482c 100644
--- a/editors/gedit2/pkg-descr
+++ b/editors/gedit/pkg-descr
diff --git a/editors/gedit2/pkg-plist b/editors/gedit/pkg-plist
index d3732cae1..d3732cae1 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit/pkg-plist
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index a4f4dd871..6ca040047 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
eog:${PORTSDIR}/graphics/eog \
- gedit:${PORTSDIR}/editors/gedit2 \
+ gedit:${PORTSDIR}/editors/gedit \
gnome-terminal:${PORTSDIR}/x11/gnometerminal \
gnome-session:${PORTSDIR}/x11/gnomesession \
gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
index 2cfadba11..11bd6995e 100644
--- a/x11/gnome2-lite/pkg-install
+++ b/x11/gnome2-lite/pkg-install
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
export PATH
if [ "$2" = "PRE-INSTALL" ]; then
- GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus gedit xalf gnomegames ggv gnomeaudio"
+ GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames ggv gnomeaudio"
for package in ${GNOME_ONE_DESKTOP}; do
if pkg_info | grep "^${package}-[0-9]" >/dev/null 2>&1; then
echo "${package} was detected on the system. This package is part of the GNOME 1.x"
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 93566ed02..8b07dc64f 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
eog:${PORTSDIR}/graphics/eog \
gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
gnect:${PORTSDIR}/games/gnomegames2 \
- gedit:${PORTSDIR}/editors/gedit2 \
+ gedit:${PORTSDIR}/editors/gedit \
gnome-terminal:${PORTSDIR}/x11/gnometerminal \
gnome-session:${PORTSDIR}/x11/gnomesession \
bug-buddy:${PORTSDIR}/devel/bugbuddy \
diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install
index a4ae8c2ca..f895a8a6c 100644
--- a/x11/gnome2/pkg-install
+++ b/x11/gnome2/pkg-install
@@ -9,7 +9,7 @@ trap "rm -f ${tmp_pkg_info}" 0
pkg_info > ${tmp_pkg_info}
if [ "$2" = "PRE-INSTALL" ]; then
- GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus gedit xalf gnomegames ggv gnomeaudio"
+ GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames ggv gnomeaudio"
for package in ${GNOME_ONE_DESKTOP}; do
if grep "^${package}-[0-9]" ${tmp_pkg_info} >/dev/null 2>&1; then
echo "${package} was detected on the system. This package is part of the GNOME 1.x"