Date: Tue, 21 Jan 2014 10:14:47 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340590 - head/audio/gtkpod Message-ID: <201401211014.s0LAEldv002246@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Jan 21 10:14:47 2014 New Revision: 340590 URL: http://svnweb.freebsd.org/changeset/ports/340590 QAT: https://qat.redports.org/buildarchive/r340590/ Log: Stagify, utilize OPTIONS helpers, reword comments slightly. Modified: head/audio/gtkpod/Makefile head/audio/gtkpod/pkg-plist Modified: head/audio/gtkpod/Makefile ============================================================================== --- head/audio/gtkpod/Makefile Tue Jan 21 10:13:35 2014 (r340589) +++ head/audio/gtkpod/Makefile Tue Jan 21 10:14:47 2014 (r340590) @@ -16,14 +16,13 @@ LIB_DEPENDS= libid3tag.so:${PORTSDIR}/au libgpod.so:${PORTSDIR}/audio/libgpod USES= gettext gmake pkgconfig -NO_STAGE= yes USE_GNOME= gtk20 libglade2 GNU_CONFIGURE= yes +INSTALLS_ICONS= yes + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -INSTALLS_ICONS= yes -MAN1= ${PORTNAME}.1 PORTDOCS= ChangeLog NEWS README TODOandBUGS.txt TROUBLESHOOTING OPTIONS_DEFINE= VORBIS FLAC CURL @@ -31,40 +30,27 @@ OPTIONS_DEFAULT= VORBIS FLAC CURL CURL_DESC= Cover art download support via libcurl -.include <bsd.port.pre.mk> +VORBIS_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis +VORBIS_CONFIGURE_OFF= --without-ogg + +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +FLAC_CONFIGURE_ARGS= --without-flac -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbisfile.so:${PORTSDIR}/audio/libvorbis -.else -CONFIGURE_ARGS+= --without-ogg -.endif - -.if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac -.else -CONFIGURE_ARGS+= --without-flac -.endif - -.if ${PORT_OPTIONS:MCURL} -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl -.else -CONFIGURE_ARGS+= --without-curl -.endif +CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +CURL_CONFIGURE_ARGS= --without-curl post-patch: # Install locale files correctly (to share dir instead of lib dir) @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' \ ${WRKSRC}/configure -# FreeBSD does not have libdl +# FreeBSD does not have separate libdl.so @${REINPLACE_CMD} -e 's| -ldl||' ${WRKSRC}/src/Makefile.in -# Adjust location of <endian.h> header +# Fix location of the <endian.h> header @${REINPLACE_CMD} -e 's|endian\.h|sys/&|' ${WRKSRC}/configure \ ${WRKSRC}/src/mp4file.c post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/gtkpod/pkg-plist ============================================================================== --- head/audio/gtkpod/pkg-plist Tue Jan 21 10:13:35 2014 (r340589) +++ head/audio/gtkpod/pkg-plist Tue Jan 21 10:14:47 2014 (r340590) @@ -1,4 +1,5 @@ bin/gtkpod +man/man1/gtkpod.1.gz %%DATADIR%%/data/default-cover.png %%DATADIR%%/data/gtkpod-add-dirs.png %%DATADIR%%/data/gtkpod-add-files.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401211014.s0LAEldv002246>