Date: Sat, 23 Mar 2013 14:54:54 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> 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 Message-ID: <201303231454.r2NEssFS068256@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303231454.r2NEssFS068256>