From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 19 10:12:51 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0F20FBA5;
 Thu, 19 Sep 2013 10:12:51 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F0FCA2377;
 Thu, 19 Sep 2013 10:12:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8JAColL077491;
 Thu, 19 Sep 2013 10:12:50 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8JACoQx077490;
 Thu, 19 Sep 2013 10:12:50 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201309191012.r8JACoQx077490@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 19 Sep 2013 10:12:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327610 - head/graphics/separate
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: Thu, 19 Sep 2013 10:12:51 -0000

Author: gahr
Date: Thu Sep 19 10:12:50 2013
New Revision: 327610
URL: http://svnweb.freebsd.org/changeset/ports/327610

Log:
  - Fix build when CC != gcc
  - While at it, modernize the Makefile

Modified:
  head/graphics/separate/Makefile   (contents, props changed)

Modified: head/graphics/separate/Makefile
==============================================================================
--- head/graphics/separate/Makefile	Thu Sep 19 09:58:42 2013	(r327609)
+++ head/graphics/separate/Makefile	Thu Sep 19 10:12:50 2013	(r327610)
@@ -14,8 +14,8 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A CMYK plugin for The GIMP
 
 BUILD_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep
-LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
-		gimp-2.0:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS=	liblcms.so.1:${PORTSDIR}/graphics/lcms \
+		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
 
 USE_ZIP=	yes
 USES=		gmake pkgconfig
@@ -35,12 +35,14 @@ PORTEXAMPLES=	qproof.scm qexport.scm
 
 MAKE_ENV+=	TARGETS="${BIN_TARGETS}"
 
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e 's| make| ${GMAKE}|; s|lib/gimp/2.0|libexec/gimp/2.2|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|$$(PREFIX)|${PREFIX}|g' ${WRKSRC}/Makefile ${WRKSRC}/po/Makefile
+	@${REINPLACE_CMD} -e '/^CC/s|=|?=|; /^PREFIX/s|=|?=|; s| make| ${GMAKE}|; \
+	    s|lib/gimp/2.0|libexec/gimp/2.2|' ${WRKSRC}/Makefile ${WRKSRC}/po/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif