- Update to version 4.2
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Responsible Changed From-To: miwi->freebsd-ports-bugs Back to the heap due to timeout
Remake of the patch against current tree.
Responsible Changed From-To: freebsd-ports-bugs->pawel I'll take it.
Author: pawel Date: Fri Nov 1 23:47:58 2013 New Revision: 332427 URL: http://svnweb.freebsd.org/changeset/ports/332427 Log: - Update to version 4.2 - Support staging PR: ports/181065 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Modified: head/finance/qhacc/Makefile head/finance/qhacc/distinfo Modified: head/finance/qhacc/Makefile ============================================================================== --- head/finance/qhacc/Makefile Fri Nov 1 23:32:10 2013 (r332426) +++ head/finance/qhacc/Makefile Fri Nov 1 23:47:58 2013 (r332427) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qhacc -PORTVERSION= 4.1 -PORTREVISION= 1 +PORTVERSION= 4.2 CATEGORIES= finance MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} EXTRACT_SUFX= .tgz @@ -15,31 +14,26 @@ LICENSE= GPLv2 # (or later) LIB_DEPENDS= libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 -OPTIONS_DEFINE= DOCS DEBUG +OPTIONS_DEFINE= DOCS -USES= qmake +USES= qmake:norecursive USE_QT4= corelib gui sql moc_build qmake_build rcc_build uic_build +QMAKE_ARGS= ${QMAKEFLAGS} USE_GCC= yes USE_LDCONFIG= yes CXXFLAGS+= -fpermissive -DESKTOP_ENTRIES="QHacc" "Financial manager" "" "${PORTNAME}" "" "" +DESKTOP_ENTRIES="QHacc" "" "" "${PORTNAME}" "" "" .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDEBUG} -BUILD_TYPE= debug -.else -BUILD_TYPE= release -.endif - post-patch: @${REINPLACE_CMD} -e \ '/^INSTALLDIR/s|=.*|=${DATADIR}| ; \ /^QWTINCS/s|=.*|=${LOCALBASE}/include/qwt6| ; \ /^QWTLIBS/s|=.*|=${LOCALBASE}/lib -lqwt6| ; \ - /^CONFIG +=/s|debug|${BUILD_TYPE}|' ${WRKSRC}/user.pri + /+= debug/s|^|#|' ${WRKSRC}/user.pri @${REINPLACE_CMD} -e \ 's|/usr/include|${LOCALBASE}/include| ; \ s|-lqwt||' ${WRKSRC}/gui/gui.pro @@ -47,20 +41,18 @@ post-patch: 's|/../qm/|/../share/qhacc/|' ${WRKSRC}/gui/main.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gui/build/${BUILD_TYPE}/qhacc \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_LIB} ${WRKSRC}/engine/build/${BUILD_TYPE}/libengine.so.1.0.0 \ - ${STAGEDIR}${PREFIX}/lib + (cd ${WRKSRC}/gui/build/release && ${INSTALL_PROGRAM} \ + qhacc ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/engine/build/release && ${INSTALL_DATA} \ + libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib) @${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so @${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so.1 @${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so.1.0 @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${STAGEDIR}${DATADIR} -.if ${PORT_OPTIONS:MDOCS} + (cd ${WRKSRC}/qm && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog README THANKS TODO UPGRADE - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor -.endif .include <bsd.port.mk> Modified: head/finance/qhacc/distinfo ============================================================================== --- head/finance/qhacc/distinfo Fri Nov 1 23:32:10 2013 (r332426) +++ head/finance/qhacc/distinfo Fri Nov 1 23:47:58 2013 (r332427) @@ -1,2 +1,2 @@ -SHA256 (qhacc-4.1.tgz) = b00eb62914d2e9da6b2a6996467de0fc92e8cf13ef7c334a6a49c17dde0dca7d -SIZE (qhacc-4.1.tgz) = 131163 +SHA256 (qhacc-4.2.tgz) = e432006ba24a930ebc2cf8ced29a27de7ace9fdefe780d6bccb17aeb0419dc53 +SIZE (qhacc-4.2.tgz) = 135066 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!