Date: Tue, 24 Sep 2013 18:04:34 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328184 - in head/audio/flac: . files Message-ID: <201309241804.r8OI4Yb4048722@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Tue Sep 24 18:04:34 2013 New Revision: 328184 URL: http://svnweb.freebsd.org/changeset/ports/328184 Log: Convert to stage, use options helpers, make full use of stage for optionally packaging the docs. Deleted: head/audio/flac/files/patch-Makefile.in Modified: head/audio/flac/Makefile head/audio/flac/pkg-plist Modified: head/audio/flac/Makefile ============================================================================== --- head/audio/flac/Makefile Tue Sep 24 18:00:39 2013 (r328183) +++ head/audio/flac/Makefile Tue Sep 24 18:04:34 2013 (r328184) @@ -10,11 +10,11 @@ MASTER_SITES= http://downloads.xiph.org/ MAINTAINER= naddy@FreeBSD.org COMMENT= Free lossless audio codec -LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg +LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg USES= pathfix pkgconfig -NO_STAGE= yes USE_AUTOTOOLS= libtool +USE_LDCONFIG= yes USE_XZ= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-sse \ @@ -26,24 +26,11 @@ CONFIGURE_ARGS= --enable-sse \ OPTIONS_DEFINE= DOCS ICONV OPTIONS_DEFAULT=ICONV -.include <bsd.port.options.mk> +ICONV_USES= iconv +ICONV_CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib -.if ${PORT_OPTIONS:MICONV} -USES+= iconv -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - -.if ${PORT_OPTIONS:MDOCS} -MAKE_ENV+= DOC=doc -.else -MAKE_ENV+= DOC="" -.endif - -USE_LDCONFIG= yes -MAN1= flac.1 metaflac.1 - -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm @@ -59,4 +46,4 @@ post-build: regression-test: build @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/flac/pkg-plist ============================================================================== --- head/audio/flac/pkg-plist Tue Sep 24 18:00:39 2013 (r328183) +++ head/audio/flac/pkg-plist Tue Sep 24 18:04:34 2013 (r328184) @@ -25,6 +25,8 @@ lib/libFLAC.so lib/libFLAC.so.11 libdata/pkgconfig/flac++.pc libdata/pkgconfig/flac.pc +man/man1/flac.1.gz +man/man1/metaflac.1.gz share/aclocal/libFLAC++.m4 share/aclocal/libFLAC.m4 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309241804.r8OI4Yb4048722>