Date: Fri, 12 Oct 2012 09:21:49 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305768 - head/multimedia/ffmpegthumbnailer Message-ID: <201210120921.q9C9LnMZ075769@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Fri Oct 12 09:21:48 2012 New Revision: 305768 URL: http://svn.freebsd.org/changeset/ports/305768 Log: - Add gconf2 dependency for GNOME option [1] - Convert to USE_PKGCONFIG - Drop USE_GMAKE; port builds with regular make - Drop unneeded WANT_GNOME - Drop specific ABI version numbers from LIB_DEPENDS - Improve GCONF_SCHEMAS handling - Trim Makefile header PR: ports/172459 Submitted by: Hon-Yu Lawrence Cheung <cheunghonyu@gmail.com> [1] Approved by: mbsd <mbsd@isgroup.com.ua> (maintainer) makc, avilla (mentors, implicit) Feature safe: yes Modified: head/multimedia/ffmpegthumbnailer/Makefile (contents, props changed) Modified: head/multimedia/ffmpegthumbnailer/Makefile ============================================================================== --- head/multimedia/ffmpegthumbnailer/Makefile Fri Oct 12 09:13:42 2012 (r305767) +++ head/multimedia/ffmpegthumbnailer/Makefile Fri Oct 12 09:21:48 2012 (r305768) @@ -1,7 +1,4 @@ -# New ports collection makefile for: ffmpegthumbnailer -# Date created: Mo 18 Feb 2008 06:11:13 CET -# Whom: Dierk Sacher <dierk@blaxxtarz.de> -# +# Created by: Dierk Sacher <dierk@blaxxtarz.de> # $FreeBSD$ PORTNAME= ffmpegthumbnailer @@ -15,36 +12,37 @@ COMMENT= Lightweight video thumbnailer t LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ swscale:${PORTSDIR}/multimedia/ffmpeg \ - jpeg.11:${PORTSDIR}/graphics/jpeg + jpeg:${PORTSDIR}/graphics/jpeg CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --enable-gio GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig _glib20 +USE_PKGCONFIG= build +USE_GNOME= gnomehack _glib20 USE_LDCONFIG= yes -WANT_GNOME= yes - OPTIONS_DEFINE= GNOME -.include <bsd.port.pre.mk> +MAN1= ffmpegthumbnailer.1 + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGNOME} PKGNAMESUFFIX+= -gnome +USE_GNOME+= gconf2 GCONF_SCHEMAS= ffmpegthumbnailer.schemas .endif -MAN1= ffmpegthumbnailer.1 - post-install: cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} install-pkgconfigDATA .if ${PORT_OPTIONS:MGNOME} - ${INSTALL_DATA} ${FILESDIR}/${GCONF_SCHEMAS} ${LOCALBASE}/etc/gconf/schemas - @${SETENV} GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ - gconftool-2 --makefile-install-rule ${LOCALBASE}/etc/gconf/schemas/${GCONF_SCHEMAS} \ - > /dev/null + ${MKDIR} ${PREFIX}/etc/gconf/schemas + ${INSTALL_DATA} ${FILESDIR}/${GCONF_SCHEMAS} ${PREFIX}/etc/gconf/schemas + @${SETENV} GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY} \ + gconftool-2 --makefile-install-rule ${PREFIX}/etc/gconf/schemas/${GCONF_SCHEMAS} \ + > /dev/null || ${TRUE} .endif -.include <bsd.port.post.mk> + +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210120921.q9C9LnMZ075769>