From owner-svn-ports-all@FreeBSD.ORG  Tue Jan  7 17:42:10 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTPS id 941D6365;
 Tue,  7 Jan 2014 17:42:10 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 809D51E22;
 Tue,  7 Jan 2014 17:42:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07HgAmJ016682;
 Tue, 7 Jan 2014 17:42:10 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07HgAc9016681;
 Tue, 7 Jan 2014 17:42:10 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201401071742.s07HgAc9016681@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Tue, 7 Jan 2014 17:42:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339013 - head/graphics/swftools
X-SVN-Group: ports-head
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: Tue, 07 Jan 2014 17:42:10 -0000

Author: dinoex
Date: Tue Jan  7 17:42:09 2014
New Revision: 339013
URL: http://svnweb.freebsd.org/changeset/ports/339013

Log:
  - USES=gmake
  - update LIB_DEPENDS
  - use OPTIONS_SUB, OPT_* macros

Modified:
  head/graphics/swftools/Makefile

Modified: head/graphics/swftools/Makefile
==============================================================================
--- head/graphics/swftools/Makefile	Tue Jan  7 16:13:43 2014	(r339012)
+++ head/graphics/swftools/Makefile	Tue Jan  7 17:42:09 2014	(r339013)
@@ -22,11 +22,8 @@ LIB_DEPENDS=	libt1.so:${PORTSDIR}/devel/
 
 NO_STAGE=	yes
 
-OPTIONS_DEFINE=	LAME PDF
-
-USES=		pkgconfig
+USES=		pkgconfig gmake
 USE_GL=		glut
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_lib_zzip_zzip_file_open=no
 
@@ -37,22 +34,21 @@ MAN1=		as3compile.1 font2swf.1 gif2swf.1
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	LAME PDF
+OPTIONS_SUB=	yes
+LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+PDF_LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-.else
-#CONFIGURE_ARGS+=	--disable-lame
+.if ! ${PORT_OPTIONS:MLAME}
 CONFIGURE_ENV+=	ac_cv_lib_mp3lame_lame_init=no
 .endif
 
 .if ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+=	pdf.6:${PORTSDIR}/print/pdflib
-PLIST_SUB+=	PDF=""
 MAN1+=		pdf2pdf.1
 .else
 CONFIGURE_ENV+=	ac_cv_lib_pdf_PDF_open_file=no
-PLIST_SUB+=	PDF="@comment "
 .endif
 
 post-patch: