- Updated to 1.8.0 [1]

- Converted to OptionsNG
- Removed references to demos from pkg-message

PR:		ports/170653 [1]
Submitted by:	William Grzybowski <william88@gmail.com> [1]

www/dojo/Makefile

@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=		dojo
-PORTVERSION=		1.5.0
+PORTVERSION=		1.8.0
 CATEGORIES=		www
-MASTER_SITES=		http://download.dojotoolkit.org/release-${PORTVERSION}/ \
-			LOCAL/glarkin
+MASTER_SITES=		http://download.dojotoolkit.org/release-${PORTVERSION}/
 DISTNAME=		dojo-release-${PORTVERSION}
 
 MAINTAINER=		glarkin@FreeBSD.org
@@ -12,11 +11,11 @@ COMMENT=		An open-source DHTML toolkit written in JavaScript
 
 NO_BUILD=		yes
 
-OPTIONS=		APACHE  "Configure for Apache-2.x" off
+OPTIONS_DEFINE=		APACHE
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=		22+
 CONFDIR=		${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=		${APACHEETCDIR}/Includes
@@ -55,4 +54,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/dojo/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dojo-release-1.5.0.tar.gz) = da6c357d31c38b4eb27cf1d2860d0f504cf32a2fb2f423542b2c7dc11193a616
-SIZE (dojo-release-1.5.0.tar.gz) = 3422622
+SHA256 (dojo-release-1.8.0.tar.gz) = 5efb1c2780242cd1fd3dae101d3a2e79e4385d7b4f0a76aa895d413ee0305b6e
+SIZE (dojo-release-1.8.0.tar.gz) = 7708862

www/dojo/files/pkg-message.in

@@ -4,10 +4,3 @@ You have just installed the Dojo DHTML toolkit.
 
 Note that you should restart your Apache web server to ensure that
 the Dojo configuration file is loaded.
-
-Dojo toolkit demonstration pages can be found at:
-http://localhost/dojo/dijit/demos/chat.html
-http://localhost/dojo/dijit/demos/form.html
-http://localhost/dojo/dijit/demos/i18n.html
-http://localhost/dojo/dijit/demos/mail.html
-http://localhost/dojo/dijit/demos/nihao.html