mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-10 07:04:03 +00:00
Fix package building by adding a dependency on Xvfb in the
PACKAGE_BUILDING case. The package build scripts then DTRT and ensure this is running at build-time so a DISPLAY is available. Approved by: portmgr (self)
This commit is contained in:
parent
9b7cdfcd6e
commit
88d78c401e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=125629
@ -17,6 +17,9 @@ MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= A graphical FTP Client
|
||||
|
||||
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
|
||||
.if defined(PACKAGE_BUILDING)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
.endif
|
||||
|
||||
USE_REINPLACE= yes
|
||||
USE_PYTHON= yes
|
||||
|
@ -16,6 +16,9 @@ COMMENT= The classic arcade game
|
||||
|
||||
BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
|
||||
RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
|
||||
.if defined(PACKAGE_BUILDING)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
.endif
|
||||
|
||||
.if defined(WITHOUT_X11)
|
||||
MAKE_ARGS= NO_X11=yes
|
||||
@ -24,8 +27,8 @@ USE_X_PREFIX= yes
|
||||
PLIST= pkg-plist.x11
|
||||
.endif
|
||||
|
||||
.if !defined(DISPLAY) || ${DISPLAY} == ""
|
||||
IGNORE= Requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X.
|
||||
.if (!defined(DISPLAY) || ${DISPLAY} == "") && !defined(PACKAGE_BUILDING)
|
||||
IGNORE= requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X
|
||||
.endif
|
||||
|
||||
MAN1= qix.1
|
||||
|
@ -24,10 +24,8 @@ USE_LIBTOOL_VER= 15
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
INSTALLS_SHLIB= yes
|
||||
|
||||
.if !defined(DISPLAY)
|
||||
.if defined(PACKAGE_BUILDING)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
CONFIGURE_ENV+= DISPLAY=localhost:1001
|
||||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
@ -40,25 +38,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e \
|
||||
's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in
|
||||
|
||||
pre-configure:
|
||||
.if exists(${WRKDIR}/.Xvfb.pid)
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.endif
|
||||
.if !defined(DISPLAY)
|
||||
#
|
||||
# This is a UGLY hack to not have to specify a X-Display.
|
||||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
.endif
|
||||
|
||||
post-configure:
|
||||
.if !defined(DISPLAY)
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${MKDIR} ${DOCSDIR}
|
||||
|
@ -17,6 +17,10 @@ EXTRACT_ONLY=
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= A Sun's powerful and extensible IDE for Java
|
||||
|
||||
.if defined(PACKAGE_BUILDING)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
.endif
|
||||
|
||||
USE_JAVA= 1.3+
|
||||
JAVAVM= ${JAVA_HOME}/bin/java
|
||||
|
||||
|
@ -18,6 +18,9 @@ COMMENT= [incr Tk] (A.K.A. "itk")
|
||||
|
||||
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
|
||||
itcl${MAJOR}${MINOR}.1:${PORTSDIR}/lang/itcl
|
||||
.if defined(PACKAGE_BUILDING)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
.endif
|
||||
|
||||
USE_REINPLACE= yes
|
||||
WRKSRC= ${WRKDIR}/itcl${MAJOR}.${MINOR}/itk
|
||||
|
@ -18,6 +18,9 @@ MAINTAINER= jmz@FreeBSD.org
|
||||
COMMENT= An X11 image grabber
|
||||
|
||||
BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT}
|
||||
.if defined(PACKAGE_BUILDING)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
.endif
|
||||
|
||||
USE_X_PREFIX= yes
|
||||
USE_IMAKE= yes
|
||||
|
Loading…
Reference in New Issue
Block a user