Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jan 2014 17:42:10 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339013 - head/graphics/swftools
Message-ID:  <201401071742.s07HgAc9016681@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401071742.s07HgAc9016681>