From owner-svn-ports-head@FreeBSD.ORG Wed Oct 9 17:11:50 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 22E566FF; Wed, 9 Oct 2013 17:11:50 +0000 (UTC) (envelope-from se@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 02022268B; Wed, 9 Oct 2013 17:11:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99HBnpv005029; Wed, 9 Oct 2013 17:11:49 GMT (envelope-from se@svn.freebsd.org) Received: (from se@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99HBnWl005023; Wed, 9 Oct 2013 17:11:49 GMT (envelope-from se@svn.freebsd.org) Message-Id: <201310091711.r99HBnWl005023@svn.freebsd.org> From: Stefan Esser Date: Wed, 9 Oct 2013 17:11:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329913 - head/multimedia/dvbcut 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 17:11:50 -0000 Author: se (src committer) Date: Wed Oct 9 17:11:49 2013 New Revision: 329913 URL: http://svnweb.freebsd.org/changeset/ports/329913 Log: Fix build in poudriere: Use LOCALBASE instead of PREFIX for include files. Partial STAGE support has been implemented, but there is a problem with package building that still has to be resolved (missing work/.metadir). Added: head/multimedia/dvbcut/pkg-plist (contents, props changed) Modified: head/multimedia/dvbcut/Makefile Modified: head/multimedia/dvbcut/Makefile ============================================================================== --- head/multimedia/dvbcut/Makefile Wed Oct 9 17:02:33 2013 (r329912) +++ head/multimedia/dvbcut/Makefile Wed Oct 9 17:11:49 2013 (r329913) @@ -23,21 +23,31 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GCC= any USES= cmake USE_QT4= gui qt3support xml moc_build qmake_build rcc_build uic_build -CXXFLAGS+= -I${PREFIX}/include \ - -I${PREFIX}/include/libavcodec \ - -I${PREFIX}/include/libavformat \ - -I${PREFIX}/include/libswscale +CXXFLAGS+= -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/libavcodec \ + -I${LOCALBASE}/include/libavformat \ + -I${LOCALBASE}/include/libswscale -MAN1= dvbcut.1 -PLIST_FILES= bin/dvbcut - -NO_STAGE= yes +#NO_STAGE= yes +#MAN1= dvbcut.1 pre-patch: cd ${WRKSRC} && ${BZCAT} ${FILESDIR}/use-qt4.diff.bz2 | ${PATCH} -p2 +post-build: + $(SED) -e 's;@prefix@/dvbcut/share/icons;'${PREFIX}/share/icons/dvbcut';' \ + < ${WRKSRC}/dvbcut.desktop.in \ + > ${WRKSRC}/dvbcut.desktop + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/dvbcut ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/src/dvbcut ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${STAGEDIR}${MANPREFIX}/man/man1/ + ${MKDIR} $(STAGEDIR)$(PREFIX)/share/applications + $(INSTALL_DATA) ${WRKSRC}/dvbcut.desktop $(STAGEDIR)$(PREFIX)/share/applications/ + ${MKDIR} $(STAGEDIR)$(PREFIX)/share/icons/dvbcut + $(INSTALL_DATA) ${WRKSRC}/dvbcut.svg $(STAGEDIR)$(PREFIX)/share/icons/dvbcut/ + $(INSTALL_DATA) ${WRKSRC}/icons/* $(STAGEDIR)$(PREFIX)/share/icons/dvbcut/ + ${MKDIR} $(STAGEDIR)$(PREFIX)/share/mime/packages + $(INSTALL_DATA) ${WRKSRC}/dvbcut.xml $(STAGEDIR)$(PREFIX)/share/mime/packages/ .include Added: head/multimedia/dvbcut/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvbcut/pkg-plist Wed Oct 9 17:11:49 2013 (r329913) @@ -0,0 +1,18 @@ +bin/dvbcut +share/applications/dvbcut.desktop +share/mime/packages/dvbcut.xml +share/icons/dvbcut/bookmark.png +share/icons/dvbcut/chapter.svgz +share/icons/dvbcut/dvbcut.svg +share/icons/dvbcut/play.svgz +share/icons/dvbcut/stop.png +share/icons/dvbcut/play.png +share/icons/dvbcut/icons.qrc.orig +share/icons/dvbcut/bookmark.svgz +share/icons/dvbcut/icons.qrc +share/icons/dvbcut/chapter.png +share/icons/dvbcut/stop.svgz +man/man1/dvbcut.1.gz +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@dirrm share/icons/dvbcut