ports/155949: www/firefox: firefox 4, WITH_PGO, better Text against DISPLAY problem

[Kalten]

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

From: Kalten <kalten at gmx.at>
To: bug-followup at FreeBSD.org, kalten at gmx.at
Cc:  
Subject: Re: ports/155949: www/firefox: firefox 4, WITH_PGO, better Text against DISPLAY problem
Date: Fri, 22 Apr 2011 21:19:43 +0200

 --=-=-=
 Content-Type: text/plain
 
 I am terribly sorry! The patch was not good (allthough compiling
 worked)--I made it buggy when I added the ${ECHO}s.
 
 Better version here. Sorry once again! :-(
 (you might delete the old one? Don't know)
 
 ru,
  Kalten
 
 --=-=-=
 Content-Type: text/plain
 Content-Disposition: attachment; filename=patch2.txt
 Content-Description: patch-Makefile2
 
 --- Makefile.orig	2011-04-09 01:31:32.000000000 +0200
 +++ Makefile	2011-04-22 21:12:46.000000000 +0200
 @@ -78,6 +78,8 @@
  BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
  USE_PYTHON_BUILD=	yes
  USE_DISPLAY=		yes
 +# in make and config environment, but not accessable here:
 +DISPLAYat=		"localhost:1001"
  .include "${PORTSDIR}/Mk/bsd.python.mk"
  
  MAKEFILE=	client.mk
 @@ -134,6 +136,30 @@
  	(cd ${WRKSRC} && ${GMAKE} distclean)
  .endif
  
 +pre-build:
 +.if defined(WITH_PGO)
 +	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
 +	${ECHO} "Killing ${LOCALBASE}/bin/Xvfb  at PID `${CAT} ${WRKDIR}/.Xvfb.pid`"; \
 +	sleep 5; \
 +	    kill `${CAT} ${WRKDIR}/.Xvfb.pid` || ${TRUE} ; \
 +	    ${RM} -f ${WRKDIR}/.Xvfb.pid ; \
 +	fi
 +	@${LOCALBASE}/bin/Xvfb `${ECHO_CMD} ${DISPLAYat} | ${SED} -e 's|localhost\(:.*\)|\1|'` \
 +	    -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO_CMD} $$! > ${WRKDIR}/.Xvfb.pid
 +	@${ECHO} "Started ${LOCALBASE}/bin/Xvfb `${ECHO_CMD} ${DISPLAYat} | ${SED} -e 's|localhost\(:.*\)|\1|'` at PID `${CAT} ${WRKDIR}/.Xvfb.pid` on ${DISPLAYat}"
 +	@sleep 10
 +.endif
 +
 +post-build:
 +.if defined(WITH_PGO)
 +	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
 +	${ECHO} "Killing ${LOCALBASE}/bin/Xvfb  at PID `${CAT} ${WRKDIR}/.Xvfb.pid`"; \
 +	sleep 5; \
 +	    kill `${CAT} ${WRKDIR}/.Xvfb.pid` || ${TRUE} ; \
 +	    ${RM} -f ${WRKDIR}/.Xvfb.pid ; \
 +	fi
 +.endif
 +
  port-pre-install:
  	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
  	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 
 --=-=-=--