ports/181065: finance/qhacc: Update to version 4.2

[KATO Tsuguru]

The following reply was made to PR ports/181065; it has been noted by GNATS.

From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/181065: finance/qhacc: Update to version 4.2
Date: Sun, 27 Oct 2013 02:45:07 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Sun__27_Oct_2013_02_45_07_+0900_8.jYzdrJh.CI3Dn4
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Sun__27_Oct_2013_02_45_07_+0900_8.jYzdrJh.CI3Dn4
 Content-Type: text/x-diff;
  name="finance_qhacc.diff"
 Content-Disposition: attachment;
  filename="finance_qhacc.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/finance/qhacc/Makefile finance/qhacc/Makefile
 --- /usr/ports/finance/qhacc/Makefile	2013-10-26 17:19:41.000000000 +0900
 +++ finance/qhacc/Makefile	2013-10-27 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/finance/qhacc/Makefile 331644 2013-10-26 00:52:33Z gerald $
  
  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 @@
  
  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 @@
  		'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>
 diff -urN /usr/ports/finance/qhacc/distinfo finance/qhacc/distinfo
 --- /usr/ports/finance/qhacc/distinfo	2013-06-21 03:53:33.000000000 +0900
 +++ finance/qhacc/distinfo	2013-10-27 00:00:00.000000000 +0900
 @@ -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
 
 --Multipart=_Sun__27_Oct_2013_02_45_07_+0900_8.jYzdrJh.CI3Dn4--