ports/53489: [misc fixes] news/pyne: Fix configure fails

[Clement Laforet]

>Number:         53489
>Category:       ports
>Synopsis:       [misc fixes] news/pyne: Fix configure fails
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 19 04:20:07 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 4.8-STABLE FreeBSD 4.8-STABLE #2: Fri Jun 6 19:30:55 CEST 2003 root at lucifer.cultdeadsheep.org:/usr/src/sys/compile/LUCIFER i386


	
>Description:
        There are two patches :
	[1] fix configure fails
	pyne configure fails to find some python modules.

	[2] add openoffice-like hack to fake display.
	pyne cannot be installed/packaged without a valid ${DISPLAY} variable.

>How-To-Repeat:
        [1] && [2] see:   
        http://bento.freebsd.org/errorlogs/i386-4-full-logs/pyne-0.6.9.log.bz2

>Fix:

[1]
--- pyne.diff begins here ---
diff -Nur pyne.orig/Makefile pyne/Makefile
--- pyne.orig/Makefile	Thu Jun 19 10:43:53 2003
+++ pyne/Makefile	Thu Jun 19 12:59:08 2003
@@ -8,6 +8,7 @@
 
 PORTNAME=	pyne
 PORTVERSION=	0.6.9
+PORTREVISION=	1
 CATEGORIES=	news python mail
 MASTER_SITES=	http://www.soul-less.pwp.blueyonder.co.uk/pyne/
 
@@ -27,5 +28,6 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e "s@[(]PREFIX[)]\/lib@(PYTHON_SITELIBDIR)@g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s at pybins=\(.*\)@pybins=\${PYTHON_VERSION}@" ${WRKSRC}/configure
 
 .include <bsd.port.mk>
--- pyne.diff ends here ---



[2] (apply this patch after the first one)
--- pyne-display_hack.diff begins here ---
diff -Nru pyne-no_display_hack/Makefile pyne/Makefile
--- pyne-no_display_hack/Makefile	Thu Jun 19 12:59:08 2003
+++ pyne/Makefile	Thu Jun 19 13:00:55 2003
@@ -20,6 +20,12 @@
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk \
 		${PYTHON_SITELIBDIR}/gtkextra/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkextra
 
+# ugly hack imported from openoffice.
+.if !defined(DISPLAY)
+BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
+DISPLAYHACK=localhost:1001
+.endif
+
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
@@ -29,5 +35,24 @@
 post-patch:
 	@${REINPLACE_CMD} -e "s@[(]PREFIX[)]\/lib@(PYTHON_SITELIBDIR)@g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s at pybins=\(.*\)@pybins=\${PYTHON_VERSION}@" ${WRKSRC}/configure
+
+pre-install:
+.if !defined(DISPLAY)
+.if exists(${WRKDIR}/.Xvfb.pid)
+	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
+	@${RM} -f ${WRKDIR}/.Xvfb.pid
+.endif
+
+	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > \
+		${WRKDIR}/.Xvfb.pid
+	@${REINPLACE_CMD} -e "s at --compile@--compile --display ${DISPLAYHACK}@" \
+		${WRKSRC}/Makefile
+.endif
+
+post-install:
+.if !defined(DISPLAY)
+	@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
+	@${RM} ${WRKDIR}/.Xvfb.pid
+.endif
 
 .include <bsd.port.mk>
--- pyne-display_hack.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: