From owner-freebsd-gnome@FreeBSD.ORG Mon Jun 3 06:43:31 2013 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DDED4B2D; Mon, 3 Jun 2013 06:43:31 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id BEDAB1A08; Mon, 3 Jun 2013 06:43:31 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r536hVv4060824; Mon, 3 Jun 2013 06:43:31 GMT (envelope-from jgh@freefall.freebsd.org) Received: (from jgh@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r536hVCM060823; Mon, 3 Jun 2013 06:43:31 GMT (envelope-from jgh) Date: Mon, 3 Jun 2013 06:43:31 GMT Message-Id: <201306030643.r536hVCM060823@freefall.freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Subject: [patch] gnome porting updates From: Jason Helfman X-send-pr-version: 3.114 X-GNATS-Notify: Cc: gnome@FreeBSD.org X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Jason Helfman List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jun 2013 06:43:31 -0000 >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 @@

The following is an example Makefile for a FreeBSD GNOME port.

-# New ports collection makefile for:	gnomeapp
-# Date created:						27 December 2003
-# Whom:								Some GNOME User <&email;@FreeBSD.org>
-#
+# Created by: Some GNOME User <&email;@FreeBSD.org>
 # $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 @@
 			
 			  glib12
 			  devel/glib12
-			  pkgconfig
+			   
 			
 
 			
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 @@
 			
 			  _glib20
 			  devel/glib20
-			  pkgconfig
+			   
 			
 
 			
@@ -182,7 +182,7 @@
 			
 			  libartlgpl2
 			  graphics/libart_lgpl
-			  pkgconfig
+			   
 			
 
 			
@@ -308,7 +308,7 @@
 			
 			  libxml2
 			  textproc/libxml2
-			  pkgconfig
+			   
 			
 
 			
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 @@
 			
 
 			
-			  gnomehack
-			  gnomehack makes common GNOME
-			    Makefile substitutions that nearly every GNOME port
-			    requires to fit into the proper mtree structure.
-			  
-			
-
-			
 			  gnomehier
 			  gnomehier installs all the
 			    directories needed for both the GNOME 1 and 2 desktops.
@@ -52,7 +44,7 @@
 			
 			  gnomemimedata
 			  misc/gnome-mime-data
-			  gnomehier pkgconfig
+			  gnomehier
 			
 
 			
@@ -131,14 +123,6 @@
 			
 
 			
-			  pkgconfig
-			  pkgconfig registers a dependency upon
-			    devel/pkg-config to make sure it is installed.
-			  
-			   
-			
-
-			
 			  referencehack
 			  referencehack 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 @@
 
 	  
 USE_XLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui
+USE_GNOME=	gnomeprefix libgnomeui
 	  

 
 
@@ -98,7 +98,7 @@
 	    following is defined in the Makefile:

 
 
-USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
+USE_GNOME=	gnomeprefix libgnomeui atspi libwnck
 

 
 	
GNOME 1 Desktop vs. GNOME 2 Desktop

@@ -281,20 +281,17 @@
 	  
Shared MIME database

 
 	  
If your port install files like application/x-portname.xml
-	    in share/mime, you have to add these two lines at the
-	    end of the pkg-plist:

+	    in share/mime, you have to add this line to your Makefile:

 
 	  
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+USES=	shared-mime-info
 	  

 
-	  
Also make sure shared-mime-info is among the dependencies
-	    of your port. If your port use gtk20, you will have
-	    shared-mime-info indirectly. You can check indirect
-	    dependencies with make describe.

+	  
If your port use gtk20, you will have shared-mime-info
+	    indirectly. You can check indirect dependencies with make describe.

 
-	  
Example port to look at: deskutils/drivel

+	  
Example port to look at: deskutils/drivel

+
 
 
 
@@ -306,22 +303,14 @@
 	    with MimeType in it, you need to update desktop
 	    database after install and deinstall. This database is represented
 	    by share/applications/mimeinfo.cache file. Add
-	    dependency on GNOME component desktopfileutils and
-	    these lines to the end of pkg-plist:

+	    the following to the Makefile:

 
 	  
-@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
 	  

 
-	  
Also add following to the post-install target in port's
-	    Makefile:

-
-	  
--@update-desktop-database
-	  

-
-	  
Example port to look at: editors/leafpad

+	  
Example port to look at: editors/leafpad

+