[Midnightbsd-cvs] mports [16022] trunk/Mk/bsd.mport.mk: remove legacy check license

[laffer1 at midnightbsd.org]

Revision: 16022
          http://svnweb.midnightbsd.org/mports/?rev=16022
Author:   laffer1
Date:     2014-03-02 18:58:14 -0500 (Sun, 02 Mar 2014)
Log Message:
-----------
remove legacy check license

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2014-03-02 23:57:22 UTC (rev 16021)
+++ trunk/Mk/bsd.mport.mk	2014-03-02 23:58:14 UTC (rev 16022)
@@ -461,8 +461,11 @@
 
 _POSTMKINCLUDED=	yes
 
+# Integrate with the license auditing framework
+.if !defined (DISABLE_LICENSES)
+.include "${MPORTCOMPONENTS}/licenses.mk"
+.endif
 
-
 # Make sure we have some stuff defined before we pull in the mixins.
 #
 # The user can override the NO_PACKAGE by specifying this from
@@ -787,18 +790,6 @@
 .endif
 .endif
 
-.if defined(USE_DISPLAY) && !defined(DISPLAY)
-BUILD_DEPENDS+=		Xvfb:${X_VFBSERVER_PORT} \
-	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
-	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \
-	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
-	xkbcomp:${PORTSDIR}/x11/xkbcomp
-.if !defined(PACKAGE_BUILDING)
-CONFIGURE_ENV+=	DISPLAY="localhost:1001"
-MAKE_ENV+=	DISPLAY="localhost:1001"
-.endif
-.endif
-
 XAWVER=				8
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 PLIST_SUB+=			XAWVER=${XAWVER}
@@ -1140,11 +1131,6 @@
 INSTALL_TARGET?=	install
 INSTALL_TARGET+=	${LATE_INSTALL_ARGS}
 
-# Integrate with the license auditing framework
-.if !defined (DISABLE_LICENSES)
-.include "${PORTSDIR}/Mk/components/licenses.mk"
-.endif
-
 # Popular master sites
 .include "${PORTSDIR}/Mk/components/sites.mk"
 
@@ -2175,30 +2161,6 @@
 _SLEEP=sleep
 .endif
 
-.if !target(check-license) 
-.if defined(MPORT_MAINTAINER_MODE)
-check-license:
-.if !defined(LICENSE) 
-	@${ECHO_MSG} "${PKGNAME}: Makefile error: LICENSE not set."
-	@${_SLEEP} 5
-.else
-	@if test -z '${LICENSE}'; then \
-		${ECHO_MSG} "${PKGNAME}: Makefile error: empty license."; \
-		${_SLEEP} 5; \
-	elif ! ${ECHO_CMD} ${_LICENSES} | ${GREP} -E " ${LICENSE} |^${LICENSE}|${LICENSE}$$" >/dev/null; then \
-		${ECHO_MSG} "${PKGNAME}: Makefile error: Invalid LICENSE: ${LICENSE}"; \
-		${_SLEEP} 5; \
-	else \
-		${DO_NADA}; \
-	fi
-.endif
-.else 
-check-license:
-	@${DO_NADA}
-.endif
-.endif
-
-
 # Patch
 
 .if !target(patch-dos2unix)