sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-05 21:00:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up port Makefile and patch sources to respect PREFIX (this also fixes

Browse source 
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
This commit is contained in:
Max Brazhnikov 2014-01-08 08:36:34 +00:00
parent a067cf2edf
commit 77280673df
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=339075
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
comms/qsstv/Makefile
View file

@ -19,21 +19,21 @@ BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
USES= qmake USES= qmake
USE_QT4= gui network moc_build rcc_build uic_build USE_QT4= gui network moc_build rcc_build uic_build
QMAKE_SOURCE_PATH= ${WRKSRC}/src
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if defined(WITH_DEBUG)
IGNORE= sources need more patching for debug build
.endif
.if ! ${PORT_OPTIONS:MDOCS} .if ! ${PORT_OPTIONS:MDOCS}
INSTALL_WRKSRC= ${WRKSRC}/src
INSTALL_TARGET= install_target INSTALL_TARGET= install_target
.endif .endif
post-patch: post-patch:
@${RM} -f ${WRKSRC}/src/documentation/html/gettingstarted.html.orig @${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> .include <bsd.port.mk>

19
comms/qsstv/files/patch-src_src.pro
View file

@ -1,11 +1,19 @@
--- src/src.pro.orig 2012-01-04 13:11:46.000000000 -0800 --- ./src/src.pro.orig 2012-01-04 21:11:46.000000000 +0000
+++ src/src.pro 2013-06-30 20:05:22.000000000 -0700 +++ ./src/src.pro 2014-01-07 16:53:34.793505558 +0000
@@ -180,15 +180,15 @@ @@ -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 QMAKE_EXTRA_TARGETS += dox
message(dox will be generated) message(dox will be generated)
} }
-dox.path=/usr/share/doc/$$TARGET -dox.path=/usr/share/doc/$$TARGET
+dox.path=%%DOCSDIR%% +dox.path=$$PREFIX/share/doc/$$TARGET
dox.files= $$PWD/documentation/html/* dox.files= $$PWD/documentation/html/*
- LIBS += -L/usr/lib64 \ - LIBS += -L/usr/lib64 \
@ -16,7 +24,6 @@
-target.path=/usr/local/bin -target.path=/usr/local/bin
-target.extra = strip $(TARGET); cp -f $(TARGET) $${PREFIX}/bin/$(TARGET) -target.extra = strip $(TARGET); cp -f $(TARGET) $${PREFIX}/bin/$(TARGET)
+target.path=%%PREFIX%%/bin +target.path=$$PREFIX/bin
+target.extra = strip $(TARGET); cp -f $(TARGET) %%PREFIX%%/bin/$(TARGET)
INSTALLS +=target INSTALLS +=target
INSTALLS +=dox INSTALLS +=dox