[Midnightbsd-cvs] mports [15930] trunk/Mk/extensions: add display.mk and add java bin port

[laffer1 at midnightbsd.org]

Revision: 15930
          http://svnweb.midnightbsd.org/mports/?rev=15930
Author:   laffer1
Date:     2014-02-27 21:23:03 -0500 (Thu, 27 Feb 2014)
Log Message:
-----------
add display.mk and add java bin port

Modified Paths:
--------------
    trunk/Mk/extensions/java.mk

Added Paths:
-----------
    trunk/Mk/extensions/display.mk

Added: trunk/Mk/extensions/display.mk
===================================================================
--- trunk/Mk/extensions/display.mk	                        (rev 0)
+++ trunk/Mk/extensions/display.mk	2014-02-28 02:23:03 UTC (rev 15930)
@@ -0,0 +1,38 @@
+# $MidnightBSD$
+#
+# Feature:	display
+# Usage:	USES=display or USES=display:ARGS
+# Valid ARGS:	install (default, implicit), any target
+# 
+# Except the target where the DISPLAY is needed
+#
+
+.if !defined(_INCLUDE_USES_DISPLAY_MK)
+_INCLUDE_USES_DISPLAY_MK=	yes
+
+display_ARGS?=	install
+
+.if !defined(DISPLAY)
+BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
+	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
+	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
+	xkbcomp:${PORTSDIR}/x11/xkbcomp
+
+XVFBPORT!=	port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port
+XVFBPIDFILE=	/tmp/.xvfb-${XVFBPORT}.pid
+MAKE_ENV+=	DISPLAY=":${XVFBPORT}"
+
+.PHONY: start-display stop-display
+pre-${display_ARGS}: start-display
+
+post-${display_ARGS}: stop-display
+
+start-display:
+	daemon -p ${XVFBPIDFILE} Xvfb :${XVFBPORT}
+
+stop-display:
+	pkill -15 -F ${XVFBPIDFILE}
+
+.endif
+.endif

Modified: trunk/Mk/extensions/java.mk
===================================================================
--- trunk/Mk/extensions/java.mk	2014-02-28 02:08:23 UTC (rev 15929)
+++ trunk/Mk/extensions/java.mk	2014-02-28 02:23:03 UTC (rev 15930)
@@ -157,6 +157,8 @@
 # port location, corresponding JAVA_HOME, JDK version, OS, vendor
 _JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_INFO=		PORT=java/openjdk7			HOME=${LOCALBASE}/openjdk7 \
 											VERSION=1.7.0	OS=native	VENDOR=openjdk
+_JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_BIN_INFO=	PORT/java/openjdk7-bin			HOME=${LOCALBASE}/openjdk7 \
+											VERSION=1.7.0	OS=native	VENDOR=openjdk
 _JAVA_PORT_NATIVE_OPENJDK_JDK_1_6_INFO=		PORT=java/openjdk6			HOME=${LOCALBASE}/openjdk6 \
 											VERSION=1.6.0	OS=native	VENDOR=openjdk
 _JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO=		PORT=java/diablo-jdk16			HOME=${LOCALBASE}/diablo-jdk1.6.0 \
@@ -191,6 +193,7 @@
 
 # List all JDK ports
 __JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \
+			JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_BIN \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \