Date: Wed, 8 Jan 2014 08:36:34 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339075 - in head/comms/qsstv: . files Message-ID: <201401080836.s088aYG9067100@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Wed Jan 8 08:36:34 2014 New Revision: 339075 URL: http://svnweb.freebsd.org/changeset/ports/339075 Log: Clean up port Makefile and patch sources to respect PREFIX (this also fixes properly STAGEDIR support the original PR was filed for). While I'm here: - Don't fiddle with strip - Mark IGNORE for debug build: apparently the author of software wrote debug target for himself only - Use QMAKE_SOURCE_PATH instead of overwriting INSTALL_WRKSRC PR: ports/184586 Submitted by: Stephen Hurd (maintainer) Approved by: maintainer Modified: head/comms/qsstv/Makefile head/comms/qsstv/files/patch-src_src.pro (contents, props changed) Modified: head/comms/qsstv/Makefile ============================================================================== --- head/comms/qsstv/Makefile Wed Jan 8 08:32:42 2014 (r339074) +++ head/comms/qsstv/Makefile Wed Jan 8 08:36:34 2014 (r339075) @@ -19,21 +19,21 @@ BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR} USES= qmake USE_QT4= gui network moc_build rcc_build uic_build +QMAKE_SOURCE_PATH= ${WRKSRC}/src OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> +.if defined(WITH_DEBUG) +IGNORE= sources need more patching for debug build +.endif + .if ! ${PORT_OPTIONS:MDOCS} -INSTALL_WRKSRC= ${WRKSRC}/src INSTALL_TARGET= install_target .endif post-patch: @${RM} -f ${WRKSRC}/src/documentation/html/gettingstarted.html.orig - @${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \ - ${WRKSRC}/src/configdialog.cpp ${WRKSRC}/src/src.pro - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/src/src.pro .include <bsd.port.mk> Modified: head/comms/qsstv/files/patch-src_src.pro ============================================================================== --- head/comms/qsstv/files/patch-src_src.pro Wed Jan 8 08:32:42 2014 (r339074) +++ head/comms/qsstv/files/patch-src_src.pro Wed Jan 8 08:36:34 2014 (r339075) @@ -1,11 +1,19 @@ ---- src/src.pro.orig 2012-01-04 13:11:46.000000000 -0800 -+++ src/src.pro 2013-06-30 20:05:22.000000000 -0700 -@@ -180,15 +180,15 @@ +--- ./src/src.pro.orig 2012-01-04 21:11:46.000000000 +0000 ++++ ./src/src.pro 2014-01-07 16:53:34.793505558 +0000 +@@ -9,7 +9,6 @@ + + QMAKE_CXXFLAGS_DEBUG -= -O2 + QMAKE_CXXFLAGS_DEBUG += -g3 -O0 +-QMAKE_STRIP = echo + VERSION=7.1.7 + + message(directory2 $$PWD) +@@ -180,15 +179,14 @@ QMAKE_EXTRA_TARGETS += dox message(dox will be generated) } -dox.path=/usr/share/doc/$$TARGET -+dox.path=%%DOCSDIR%% ++dox.path=$$PREFIX/share/doc/$$TARGET dox.files= $$PWD/documentation/html/* - LIBS += -L/usr/lib64 \ @@ -16,7 +24,6 @@ -target.path=/usr/local/bin -target.extra = strip $(TARGET); cp -f $(TARGET) $${PREFIX}/bin/$(TARGET) -+target.path=%%PREFIX%%/bin -+target.extra = strip $(TARGET); cp -f $(TARGET) %%PREFIX%%/bin/$(TARGET) ++target.path=$$PREFIX/bin INSTALLS +=target INSTALLS +=dox
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401080836.s088aYG9067100>