From owner-svn-ports-head@FreeBSD.ORG Fri Jan 18 00:01:11 2013 Return-Path: Delivered-To: svn-ports-head@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 2DB9AD81; Fri, 18 Jan 2013 00:01:11 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 120CBE3B; Fri, 18 Jan 2013 00:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0I01AGM056747; Fri, 18 Jan 2013 00:01:10 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0I01AFf056739; Fri, 18 Jan 2013 00:01:10 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201301180001.r0I01AFf056739@svn.freebsd.org> From: Koop Mast Date: Fri, 18 Jan 2013 00:01:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310577 - in head/devel/gamin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 00:01:11 -0000 Author: kwm Date: Fri Jan 18 00:01:09 2013 New Revision: 310577 URL: http://svnweb.freebsd.org/changeset/ports/310577 Log: Add patches to fix the build with newer glib20. While here pet portlint, convert to OptionsNG and trim Makefile header. Obtained from: GNOME staging repo Added: head/devel/gamin/files/patch-server__gam_node.h (contents, props changed) head/devel/gamin/files/patch-server__gam_subscription.c (contents, props changed) head/devel/gamin/files/patch-server__gam_subscription.h (contents, props changed) Modified: head/devel/gamin/Makefile (contents, props changed) head/devel/gamin/files/patch-server_gam_node.c (contents, props changed) Modified: head/devel/gamin/Makefile ============================================================================== --- head/devel/gamin/Makefile Thu Jan 17 23:44:11 2013 (r310576) +++ head/devel/gamin/Makefile Fri Jan 18 00:01:09 2013 (r310577) @@ -1,10 +1,6 @@ -# ports collection makefile for: gamin -# Date created: 24 March 2005 -# Whom: Joe Marcus Clarke -# +# Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/devel/gamin/Makefile,v 1.6 2008/11/26 06:48:13 marcus Exp $ -# +# $MCom: ports/devel/gamin/Makefile,v 1.11 2012/08/04 16:55:24 kwm Exp $ PORTNAME= gamin PORTVERSION= 0.1.10 @@ -19,6 +15,7 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME?= gnomehack _glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python @@ -30,21 +27,22 @@ CONFLICTS= fam-[0-9]* GNU_CONFIGURE= yes .if !defined(GAMIN_SLAVE) -OPTIONS= GAM_POLLER "Use gamin's poller instead of kqueue's" off \ - LIBINOTIFY "Use libinotify as the FAM backend" off +OPTIONS_DEFINE= GAM_POLLER LIBINOTIFY +GAM_POLLER_DESC=Use gamin's poller instead of kqueue's +LIBINOTIFY_DESC=Use libinotify as the FAM backend .endif -.include +.include .if !defined(GAMIN_SLAVE) -.if defined(WITH_GAM_POLLER) +.if ${PORT_OPTIONS:MGAM_POLLER} CPPFLAGS+= -DUSE_GAMIN_POLLER=1 .endif -.if defined(WITH_LIBINOTIFY) +.if ${PORT_OPTIONS:MLIBINOTIFY} CONFIGURE_ARGS+=--enable-inotify LDFLAGS+= -L${LOCALBASE}/lib -linotify -LIB_DEPENDS+= inotify.0:${PORTSDIR}/devel/libinotify +LIB_DEPENDS+= inotify:${PORTSDIR}/devel/libinotify .else CONFIGURE_ARGS+=--disable-inotify .endif @@ -63,4 +61,4 @@ post-install: @${CAT} ${PKGMESSAGE} .endif -.include +.include Added: head/devel/gamin/files/patch-server__gam_node.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gamin/files/patch-server__gam_node.h Fri Jan 18 00:01:09 2013 (r310577) @@ -0,0 +1,11 @@ +--- server/gam_node.h.orig 2011-09-17 11:19:43.000000000 +0200 ++++ server/gam_node.h 2011-09-17 11:20:13.000000000 +0200 +@@ -58,7 +58,7 @@ gboolean gam_node_is_dir + void gam_node_set_is_dir (GamNode *node, + gboolean is_dir); + +-G_CONST_RETURN char *gam_node_get_path (GamNode *node); ++const char *gam_node_get_path (GamNode *node); + + GList *gam_node_get_subscriptions (GamNode *node); + Added: head/devel/gamin/files/patch-server__gam_subscription.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gamin/files/patch-server__gam_subscription.c Fri Jan 18 00:01:09 2013 (r310577) @@ -0,0 +1,11 @@ +--- server/gam_subscription.c.orig 2011-09-17 11:17:22.000000000 +0200 ++++ server/gam_subscription.c 2011-09-17 11:17:44.000000000 +0200 +@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription + * @param sub the GamSubscription + * @returns The path being monitored. It should not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_subscription_get_path(GamSubscription * sub) + { + if (sub == NULL) Added: head/devel/gamin/files/patch-server__gam_subscription.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gamin/files/patch-server__gam_subscription.h Fri Jan 18 00:01:09 2013 (r310577) @@ -0,0 +1,11 @@ +--- server/gam_subscription.h.orig 2011-09-17 11:15:00.000000000 +0200 ++++ server/gam_subscription.h 2011-09-17 11:15:18.000000000 +0200 +@@ -21,7 +21,7 @@ int gam_subscription_pa + + int gam_subscription_get_reqno (GamSubscription *sub); + +-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); ++const char *gam_subscription_get_path (GamSubscription *sub); + + GamListener *gam_subscription_get_listener (GamSubscription *sub); + Modified: head/devel/gamin/files/patch-server_gam_node.c ============================================================================== --- head/devel/gamin/files/patch-server_gam_node.c Thu Jan 17 23:44:11 2013 (r310576) +++ head/devel/gamin/files/patch-server_gam_node.c Fri Jan 18 00:01:09 2013 (r310577) @@ -1,5 +1,5 @@ ---- server/gam_node.c.orig Thu Feb 9 01:22:56 2006 -+++ server/gam_node.c Thu Feb 9 01:23:03 2006 +--- server/gam_node.c.orig 2007-07-04 15:36:49.000000000 +0200 ++++ server/gam_node.c 2011-09-17 11:19:10.000000000 +0200 @@ -23,6 +23,7 @@ #include "gam_event.h" #include "gam_node.h" @@ -8,3 +8,12 @@ /** * Create a new node +@@ -122,7 +123,7 @@ gam_node_set_is_dir(GamNode * node, gboo + * it has finished with the string. If it must keep it longer, it + * should makes its own copy. The returned string must not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_node_get_path(GamNode * node) + { + g_assert(node);