Date: Tue, 28 Jan 2014 17:07:20 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: buganini@gmail.com Subject: ports/186196: [PATCH] converters/gbsdconv: fix depend on gobject-introspection, staging Message-ID: <20140128130720.86475F217@hades.panopticon> Resent-Message-ID: <201401281310.s0SDA09U094794@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186196
>Category: ports
>Synopsis: [PATCH] converters/gbsdconv: fix depend on gobject-introspection, staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 28 13:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Fix depend on gobject-introspection
- Support staging
- Patch upstream makefile to not mix LOCALBASE and PREFIX
Port maintainer (buganini@gmail.com) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- gbsdconv-11.1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 341544)
+++ Makefile (working copy)
@@ -12,21 +12,17 @@
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 @@
%%DATADIR%%/gbsdconv2.png
PLIST_DIRS= %%DATADIR%%
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/gbsdconv
-
.include <bsd.port.mk>
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile (revision 0)
+++ files/patch-Makefile (working copy)
@@ -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
Property changes on: files/patch-Makefile
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- gbsdconv-11.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140128130720.86475F217>