Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jun 2013 06:43:31 GMT
From:      Jason Helfman <jgh@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        gnome@FreeBSD.org
Subject:   [patch] gnome porting updates
Message-ID:  <201306030643.r536hVCM060823@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Submitter-Id:	current-users
>Originator:	Jason Helfman
>Organization:	
>Confidential:	no 
>Synopsis:	[patch] gnome porting updates
>Severity:	non-critical
>Priority:	low
>Category:	docs
>Class:		change-request
>Release:	FreeBSD 10.0-CURRENT amd64
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r251226: Sat Jun 1 21:56:43 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
Attempt to synchronize with porters handbook with recent changes/updates.
There could be more, but I didn't read the entire GNOME porting handbook.

On a side note, it may be worth some effort to merge this into the Porters
Handbook, so it can get some more attention.

>How-To-Repeat:
	
>Fix:

Index: en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.xml
===================================================================
--- en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.xml	(revision 41830)
+++ en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.xml	(working copy)
@@ -17,33 +17,30 @@
 	  <p>The following is an example Makefile for a FreeBSD GNOME port.</p>
 
 	  <pre>
-# New ports collection makefile for:	gnomeapp
-# Date created:						27 December 2003
-# Whom:								Some GNOME User &lt;&email;@FreeBSD.org&gt;
-#
+# Created by: Some GNOME User &lt;&email;@FreeBSD.org&gt;
 # $FreeBSD$
-#
 
 # For this example, assume there was already a gnomeapp in the tree, and that this
 # is the GTK+-2 version (i.e. gnomeapp2 versus gnomeapp).
-PORTname=		gnomeapp2
+PORTNAME=	gnomeapp2
 PORTVERSION=	&gnomever;.2
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTname=	${PORTNAME:S/2//}-${PORTVERSION}
+DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNOME app that does some stuff
+COMMENT=	GNOME app that does some stuff
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes # NOTE: if the port needs ltverhack, this must be
-USE_AUTOTOOLS="libtool":15
-USE_GMAKE=		yes # same with GNU make
+USE_AUTOTOOLS=	"libtool":15
+USE_GMAKE=	yes # same with GNU make
 # This is for i18n:
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 				LDFLAGS="-L${LOCALBASE}/lib"
-USE_GNOME=		gnomehack gtk20
+USE_GNOME=	gtk20
+USES=		pathfix
 
 # This application can dock in the GNOME panel, or it can not.
 # But there's no need to build support for it if the GNOME panel
Index: en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.xml
===================================================================
--- en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.xml	(revision 41830)
+++ en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.xml	(working copy)
@@ -53,7 +53,7 @@
 			<tr>
 			  <td><tt>glib12</tt></td>
 			  <td><tt>devel/glib12</tt></td>
-			  <td><tt>pkgconfig</tt></td>
+			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
Index: en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.xml
===================================================================
--- en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.xml	(revision 41830)
+++ en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.xml	(working copy)
@@ -71,7 +71,7 @@
 			<tr>
 			  <td><tt>_glib20</tt></td>
 			  <td><tt>devel/glib20</tt></td>
-			  <td><tt>pkgconfig</tt></td>
+			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
@@ -182,7 +182,7 @@
 			<tr>
 			  <td><tt>libartlgpl2</tt></td>
 			  <td><tt>graphics/libart_lgpl</tt></td>
-			  <td><tt>pkgconfig</tt></td>
+			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
@@ -308,7 +308,7 @@
 			<tr>
 			  <td><tt>libxml2</tt></td>
 			  <td><tt>textproc/libxml2</tt></td>
-			  <td><tt>pkgconfig</tt></td>
+			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
Index: en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.xml
===================================================================
--- en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.xml	(revision 41830)
+++ en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.xml	(working copy)
@@ -32,14 +32,6 @@
 			</tr>
 
 			<tr>
-			  <td><tt>gnomehack</tt></td>
-			  <td colspan="2"><tt>gnomehack</tt> makes common GNOME
-			    Makefile substitutions that nearly every GNOME port
-			    requires to fit into the proper mtree structure.
-			  </td>
-			</tr>
-
-			<tr>
 			  <td><tt>gnomehier</tt></td>
 			  <td colspan="2"><tt>gnomehier</tt> installs all the
 			    directories needed for both the GNOME 1 and 2 desktops.
@@ -52,7 +44,7 @@
 			<tr>
 			  <td><tt>gnomemimedata</tt></td>
 			  <td><tt>misc/gnome-mime-data</tt></td>
-			  <td><tt>gnomehier pkgconfig</tt></td>
+			  <td><tt>gnomehier</tt></td>
 			</tr>
 
 			<tr>
@@ -131,14 +123,6 @@
 			</tr>
 
 			<tr>
-			  <td><tt>pkgconfig</tt></td>
-			  <td><tt>pkgconfig</tt> registers a dependency upon
-			    <tt>devel/pkg-config</tt> to make sure it is installed.
-			  </td>
-			  <td><tt>&nbsp;</tt></td>
-			</tr>
-
-			<tr>
 			  <td><tt>referencehack</tt></td>
 			  <td><tt>referencehack</tt> is designed for
 			    ports that install API reference
Index: en_US.ISO8859-1/htdocs/gnome/docs/porting.xml
===================================================================
--- en_US.ISO8859-1/htdocs/gnome/docs/porting.xml	(revision 41830)
+++ en_US.ISO8859-1/htdocs/gnome/docs/porting.xml	(working copy)
@@ -32,7 +32,7 @@
 
 	  <pre>
 USE_XLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui
+USE_GNOME=	gnomeprefix libgnomeui
 	  </pre>
 
 
@@ -98,7 +98,7 @@
 	    following is defined in the <tt>Makefile</tt>:</p>
 
 <pre>
-USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
+USE_GNOME=	gnomeprefix libgnomeui atspi libwnck
 </pre>
 
 	<h2>GNOME 1 Desktop vs. GNOME 2 Desktop</h2>
@@ -281,20 +281,17 @@
 	  <h2>Shared MIME database</h2>
 
 	  <p>If your port install files like <tt>application/x-portname.xml</tt>
-	    in <tt>share/mime</tt>, you have to add these two lines at the
-	    end of the <tt>pkg-plist</tt>:</p>
+	    in <tt>share/mime</tt>, you have to add this line to your <tt>Makefile</tt>:</p>
 
 	  <pre>
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+USES=	shared-mime-info
 	  </pre>
 
-	  <p>Also make sure <tt>shared-mime-info</tt> is among the dependencies
-	    of your port. If your port use <tt>gtk20</tt>, you will have
-	    <tt>shared-mime-info</tt> indirectly. You can check indirect
-	    dependencies with <tt>make describe</tt>.</p>
+	  <p>If your port use <tt>gtk20</tt>, you will have <tt>shared-mime-info</tt>
+	    indirectly. You can check indirect dependencies with <tt>make describe</tt>.</p>
 
-	  <p>Example port to look at: <a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/deskutils/drivel/"><tt>deskutils/drivel</tt></a></p>;
+	  <p>Example port to look at: <a href="http://svnweb.freebsd.org/ports/head/deskutils/drivel/"><tt>deskutils/drivel</tt></a></p>;
+<!-- This port should be updated to use new uses framework for shared-mime-info -->
 <!-- End Shared MIME database -->
 
 <!-- Begin Desktop database -->
@@ -306,22 +303,14 @@
 	    with <tt>MimeType</tt> in it, you need to update desktop
 	    database after install and deinstall. This database is represented
 	    by <tt>share/applications/mimeinfo.cache</tt> file. Add
-	    dependency on GNOME component <tt>desktopfileutils</tt> and
-	    these lines to the end of <tt>pkg-plist</tt>:</p>
+	    the following to the <tt>Makefile</tt>:</p>
 
 	  <pre>
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+USES=	desktop-file-utils
 	  </pre>
 
-	  <p>Also add following to the <tt>post-install</tt> target in port's
-	    Makefile:</p>
-
-	  <pre>
--@update-desktop-database
-	  </pre>
-
-	  <p>Example port to look at: <a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/editors/leafpad/"><tt>editors/leafpad</tt></a></p>;
+	  <p>Example port to look at: <a href="http://svnweb.freebsd.org/ports/head/editors/leafpad/"><tt>editors/leafpad</tt></a></p>;
+<!-- This port should be updated to use new uses framework for desktop-file-utils -->
 <!-- End Desktop database -->
 
 <!-- Begin GNOME libtool -->



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306030643.r536hVCM060823>