svn commit: r455775 - in head: editors/semi games/linux-unrealgold games/nethack33 games/nethack34 games/nethack36 java/linux-oracle-jdk18 mail/wanderlust-devel

[Mathieu Arnold]

Author: mat
Date: Fri Dec  8 08:33:45 2017
New Revision: 455775
URL: https://svnweb.freebsd.org/changeset/ports/455775

Log:
  Don't include bsd.port.options.mk after bsd.port.pre.mk.
  
  Sponsored by:	Absolight

Modified:
  head/editors/semi/Makefile   (contents, props changed)
  head/games/linux-unrealgold/Makefile   (contents, props changed)
  head/games/nethack33/Makefile   (contents, props changed)
  head/games/nethack34/Makefile   (contents, props changed)
  head/games/nethack36/Makefile   (contents, props changed)
  head/java/linux-oracle-jdk18/Makefile   (contents, props changed)
  head/mail/wanderlust-devel/Makefile   (contents, props changed)

Modified: head/editors/semi/Makefile
==============================================================================
--- head/editors/semi/Makefile	Fri Dec  8 07:00:12 2017	(r455774)
+++ head/editors/semi/Makefile	Fri Dec  8 08:33:45 2017	(r455775)
@@ -45,7 +45,6 @@ MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
 
 PLIST=		${PKGDIR}/pkg-plist.emacs20
 # depends on flim

Modified: head/games/linux-unrealgold/Makefile
==============================================================================
--- head/games/linux-unrealgold/Makefile	Fri Dec  8 07:00:12 2017	(r455774)
+++ head/games/linux-unrealgold/Makefile	Fri Dec  8 08:33:45 2017	(r455775)
@@ -34,7 +34,6 @@ OPTIONS_DEFINE=	DOCS
 CDDIRS=		Help Maps Maps/UPak Music Sounds Sounds/int System Textures
 
 .include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
 
 UT_DATADIR!=	cd ${PORTSDIR}/games/linux-ut && ${MAKE} -V DATADIR
 

Modified: head/games/nethack33/Makefile
==============================================================================
--- head/games/nethack33/Makefile	Fri Dec  8 07:00:12 2017	(r455774)
+++ head/games/nethack33/Makefile	Fri Dec  8 08:33:45 2017	(r455775)
@@ -42,8 +42,6 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.include <bsd.port.options.mk>
-
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 PLIST_SUB+=	HACKLINK=""
 .else

Modified: head/games/nethack34/Makefile
==============================================================================
--- head/games/nethack34/Makefile	Fri Dec  8 07:00:12 2017	(r455774)
+++ head/games/nethack34/Makefile	Fri Dec  8 08:33:45 2017	(r455775)
@@ -75,8 +75,6 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.include <bsd.port.options.mk>
-
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 PLIST_SUB+=	HACKLINK=""
 .else

Modified: head/games/nethack36/Makefile
==============================================================================
--- head/games/nethack36/Makefile	Fri Dec  8 07:00:12 2017	(r455774)
+++ head/games/nethack36/Makefile	Fri Dec  8 08:33:45 2017	(r455775)
@@ -50,8 +50,6 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.include <bsd.port.options.mk>
-
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 PLIST_SUB+=	HACKLINK=""
 .else

Modified: head/java/linux-oracle-jdk18/Makefile
==============================================================================
--- head/java/linux-oracle-jdk18/Makefile	Fri Dec  8 07:00:12 2017	(r455774)
+++ head/java/linux-oracle-jdk18/Makefile	Fri Dec  8 08:33:45 2017	(r455775)
@@ -51,8 +51,6 @@ bash_CMD=	${SH}
 IGNORE?=You must manually fetch the J2SE SDK download for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
-.include <bsd.port.options.mk>
-
 .if ${PORT_OPTIONS:MDEMO}
 DEMO_UPDATE_VERSION=	${JDK_UPDATE_VERSION}
 .if ${DEMO_UPDATE_VERSION} != ${JDK_UPDATE_VERSION}

Modified: head/mail/wanderlust-devel/Makefile
==============================================================================
--- head/mail/wanderlust-devel/Makefile	Fri Dec  8 07:00:12 2017	(r455774)
+++ head/mail/wanderlust-devel/Makefile	Fri Dec  8 08:33:45 2017	(r455775)
@@ -25,7 +25,6 @@ CONFLICTS=	wanderlust-*-2.14.*
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
 
 MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
 MIMEUI_PRODUCT=	semi