From owner-svn-ports-all@FreeBSD.ORG  Fri Oct 12 09:21:49 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7C012A85;
 Fri, 12 Oct 2012 09:21:49 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 4C4328FC18;
 Fri, 12 Oct 2012 09:21:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9C9Lnsm075771;
 Fri, 12 Oct 2012 09:21:49 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9C9LnMZ075769;
 Fri, 12 Oct 2012 09:21:49 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201210120921.q9C9LnMZ075769@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Fri, 12 Oct 2012 09:21:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305768 - head/multimedia/ffmpegthumbnailer
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.14
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: Fri, 12 Oct 2012 09:21:49 -0000

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>