From owner-svn-ports-head@FreeBSD.ORG  Sat Oct 26 13:32:19 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D1EE2C42;
 Sat, 26 Oct 2013 13:32:19 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B08702DC5;
 Sat, 26 Oct 2013 13:32:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QDWJur078827;
 Sat, 26 Oct 2013 13:32:19 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QDWJ0l078825;
 Sat, 26 Oct 2013 13:32:19 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201310261332.r9QDWJ0l078825@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Sat, 26 Oct 2013 13:32:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331687 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 13:32:20 -0000

Author: wg
Date: Sat Oct 26 13:32:19 2013
New Revision: 331687
URL: http://svnweb.freebsd.org/changeset/ports/331687

Log:
  multimedia/ffmpegthumbnailer: allow staging
  
  - Allow staging [1]
  - Convert lib depends to new format
  - Drop empty PTHREAD_CFLAGS
  
  PR:		ports/182848 [1] (based on)
  Submitted by:	clutton <clutton zoho.com> (maintainer)
  Reviewed by:	danfe

Modified:
  head/multimedia/ffmpegthumbnailer/Makefile
  head/multimedia/ffmpegthumbnailer/pkg-plist

Modified: head/multimedia/ffmpegthumbnailer/Makefile
==============================================================================
--- head/multimedia/ffmpegthumbnailer/Makefile	Sat Oct 26 13:28:00 2013	(r331686)
+++ head/multimedia/ffmpegthumbnailer/Makefile	Sat Oct 26 13:32:19 2013	(r331687)
@@ -7,15 +7,15 @@ PORTREVISION=	2
 CATEGORIES=	multimedia graphics
 MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=	mbsd@isgroup.com.ua
+MAINTAINER=	clutton@zoho.com
 COMMENT=	Lightweight video thumbnailer that can be used by file managers
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		swscale:${PORTSDIR}/multimedia/ffmpeg \
-		jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-pthread -L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --enable-gio
 
 GNU_CONFIGURE=	yes
@@ -25,25 +25,17 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	GNOME
 
-MAN1=		ffmpegthumbnailer.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNOME}
-PKGNAMESUFFIX+=	-gnome
 USE_GNOME+=	gconf2
 GCONF_SCHEMAS=	ffmpegthumbnailer.schemas
 .endif
 
 post-install:
-	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} install-pkgconfigDATA
 .if ${PORT_OPTIONS:MGNOME}
-	${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}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/schemas
+	${INSTALL_DATA} ${FILESDIR}/${GCONF_SCHEMAS} ${STAGEDIR}${PREFIX}/etc/gconf/schemas
 .endif
 
 .include <bsd.port.mk>

Modified: head/multimedia/ffmpegthumbnailer/pkg-plist
==============================================================================
--- head/multimedia/ffmpegthumbnailer/pkg-plist	Sat Oct 26 13:28:00 2013	(r331686)
+++ head/multimedia/ffmpegthumbnailer/pkg-plist	Sat Oct 26 13:32:19 2013	(r331687)
@@ -10,4 +10,5 @@ lib/libffmpegthumbnailer.la
 lib/libffmpegthumbnailer.so
 lib/libffmpegthumbnailer.so.4
 libdata/pkgconfig/libffmpegthumbnailer.pc
+man/man1/ffmpegthumbnailer.1.gz
 @dirrm include/libffmpegthumbnailer