From owner-svn-ports-all@FreeBSD.ORG  Thu Apr  3 18:33:51 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DF62589;
 Thu,  3 Apr 2014 18:33:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 59139F08;
 Thu,  3 Apr 2014 18:33:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33IXpqL022522;
 Thu, 3 Apr 2014 18:33:51 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33IXpWN022521;
 Thu, 3 Apr 2014 18:33:51 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404031833.s33IXpWN022521@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 3 Apr 2014 18:33:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r350038 - branches/2014Q2/print/gnome-cups-manager
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2014 18:33:51 -0000

Author: antoine
Date: Thu Apr  3 18:33:50 2014
New Revision: 350038
URL: http://svnweb.freebsd.org/changeset/ports/350038
QAT: https://qat.redports.org/buildarchive/r350038/

Log:
  MFH: r350037
  
  - Fix build with new cups (still broken on 10/head)
  - Stage support
  - desktop-file-utils not needed as the .desktop file has no MimeType
  
  Reported by:	pkg-fallout
  With hat:	portmgr

Modified:
  branches/2014Q2/print/gnome-cups-manager/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/print/gnome-cups-manager/Makefile
==============================================================================
--- branches/2014Q2/print/gnome-cups-manager/Makefile	Thu Apr  3 18:32:18 2014	(r350037)
+++ branches/2014Q2/print/gnome-cups-manager/Makefile	Thu Apr  3 18:33:50 2014	(r350038)
@@ -13,21 +13,18 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Administration tool for cups
 
-LIB_DEPENDS=	gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups
+LIB_DEPENDS=	libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups
 RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
 
 USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
-		desktopfileutils
-USES=		gettext gmake pkgconfig
+USE_GNOME=	gnomeprefix intlhack libgnomeprintui libgnomeui
+USES=		gettext gmake pathfix pkgconfig tar:bzip2
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 post-patch:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
 		< ${FILESDIR}/gnome-cups-manager.desktop \
@@ -45,6 +42,6 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \
-		${PREFIX}/share/applications
+		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>