From 12e7d2a110e4ac055df0b32a05ec0ade375e75b8 Mon Sep 17 00:00:00 2001 From: Jeremy Messenger Date: Mon, 29 May 2006 18:12:05 +0000 Subject: [PATCH] - Chase the rename. - A few of small clean up like double 'cvsup', '2.10 to 2.12' -> '2.12 to 2.14', and etc. --- en/gnome/docs/example-Makefile.sgml | 6 +++--- en/gnome/docs/faq2.sgml | 14 +++++++------- en/gnome/docs/faq214.sgml | 4 ++-- en/gnome/docs/gnome1_porting.sgml | 12 ++++++------ en/gnome/docs/gnome2_porting.sgml | 20 ++++++++++---------- en/gnome/docs/gnome_porting.sgml | 6 +++--- en/gnome/docs/porting.sgml | 4 ++-- en/gnome/gnomelogalyzer.sh | 6 +++--- en/gnome/includes.navgnome.sgml | 4 ++-- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/en/gnome/docs/example-Makefile.sgml b/en/gnome/docs/example-Makefile.sgml index 85e6dcf878..984fd4ca27 100644 --- a/en/gnome/docs/example-Makefile.sgml +++ b/en/gnome/docs/example-Makefile.sgml @@ -1,6 +1,6 @@ - + %navincludes; %gnomeincludes; @@ -17,7 +17,7 @@ # Date created: 27 December 2003 # Whom: Some GNOME User <&email;@FreeBSD.org> # -# $FreeBSD: www/en/gnome/docs/example-Makefile.sgml,v 1.8 2005/12/29 06:42:27 adamw Exp $ +# $FreeBSD: www/en/gnome/docs/example-Makefile.sgml,v 1.9 2006/04/30 23:38:56 marcus Exp $ # # For this example, assume there was already a gnomeapp in the tree, and that this @@ -58,7 +58,7 @@ PKGNAMESUFFIX= -gnome CONFIGURE_ARGS+= --without-gnome .endif -# Given all the above code, the package name is either "gnomeapp2-&gnomever;.2-gnome" or +# Given all the above code, the package name is either "gnomeapp2-gnome-&gnomever;.2" or # "gnomeapp2-&gnomever;.2", depending upon whether you want gnomepanel support. The downloaded # distfile will be "gnomeapp-&gnomever;.2.tar.bz2." diff --git a/en/gnome/docs/faq2.sgml b/en/gnome/docs/faq2.sgml index 317135d44b..7af48ba654 100644 --- a/en/gnome/docs/faq2.sgml +++ b/en/gnome/docs/faq2.sgml @@ -1,6 +1,6 @@ - + %navincludes; %gnomeincludes; @@ -166,7 +166,7 @@ configure: error: *** pkg-config too old; version 0.14 or better required.

While this may be buried in some other text, the error is very straight-forward: you need to upgrade pkg-config. The pkg-config application is found in the - devel/pkgconfig port. By updating this port to + devel/pkg-config port. By updating this port to the latest version, this error will go away.

You may see compiler errors relating to pthreads @@ -199,7 +199,7 @@ options _KPOSIX_PRIORITY_SCHEDULING of the same library. This can happen if you have two different versions of a port installed, or can even happen through normal portupgrade use. You can back up the libraries in /usr/local/lib/compat/pkg and remove - them, and then run portupgrade -u -rf pkgconfig. This will force a + them, and then run portupgrade -u -rf pkg-config. This will force a rebuild of all GNOME-related apps (and a fair number of other apps) without retaining old versions of libraries in /usr/local/lib/compat/pkg.

@@ -348,7 +348,7 @@ ggv 
 # pkgdb -fF
-# pkg_delete -rf pkgconfig\*
+# pkg_delete -rf pkg-config\*
 # cd /usr/ports/x11/gnome2
 # make clean
 # make install clean
@@ -404,7 +404,7 @@ ggv
 	      metacity window manager by default.  Another popular window
 	      manager that works well with GNOME &gnomever; is
 	      sawfish.  Sawfish
-	      can be found in x11-wm/sawfish2.

+	      can be found in x11-wm/sawfish.

 
 	    
To switch between metacity and sawfish in GNOME 2, you will need
 	      to do the following:

@@ -555,7 +555,7 @@ Load	"type1"
 	    
How do I configure settings for GNOME 1.4 applications under
 	      GNOME &gnomever;?

 
-	    
Install sysutils/gnomecontrolcenter, then invoke
+	    
Install sysutils/gnome-control-center1, then invoke
 	      gnomecc from the command line to bring up the GNOME
 	      1.4 control center.

 	  
@@ -1024,7 +1024,7 @@ gtk-key-theme-name = "Emacs"
 	      /usr/X11R6/libexec/gnome-settings-daemon from
 	      the command line, and check for any errors.  Most
 	      problems can be solved by reinstalling
-	      sysutils/gnomecontrolcenter2.

+	      sysutils/gnome-control-center.

 	  
 
 	  
  • 
diff --git a/en/gnome/docs/faq214.sgml b/en/gnome/docs/faq214.sgml
index ed98235163..dc5d33d1be 100644
--- a/en/gnome/docs/faq214.sgml
+++ b/en/gnome/docs/faq214.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %navincludes;
  %gnomeincludes;
@@ -53,7 +53,7 @@
 	  
    To build GNOME &gnomever;, you need to obtain the latest
 	    ports tree skeleton.  This is most easily accomplished with
 	    portsnap(8) or cvsupCVSup.  Simply obtain the latest ports tree, and you are
+	    href="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/cvsup.html">CVSup.  Simply obtain the latest ports tree, and you are
 	    ready to go.  Then do the following:
    
 	  
     # pkgdb -Ff
diff --git a/en/gnome/docs/gnome1_porting.sgml b/en/gnome/docs/gnome1_porting.sgml
index 8ccde3a2de..de37759661 100644
--- a/en/gnome/docs/gnome1_porting.sgml
+++ b/en/gnome/docs/gnome1_porting.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %navincludes;
  %gnomeincludes;
@@ -66,25 +66,25 @@
 
 			
 			  gnomedb
-			  databases/gnomedb
+			  databases/gnome-db
 			  libgda
 			
 
 			
 			  gnomelibs
-			  x11/gnomelibs
+			  x11/gnome-libs
 			  esound imlib libxml orbit
 			
 
 			
 			  gnomeprint
-			  print/gnomeprint
+			  print/gnome-print
 			  gnomelibs gnomecanvas
 			
 
 			
 			  gnomevfs
-			  devel/gnomevfs
+			  devel/gnome-vfs1
 			  gnomemimedata gconf gnomelibs
 			
 
@@ -156,7 +156,7 @@
 
 			
 			  pygtk
-			  x11-toolkits/pygtk
+			  x11-toolkits/py-gtk
 			  gnomelibs gdkpixbuf libglade
 			
 
diff --git a/en/gnome/docs/gnome2_porting.sgml b/en/gnome/docs/gnome2_porting.sgml
index f34b07c9c4..18bfd71cd3 100644
--- a/en/gnome/docs/gnome2_porting.sgml
+++ b/en/gnome/docs/gnome2_porting.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %navincludes;
  %gnomeincludes;
@@ -42,7 +42,7 @@
 
 			
 			  eel2
-			  x11-toolkits/eel2
+			  x11-toolkits/eel
 			  gnomemenus gnomedesktop gail
 			
 
@@ -78,19 +78,19 @@
 
 			
 			  gnomecontrolcenter2
-			  sysutils/gnomecontrolcenter2
+			  sysutils/gnome-control-center
 			  gnomedesktop metacity nautilus2
 			
 
 			
 			  gnomedesktop
-			  x11/gnomedesktop
+			  x11/gnome-desktop
 			  libgnomeui gnomedocutils
 			
 
 			
 			  gnomedocutils
-			  textproc/gnomedocutils
+			  textproc/gnome-doc-utils
 			  libxslt
 			
 
@@ -102,19 +102,19 @@
 
 			
 			  gnomepanel
-			  x11/gnomepanel
+			  x11/gnome-panel
 			  gnomedesktop libwnck
 			
 
 			
 			  gnomespeech
-			  accessibility/gnomespeech
+			  accessibility/gnome-speech
 			  libbonobo
 			
 
 			
 			  gnomevfs2
-			  devel/gnomevfs2
+			  devel/gnome-vfs
 			  gconf2 libbonobo gnomemimedata
 			
 
@@ -138,7 +138,7 @@
 
 			
 			  libartlgpl2
-			  graphics/libartlgpl2
+			  graphics/libart_lgpl
 			  pkgconfig
 			
 
@@ -282,7 +282,7 @@
 
 			
 			  nautilus2
-			  x11-fm/nautilus2
+			  x11-fm/nautilus
 			  librsvg2 eel2 gnomedesktop
 			
 
diff --git a/en/gnome/docs/gnome_porting.sgml b/en/gnome/docs/gnome_porting.sgml
index 0311b2c537..657d89c942 100644
--- a/en/gnome/docs/gnome_porting.sgml
+++ b/en/gnome/docs/gnome_porting.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %navincludes;
  %gnomeincludes;
@@ -47,7 +47,7 @@
 
 			
 			  gnomemimedata
-			  misc/gnomemimedata
+			  misc/gnome-mime-data
 			  gnomehier pkgconfig
 			
 
@@ -119,7 +119,7 @@
 			
 			  pkgconfig
 			  pkgconfig registers a dependency upon
-			    devel/pkgconfig to make sure it is installed.
+			    devel/pkg-config to make sure it is installed.
 			  
 			   
 			
diff --git a/en/gnome/docs/porting.sgml b/en/gnome/docs/porting.sgml
index 07ced18ec6..30eae12fa8 100644
--- a/en/gnome/docs/porting.sgml
+++ b/en/gnome/docs/porting.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %navincludes;
  %gnomeincludes;
@@ -247,7 +247,7 @@ INSTALLS_OMF=yes
 GCONF_SCHEMAS=	my_app.schemas my_app2.schemas my_app3.schemas
 	  
    
 
-	  
    For example in audio/gnomemedia2:
    
+	  
    For example in audio/gnome-media:
    
 
 	  
     GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
diff --git a/en/gnome/gnomelogalyzer.sh b/en/gnome/gnomelogalyzer.sh
index 22e45ba51e..295775d1a7 100644
--- a/en/gnome/gnomelogalyzer.sh
+++ b/en/gnome/gnomelogalyzer.sh
@@ -27,7 +27,7 @@
 # Heh. "Tort."
 #
 # $MCom: portstools/gnomelogalyzer.sh.in,v 1.12 2005/06/28 05:47:54 adamw Exp $
-#   $FreeBSD: www/en/gnome/gnomelogalyzer.sh,v 1.6 2005/08/14 07:01:28 adamw Exp $
+#   $FreeBSD: www/en/gnome/gnomelogalyzer.sh,v 1.7 2006/01/07 06:14:16 mezz Exp $
 #
 
 # This script uses some simple yet effective heuristics to analyse
@@ -153,12 +153,12 @@ fi
 #
 # TEST: Invalid pkg-config version
 #
-# SOLUTION: portupgrade pkgconfig
+# SOLUTION: portupgrade pkg-config
 
 debug -n "Checking pkg-config version... "
 if grep -q '\*\*\* Your version of pkg-config is too old.' ${buildlog} ; then
 	echo "You have an outdated version of pkg-config installed."
-	soln_portupgrade "pkgconfig"
+	soln_portupgrade "pkg-config"
 	exit
 else
 	debug "OK"
diff --git a/en/gnome/includes.navgnome.sgml b/en/gnome/includes.navgnome.sgml
index 1d1aea8727..1fef297178 100644
--- a/en/gnome/includes.navgnome.sgml
+++ b/en/gnome/includes.navgnome.sgml
@@ -1,4 +1,4 @@
-
+
 
 
 
    Section Navigation
    
@@ -16,7 +16,7 @@
 
  • Documentation