From owner-svn-ports-head@FreeBSD.ORG Fri Mar 7 11:49:03 2014 Return-Path: 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 ESMTPS id 11D87D6C; Fri, 7 Mar 2014 11:49:03 +0000 (UTC) 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 E6F633C6; Fri, 7 Mar 2014 11:49:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27Bn2K4011940; Fri, 7 Mar 2014 11:49:02 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27Bn21P011938; Fri, 7 Mar 2014 11:49:02 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201403071149.s27Bn21P011938@svn.freebsd.org> From: Dmitry Marakasov Date: Fri, 7 Mar 2014 11:49:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347376 - in head/converters/gbsdconv: . files 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.17 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: Fri, 07 Mar 2014 11:49:03 -0000 Author: amdmi3 Date: Fri Mar 7 11:49:02 2014 New Revision: 347376 URL: http://svnweb.freebsd.org/changeset/ports/347376 QAT: https://qat.redports.org/buildarchive/r347376/ Log: - Fix depend on gobject-introspection - Support staging - Patch upstream makefile to not mix LOCALBASE and PREFIX PR: 186196 Submitted by: amdmi3 Approved by: maintainer timeout Added: head/converters/gbsdconv/files/ head/converters/gbsdconv/files/patch-Makefile (contents, props changed) Modified: head/converters/gbsdconv/Makefile Modified: head/converters/gbsdconv/Makefile ============================================================================== --- head/converters/gbsdconv/Makefile Fri Mar 7 11:46:37 2014 (r347375) +++ head/converters/gbsdconv/Makefile Fri Mar 7 11:49:02 2014 (r347376) @@ -12,21 +12,17 @@ COMMENT= GUI for bsdconv LICENSE= BSD LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsdconv>=8.0:${PORTSDIR}/converters/py-bsdconv \ - ${LOCALBASE}/bin/g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsdconv>=8.0:${PORTSDIR}/converters/py-bsdconv USE_GITHUB= yes GH_ACCOUNT= buganini GH_COMMIT= 0a9ad34 -USE_GNOME= gtk30 +USE_GNOME= gtk30 introspection:run USE_PYTHON= yes USE_LDCONFIG= yes -MAKE_ARGS= PREFIX=${PREFIX} -NO_STAGE= yes - PLIST_FILES= bin/gbsdconv \ lib/gbsdconv_taglib.so \ %%DATADIR%%/gbsdconv.png \ @@ -34,7 +30,4 @@ PLIST_FILES= bin/gbsdconv \ %%DATADIR%%/gbsdconv2.png PLIST_DIRS= %%DATADIR%% -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/gbsdconv - .include Added: head/converters/gbsdconv/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/gbsdconv/files/patch-Makefile Fri Mar 7 11:49:02 2014 (r347376) @@ -0,0 +1,26 @@ +--- Makefile.orig 2013-09-09 09:56:10.000000000 +0400 ++++ Makefile 2014-01-28 04:02:41.281082541 +0400 +@@ -1,17 +1,17 @@ + PREFIX?=/usr/local + +-LIBS=-L${PREFIX}/lib -ltag ++LIBS=-L${LOCALBASE}/lib -ltag + + all: gbsdconv_taglib + + gbsdconv_taglib: taglib/tag_c.cpp +- $(CXX) -I${PREFIX}/include/taglib -fPIC -shared -o gbsdconv_taglib.so taglib/tag_c.cpp ${LIBS} ++ $(CXX) -I${LOCALBASE}/include/taglib -fPIC -shared -o gbsdconv_taglib.so taglib/tag_c.cpp ${LIBS} + + install: +- install -m 755 gbsdconv ${PREFIX}/bin +- install -m 444 gbsdconv_taglib.so ${PREFIX}/lib +- mkdir -p ${PREFIX}/share/gbsdconv +- install -m 444 gbsdconv.png gbsdconv.xml gbsdconv2.png ${PREFIX}/share/gbsdconv ++ install -m 755 gbsdconv ${DESTDIR}${PREFIX}/bin ++ install -m 444 gbsdconv_taglib.so ${DESTDIR}${PREFIX}/lib ++ mkdir -p ${DESTDIR}${PREFIX}/share/gbsdconv ++ install -m 444 gbsdconv.png gbsdconv.xml gbsdconv2.png ${DESTDIR}${PREFIX}/share/gbsdconv + + clean: + rm -f gbsdconv_taglib.so