diff options
| author | makc <makc@FreeBSD.org> | 2014-01-08 16:36:34 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2014-01-08 16:36:34 +0800 |
| commit | 77d382fa97f49ace72101f0b03276c66e78a9d9a (patch) | |
| tree | 2d629888c4c1779207a9664ec19797680626b7d9 /comms | |
| parent | b0d9b4c33e6c7f689c6ca3177a9162c8dafa1b3d (diff) | |
| download | freebsd-ports-gnome-77d382fa97f49ace72101f0b03276c66e78a9d9a.tar.gz freebsd-ports-gnome-77d382fa97f49ace72101f0b03276c66e78a9d9a.tar.zst freebsd-ports-gnome-77d382fa97f49ace72101f0b03276c66e78a9d9a.zip | |
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
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/qsstv/Makefile | 10 | ||||
| -rw-r--r-- | comms/qsstv/files/patch-src_src.pro | 19 |
2 files changed, 18 insertions, 11 deletions
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile index e7e71154106c..38ab3f6beb67 100644 --- a/comms/qsstv/Makefile +++ b/comms/qsstv/Makefile @@ -19,21 +19,21 @@ BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat 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> diff --git a/comms/qsstv/files/patch-src_src.pro b/comms/qsstv/files/patch-src_src.pro index a3597ef867e2..1ba85538a068 100644 --- a/comms/qsstv/files/patch-src_src.pro +++ b/comms/qsstv/files/patch-src_src.pro @@ -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 |