From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 29 20:20:57 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 4BE9BB69;
 Mon, 29 Jul 2013 20:20:57 +0000 (UTC)
 (envelope-from bapt@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 3991D2DE6;
 Mon, 29 Jul 2013 20:20:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6TKKvtq019216;
 Mon, 29 Jul 2013 20:20:57 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6TKKvk1019212;
 Mon, 29 Jul 2013 20:20:57 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201307292020.r6TKKvk1019212@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 29 Jul 2013 20:20:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323910 - head/graphics/jbig2dec
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: Mon, 29 Jul 2013 20:20:57 -0000

Author: bapt
Date: Mon Jul 29 20:20:56 2013
New Revision: 323910
URL: http://svnweb.freebsd.org/changeset/ports/323910

Log:
  Remove now useless MAKE_JOB_SAFE
  Use options helpers for png
  Use new LIB_DEPENDS format

Modified:
  head/graphics/jbig2dec/Makefile

Modified: head/graphics/jbig2dec/Makefile
==============================================================================
--- head/graphics/jbig2dec/Makefile	Mon Jul 29 20:17:36 2013	(r323909)
+++ head/graphics/jbig2dec/Makefile	Mon Jul 29 20:20:56 2013	(r323910)
@@ -14,7 +14,6 @@ COMMENT=	Decoder implementation of the J
 USE_XZ=		yes:src
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAKE_JOBS_SAFE=	yes
 
 OPTIONS_DEFINE=	PNG TESTS
 OPTIONS_DEFAULT=	PNG
@@ -23,18 +22,15 @@ TESTS_DESC=	Download and use test-images
 
 MAN1=		jbig2dec.1
 
-MAKE_JOBS_SAFE=	yes
 EXTRACT_AFTER_ARGS+=	--exclude sha1.h --exclude 'getopt*'
 
 LICENSE=	GPLv3
 
-.include <bsd.port.options.mk>
+PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+PNG_CONFIGURE_ON=	--with-libpng=${LOCALBASE}
+PNG_CFLAGS=		-I${LOCALBASE}/include/libpng15
 
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=--with-libpng=${LOCALBASE}
-CFLAGS+=	-I${LOCALBASE}/include/libpng15
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTESTS}
 MASTER_SITES+=	http://jbig2dec.sourceforge.net/ubc/:tests