aboutsummaryrefslogtreecommitdiffstats
path: root/x11-fm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-fm')
-rw-r--r--x11-fm/Makefile2
-rw-r--r--x11-fm/nautilus/Makefile (renamed from x11-fm/nautilus2/Makefile)5
-rw-r--r--x11-fm/nautilus/distinfo (renamed from x11-fm/nautilus2/distinfo)0
-rw-r--r--x11-fm/nautilus/files/patch-Makefile.in (renamed from x11-fm/nautilus2/files/patch-Makefile.in)0
-rw-r--r--x11-fm/nautilus/files/patch-aa (renamed from x11-fm/nautilus2/files/patch-aa)0
-rw-r--r--x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c (renamed from x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c)0
-rw-r--r--x11-fm/nautilus/pkg-descr (renamed from x11-fm/nautilus2/pkg-descr)0
-rw-r--r--x11-fm/nautilus/pkg-plist (renamed from x11-fm/nautilus2/pkg-plist)0
-rw-r--r--x11-fm/py-nautilus/Makefile2
9 files changed, 4 insertions, 5 deletions
diff --git a/x11-fm/Makefile b/x11-fm/Makefile
index 35c0ad4f52c2..081dea0b1862 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -21,7 +21,7 @@
SUBDIR += jaffm
SUBDIR += krusader
SUBDIR += mtoolsfm
- SUBDIR += nautilus2
+ SUBDIR += nautilus
SUBDIR += offix-files
SUBDIR += pcmanfm
SUBDIR += py-nautilus
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus/Makefile
index b77b277daaa2..b560a2b257da 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,12 +6,11 @@
# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.105 2006/04/13 07:52:42 bland Exp $
#
-PORTNAME= nautilus2
+PORTNAME= nautilus
PORTVERSION= 2.14.1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME= nautilus-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus/distinfo
index 672c4c291eb1..672c4c291eb1 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus/distinfo
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
index a4f79ca6bb37..a4f79ca6bb37 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus/files/patch-Makefile.in
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index 25fa0ee71c8a..25fa0ee71c8a 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
index 2d67d65e74db..2d67d65e74db 100644
--- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
diff --git a/x11-fm/nautilus2/pkg-descr b/x11-fm/nautilus/pkg-descr
index b4f3fd678e8f..b4f3fd678e8f 100644
--- a/x11-fm/nautilus2/pkg-descr
+++ b/x11-fm/nautilus/pkg-descr
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus/pkg-plist
index b8cea3254ea9..b8cea3254ea9 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index 4b3dbc9f0a5f..ba8f5ff8839c 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -17,7 +17,7 @@ DISTNAME= nautilus-python-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python nautilus bindings
-LIB_DEPENDS= nautilus-extension:${PORTSDIR}/x11-fm/nautilus2
+LIB_DEPENDS= nautilus-extension:${PORTSDIR}/x11-fm/nautilus
USE_BZIP2= yes
USE_X_PREFIX= yes