From owner-svn-ports-head@FreeBSD.ORG  Sat Mar 23 14:54:54 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 E5AA56F2;
 Sat, 23 Mar 2013 14:54:54 +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 D8202860;
 Sat, 23 Mar 2013 14:54:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2NEssBn068261;
 Sat, 23 Mar 2013 14:54:54 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2NEssFS068256;
 Sat, 23 Mar 2013 14:54:54 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201303231454.r2NEssFS068256@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 23 Mar 2013 14:54:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315037 - in head: databases/mergeant print/photoprint
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Mar 2013 14:54:55 -0000

Author: kwm
Date: Sat Mar 23 14:54:54 2013
New Revision: 315037
URL: http://svnweb.freebsd.org/changeset/ports/315037

Log:
  Fix build with glib 2.34.
  
  Submitted by:	John Marino <draco@marino.st>

Modified:
  head/databases/mergeant/Makefile
  head/print/photoprint/Makefile

Modified: head/databases/mergeant/Makefile
==============================================================================
--- head/databases/mergeant/Makefile	Sat Mar 23 14:44:02 2013	(r315036)
+++ head/databases/mergeant/Makefile	Sat Mar 23 14:54:54 2013	(r315037)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	mergeant
-# Date created:				14 September 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/databases/mergeant/Makefile,v 1.20 2008/02/05 13:30:46 kwm Exp $
-#
 
 PORTNAME=	mergeant
 PORTVERSION=	0.67
@@ -19,13 +15,14 @@ COMMENT=	Provide uniform access to data 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomedb
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack libgnomedb
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>

Modified: head/print/photoprint/Makefile
==============================================================================
--- head/print/photoprint/Makefile	Sat Mar 23 14:44:02 2013	(r315036)
+++ head/print/photoprint/Makefile	Sat Mar 23 14:54:54 2013	(r315037)
@@ -32,6 +32,10 @@ INSTALLS_ICONS=	yes
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/gstrfuncs.h|glib.h|g' \
+		${WRKSRC}/gp_cppsupport/gprinter.cpp
+
 post-install:
 		-@update-desktop-database