Update to 0.57.

PR:		ports/179390
Submitted by:	nemysis
Approved by:	maintainer

35 files changed, 410 insertions, 150 deletions

diff --git a/Mk/Uses/pure.mk b/Mk/Uses/pure.mk
index c7fbf4671fb2..877b8d1751a7 100644
--- a/Mk/Uses/pure.mk
+++ b/Mk/Uses/pure.mk
@@ -19,20 +19,24 @@ _valid_ARGS=		ffi
 _pure_ARGS=		${pure_ARGS:C/\:/ /g}
 
 # Sanity check
-.if defined(pure_ARGS) && ${_pure_ARGS} != ffi
-IGNORE=Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${pure_ARGS}] is not recognized
+.if defined(pure_ARGS)
+.  for arg in ${_pure_ARGS}
+.    if empty(_valid_ARGS:M${arg})
+IGNORE= Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${arg}] is not recognized
+.    endif
+.  endfor
 .endif
 
 LIB_DEPENDS+=	libpure.so:${PORTSDIR}/lang/pure
-.include "${PORTSDIR}/Mk/Uses/gmake.mk"
+USES=	gmake
 
 .if ${_pure_ARGS:Mffi}
 RUN_DEPENDS+=	${LOCALBASE}/lib/pure/ffi.pure:${PORTSDIR}/devel/pure-ffi
 .endif
 
 MAKE_ARGS+=	prefix=${PREFIX} mandir=${PREFIX}/man \
-		CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+		CC=${CC} CFLAGS="${CFLAGS}" \
+		CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS+=-I${LOCALBASE}/include \
 		LDFLAGS+=-L${LOCALBASE}/lib
 
diff --git a/audio/pure-audio/Makefile b/audio/pure-audio/Makefile
index f867cf9ea51f..e25a7d456ee8 100644
--- a/audio/pure-audio/Makefile
+++ b/audio/pure-audio/Makefile
@@ -3,24 +3,45 @@
 
 PORTNAME=	pure-audio
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	audio
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	A digital audio interface for the Pure language
+COMMENT=	Digital audio interface for the Pure language
+
+LICENSE=	BSD
 
 LIB_DEPENDS=	portaudio.2:${PORTSDIR}/audio/portaudio2 \
 		samplerate:${PORTSDIR}/audio/libsamplerate \
 		sndfile:${PORTSDIR}/audio/libsndfile \
 		fftw3:${PORTSDIR}/math/fftw3
 
-USE_PURE=	yes
+USES=		pure
 NO_STAGE=	yes
 
 post-patch:
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e "s|-lportaudio|-I${LOCALBASE}/include/portaudio2 -L${LOCALBASE}/lib/portaudio2 -lportaudio|" \
 		-e "s|portaudio.h|portaudio2/portaudio.h|g" \
-	   	${WRKSRC}/Makefile
+			${WRKSRC}/Makefile
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
 
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
 .include <bsd.port.mk>
diff --git a/audio/pure-audio/pkg-descr b/audio/pure-audio/pkg-descr
index 519e9cde8413..716456bd29bc 100644
--- a/audio/pure-audio/pkg-descr
+++ b/audio/pure-audio/pkg-descr
@@ -4,4 +4,4 @@ libsamplerate, as well as a realtime module which gives Pure scripts access
 to realtime scheduling on systems which have a pthreads library with the
 POSIX realtime threads extension.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-audio.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-audio.html
diff --git a/databases/pure-sql3/Makefile b/databases/pure-sql3/Makefile
index de1b78bbbda6..5b630188172c 100644
--- a/databases/pure-sql3/Makefile
+++ b/databases/pure-sql3/Makefile
@@ -3,19 +3,40 @@
 
 PORTNAME=	pure-sql3
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Pure language binding to the SQLite3 library
 
+LICENSE=	BSD
+
 LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
 
-USE_PURE=	yes
+USES=		pure
 
 PLIST_FILES=	lib/pure/sql3.pure \
 		lib/pure/sql3util.so
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/databases/pure-sql3/pkg-descr b/databases/pure-sql3/pkg-descr
index 2d2a6d8edbfc..5fff5c4b6334 100644
--- a/databases/pure-sql3/pkg-descr
+++ b/databases/pure-sql3/pkg-descr
@@ -3,4 +3,4 @@ minimal wrapper around Sqlite3's C interface which is designed to give the
 developer access to all of Sqlite3's features in a way that is convenient
 for Pure programmers.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-sql3.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-sql3.html
diff --git a/devel/pure-ffi/Makefile b/devel/pure-ffi/Makefile
index c1b8ad6b3527..08abc4313e46 100644
--- a/devel/pure-ffi/Makefile
+++ b/devel/pure-ffi/Makefile
@@ -2,20 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	pure-ffi
-PORTVERSION=	0.12
-PORTREVISION=	1
+PORTVERSION=	0.13
 CATEGORIES=	devel
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Pure language interface to libffi
 
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	dual
+
 LIB_DEPENDS+=	ffi:${PORTSDIR}/devel/libffi
 
-USE_PURE=	yes
+USES=		pure
 
 PLIST_FILES=	lib/pure/ffi.pure \
 		lib/pure/ffi.so
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/pure-ffi/distinfo b/devel/pure-ffi/distinfo
index dc2d3ace8597..97240fc0356d 100644
--- a/devel/pure-ffi/distinfo
+++ b/devel/pure-ffi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pure/pure-ffi-0.12.tar.gz) = 7aba78d96cad5ce6277b9857cbe9a09d6d572cb3fa5a48a53e4a8d3e23eee32d
-SIZE (pure/pure-ffi-0.12.tar.gz) = 39868
+SHA256 (pure/pure-ffi-0.13.tar.gz) = 1c605ee261a6a8fe60684e764ba1f12dfd2e1e09290190411314b35a71a69636
+SIZE (pure/pure-ffi-0.13.tar.gz) = 39857
diff --git a/devel/pure-ffi/pkg-descr b/devel/pure-ffi/pkg-descr
index cd2e2628ac1d..d4cec088aeea 100644
--- a/devel/pure-ffi/pkg-descr
+++ b/devel/pure-ffi/pkg-descr
@@ -3,4 +3,4 @@ functions from Pure and vice versa. It extends and complements Pure's
 built-in C interface in that it also handles C structs and makes Pure
 functions callable from C without writing a single line of C code.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-ffi.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-ffi.html
diff --git a/devel/pure-gen/Makefile b/devel/pure-gen/Makefile
index 6b9bcf28cddc..2d2b35d531bf 100644
--- a/devel/pure-gen/Makefile
+++ b/devel/pure-gen/Makefile
@@ -2,21 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	pure-gen
-PORTVERSION=	0.15
+PORTVERSION=	0.16
 CATEGORIES=	devel
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	A C interface generator for the Pure language
+COMMENT=	C interface generator for the Pure language
+
+LICENSE=	BSD
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-language-c>=0.3.2:${PORTSDIR}/devel/hs-language-c
 
-USE_PURE=	yes
+NO_STAGE=	yes
 
-MAN1=		pure-gen.1
+CC=		gcc
 
-CC= 		gcc
+USES=		pure:ffi
+USE_GCC=	4.6+
+
+MAN1=		${PORTNAME}.1
+
+PLIST_FILES=	bin/${PORTNAME} \
+		lib/${PORTNAME}/dump-ast
+PLIST_DIRS=	lib/${PORTNAME}
+
+PORTDOCS=	README README.dump-ast
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
 
-NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
 .include <bsd.port.mk>
diff --git a/devel/pure-gen/distinfo b/devel/pure-gen/distinfo
index 5ff9cc4de3bc..d775ec0245e1 100644
--- a/devel/pure-gen/distinfo
+++ b/devel/pure-gen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pure/pure-gen-0.15.tar.gz) = e51921028f09710564b973d4ecd279f8654a8943c5aed8ddde0355bbb8a67bc6
-SIZE (pure/pure-gen-0.15.tar.gz) = 57590
+SHA256 (pure/pure-gen-0.16.tar.gz) = 077c2db73b0894f45b68a8d1d98b493bc94c63d85de04f918d66771732b3aa8c
+SIZE (pure/pure-gen-0.16.tar.gz) = 69391
diff --git a/devel/pure-gen/pkg-descr b/devel/pure-gen/pkg-descr
index 70f3b1f4fc95..5c7884217d46 100644
--- a/devel/pure-gen/pkg-descr
+++ b/devel/pure-gen/pkg-descr
@@ -7,4 +7,4 @@ wrapper module which allows you to create interfaces to pretty much any
 code which can be called via C. Interfaces to C++ can be made using SWIG's
 new C language module which can wrap arbitrary C++ libraries in C.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-gen.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-gen.html
diff --git a/devel/pure-gen/pkg-plist b/devel/pure-gen/pkg-plist
index c9b58028297b..e69de29bb2d1 100644
--- a/devel/pure-gen/pkg-plist
+++ b/devel/pure-gen/pkg-plist
@@ -1,3 +0,0 @@
-bin/pure-gen
-lib/pure-gen/dump-ast
-@dirrm lib/pure-gen
diff --git a/devel/pure-readline/Makefile b/devel/pure-readline/Makefile
index 2f007e77965d..f0d9bba8a16d 100644
--- a/devel/pure-readline/Makefile
+++ b/devel/pure-readline/Makefile
@@ -2,18 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	pure-readline
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	devel
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	A readline interface for the Pure language
+COMMENT=	Readline interface for the Pure language
 
-USE_PURE=	yes
-NO_PURE_EXAMPLES=	yes
+LICENSE=	BSD GPLv3
+LICENSE_COMB=	dual
+
+USES=		pure
 
 PLIST_FILES=	lib/pure/readline.pure \
 		lib/pure/readline.so
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/pure-readline/distinfo b/devel/pure-readline/distinfo
index de300509dc8e..c170adbac0eb 100644
--- a/devel/pure-readline/distinfo
+++ b/devel/pure-readline/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pure/pure-readline-0.1.tar.gz) = a8721d58d2d34c803967923a2ebd1b8f612abfe8d4ad75d6796bee5bbc3c45a2
-SIZE (pure/pure-readline-0.1.tar.gz) = 16358
+SHA256 (pure/pure-readline-0.2.tar.gz) = 543686305921de4a6c295c8320be0c8fb273ae5219dbda9e17a85c27d9cd1baf
+SIZE (pure/pure-readline-0.2.tar.gz) = 19015
diff --git a/devel/pure-readline/pkg-descr b/devel/pure-readline/pkg-descr
index 49de9c8ef223..3c80525345e3 100644
--- a/devel/pure-readline/pkg-descr
+++ b/devel/pure-readline/pkg-descr
@@ -2,4 +2,4 @@ Pure's interface to C++ vectors, specialized to hold pointers to arbitrary
 Pure expressions, and the C++ Standard Template Library algorithms that act
 on them.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-readline.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-readline.html
diff --git a/graphics/pure-gl/Makefile b/graphics/pure-gl/Makefile
index b939116d7589..f022b628c2ee 100644
--- a/graphics/pure-gl/Makefile
+++ b/graphics/pure-gl/Makefile
@@ -3,19 +3,38 @@
 
 PORTNAME=	pure-gl
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
+MASTER_SITES	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Pure language interface to OpenGL
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/pure/ffi.pure:${PORTSDIR}/devel/pure-ffi
+LICENSE=	BSD
 
-USE_PURE=	yes
-USE_GL=	glut
+USES=		pure:ffi
+USE_GL=		glut
 
 MAKE_ARGS+=	LinkGL="-lglut -lGLU -lGL"
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/pure-gl/pkg-descr b/graphics/pure-gl/pkg-descr
index 0fc1745d21ff..4f82ca903edd 100644
--- a/graphics/pure-gl/pkg-descr
+++ b/graphics/pure-gl/pkg-descr
@@ -3,4 +3,4 @@ covers pretty much all of OpenGL, including the popular extensions.
 Extensions are loaded on demand, functions will throw an exception if they
 are not available in your OpenGL implementation.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-gl.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-gl.html
diff --git a/lang/pure/Makefile b/lang/pure/Makefile
index a7da80b25f9d..90165917eabd 100644
--- a/lang/pure/Makefile
+++ b/lang/pure/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	pure
-PORTVERSION=	0.55
+PORTVERSION=	0.58
 CATEGORIES=	lang
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
-		${PORTNAME}-docs-${PORTVERSION}.tar.gz
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-docs-${PORTVERSION}.tar.gz
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Modern-style functional programming language
@@ -15,34 +16,49 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 		libmpfr.so:${PORTSDIR}/math/mpfr
-BUILD_DEPENDS=	llvm31>=3.1:${PORTSDIR}/devel/llvm31
-RUN_DEPENDS=	llvm31>=3.1:${PORTSDIR}/devel/llvm31
+BUILD_DEPENDS=	llvm>=3.2:${PORTSDIR}/devel/llvm
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		iconv pkgconfig
+SUB_FILES=	pkg-message
+
+USES=		gmake iconv pathfix pkgconfig
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack
+CONFIGURE_ARGS=	--with-libgmp-prefix=${LOCALBASE} --enable-release
 USE_LDCONFIG=	yes
-USE_PURE=	yes
 
-CONFIGURE_ARGS=	--with-libgmp-prefix=${LOCALBASE} --enable-release
+MAKE_ARGS+=	prefix=${PREFIX} mandir=${PREFIX}/man \
+		CC=${CC} CFLAGS="${CFLAGS}" \
+		CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS+=-I${LOCALBASE}/include \
+		LDFLAGS+=-L${LOCALBASE}/lib
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	DOCS EMACS ETC EXAMPLES
 
-OPTIONS_DEFINE=	EMACS
 EMACS_DESC=	Compile pure-mode.el with Emacs
+ETC_DESC=	Copy Pure syntax highlighting to ${DATADIR}/etc
 
-MAN1=		pure.1
-SUB_FILES=	pkg-message
+OPTIONS_DEFAULT=	ETC
+
+OPTIONS_SUB=	yes
+
+EMACS_CONFIGURE_ENABLE=		--with-elisp
+EMACS_CONFIGURE_DISABLE=	--without-elisp
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEMACS}
 USE_EMACS=	yes
 MAKE_ARGS+=	emacs_prefix=${PREFIX}
-PLIST_SUB+=	ELC=""
+.endif
+
+.if ${OSVERSION} < 900014
+SUB_LIST+=	NOCLANG=""
 .else
-CONFIGURE_ARGS+=	--without-elisp
-PLIST_SUB+=	ELC="@comment "
+SUB_LIST+=	NOCLANG="@comment "
 .endif
 
 # automatically disable readline support if editline support is available
@@ -54,48 +70,21 @@ CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_TARGET=	x86_64-portbld-freebsd
 .endif
 
-PORTDATA=	*
-PORTEXAMPLES=	*
-PORTDOCS=	*
-
-.if !defined(NOPORTDATA)
-SUB_LIST+=	ETC=""
-.else
-SUB_LIST+=	ETC="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	DOCS=""
-.else
-PLIST_SUB+=	DOCS="@comment "
+post-install:
+.if ${PORT_OPTIONS:METC}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/etc/
+	@(cd ${WRKSRC} && ${RM} -f etc/*.in && ${COPYTREE_SHARE} etc/ ${STAGEDIR}${DATADIR})
 .endif
 
-.if ${OSVERSION} < 900014
-SUB_LIST+=	NOCLANG=""
-.else
-SUB_LIST+=	NOCLANG="@comment "
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${RM} -f Makefile && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${LN} -sf ${DOCSDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/docs
 .endif
 
-.include "${.CURDIR}/bsd.pure.mk"
-.include <bsd.port.pre.mk>
-
-post-install:
-.if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR}/etc
-	(cd ${WRKSRC} && ${RM} -f etc/*.in && ${COPYTREE_SHARE} etc ${DATADIR})
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && \
-		${RM} -f Makefile && ${COPYTREE_SHARE} . ${DOCSDIR})
-	${LN} -fs ${DOCSDIR} ${PREFIX}/lib/${PORTNAME}/docs
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 .endif
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/pure/distinfo b/lang/pure/distinfo
index 4be487e1889b..35669b120f7d 100644
--- a/lang/pure/distinfo
+++ b/lang/pure/distinfo
@@ -1,4 +1,4 @@
-SHA256 (pure/pure-0.55.tar.gz) = 36dbf1b77719a8031766b30812ac89102188d01ae9da80c2b53889f501cb58a7
-SIZE (pure/pure-0.55.tar.gz) = 1147787
-SHA256 (pure/pure-docs-0.55.tar.gz) = 2cd0045c8fd126cf41cb847f2842e11b7c0480c8cb8d5ea33470cf7edcfd1db9
-SIZE (pure/pure-docs-0.55.tar.gz) = 3540249
+SHA256 (pure/pure-0.58.tar.gz) = b1f65c8fd6e41b7db60a11314d0ac996150b5593a84e930cd9c8bb6ad17e1ea0
+SIZE (pure/pure-0.58.tar.gz) = 1465322
+SHA256 (pure/pure-docs-0.58.tar.gz) = 4374949a3d78db6363d110322dc34c1f97c8c81688a126ccdba4b9b638953b85
+SIZE (pure/pure-docs-0.58.tar.gz) = 4816134
diff --git a/lang/pure/pkg-descr b/lang/pure/pkg-descr
index 9f2a2cf2038a..04bcf7f79fd6 100644
--- a/lang/pure/pkg-descr
+++ b/lang/pure/pkg-descr
@@ -5,4 +5,4 @@ lexical closures, built-in list and matrix support and an easy-to-use C
 interface. The interpreter uses LLVM as a backend to JIT-compile Pure
 programs to fast native code.
 
-WWW:	https://code.google.com/p/pure-lang/
+WWW: http://purelang.bitbucket.org/
diff --git a/lang/pure/pkg-plist b/lang/pure/pkg-plist
index 2e3e94151934..b6522ccdc2d1 100644
--- a/lang/pure/pkg-plist
+++ b/lang/pure/pkg-plist
@@ -6,6 +6,8 @@ lib/libpure.so.8.0
 lib/pure/array.pure
 lib/pure/avltrees.pure
 lib/pure/dict.pure
+lib/pure/docs
+lib/pure/enum.pure
 lib/pure/faustui.pure
 lib/pure/getopt.pure
 lib/pure/heap.pure
@@ -18,15 +20,26 @@ lib/pure/primitives.pure
 lib/pure/pure_main.c
 lib/pure/pure_main.o
 lib/pure/quasiquote.pure
-lib/pure/quasiquote1.pure
 lib/pure/records.pure
 lib/pure/regex.pure
 lib/pure/set.pure
 lib/pure/strings.pure
 lib/pure/system.pure
 libdata/pkgconfig/pure.pc
-%%ELC%%%%EMACS_SITE_LISPDIR%%/pure-mode.el
-%%ELC%%%%EMACS_SITE_LISPDIR%%/pure-mode.elc
-%%DOCS%%lib/pure/docs
+man/man1/pure.1.gz
+%%EMACS%%share/emacs/site-lisp/pure-mode.el
+%%EMACS%%share/emacs/site-lisp/pure-mode.elc
+%%ETC%%%%DATADIR%%/etc/pure-highlight.lang
+%%ETC%%%%DATADIR%%/etc/pure-mode.el
+%%EMACS%%%%ETC%%%%DATADIR%%/etc/pure-mode.elc
+%%ETC%%%%DATADIR%%/etc/pure.lang
+%%ETC%%%%DATADIR%%/etc/pure.nanorc
+%%ETC%%%%DATADIR%%/etc/pure.plist
+%%ETC%%%%DATADIR%%/etc/pure.py
+%%ETC%%%%DATADIR%%/etc/pure.ssh
+%%ETC%%%%DATADIR%%/etc/pure.vim
+%%ETC%%%%DATADIR%%/etc/pure.xml
+%%ETC%%@dirrm %%DATADIR%%/etc
+%%ETC%%@dirrm %%DATADIR%%
 @dirrm lib/pure
 @dirrm include/pure
diff --git a/math/pure-mpfr/Makefile b/math/pure-mpfr/Makefile
index 51cb50b3ce2b..45bdd2c55cb6 100644
--- a/math/pure-mpfr/Makefile
+++ b/math/pure-mpfr/Makefile
@@ -3,19 +3,41 @@
 
 PORTNAME=	pure-mpfr
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	math
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Multiprecision floats for Pure
 
-USE_PURE=	yes
-USES=		pkgconfig
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	dual
+
+MAKE_ARGS+=	libdir="${PREFIX}/lib"
+
+USES=		pkgconfig pure
 
 PLIST_FILES=	lib/pure/mpfr.pure \
 		lib/pure/mpfr.so
 
-MAKE_ARGS+=	libdir="${PREFIX}/lib"
-
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/math/pure-mpfr/pkg-descr b/math/pure-mpfr/pkg-descr
index ba226da0803b..fc6974abaf24 100644
--- a/math/pure-mpfr/pkg-descr
+++ b/math/pure-mpfr/pkg-descr
@@ -2,4 +2,4 @@ pure-mpfr makes the MPFR multiprecision floats (henceforth referred to as
 mpfr numbers or values) available in Pure, so that they work with the other
 types of Pure numbers in an almost seamless fashion.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-mpfr.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-mpfr.html
diff --git a/math/pure-rational/Makefile b/math/pure-rational/Makefile
index 19df22fb7452..2f50e20ce1dd 100644
--- a/math/pure-rational/Makefile
+++ b/math/pure-rational/Makefile
@@ -5,18 +5,29 @@ PORTNAME=	pure-rational
 PORTVERSION=	0.1
 PORTREVISION=	1
 CATEGORIES=	math
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Rational number library for the Pure language
 
 LICENSE=	GPLv3
 
-USE_PURE=	yes
-NO_PURE_EXAMPLES=	yes
+USES=		pure
 
 PLIST_FILES=	lib/pure/rational.pure \
 		lib/pure/rat_interval.pure
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/math/pure-rational/pkg-descr b/math/pure-rational/pkg-descr
index 25a2d1bd43f1..89f3c90b3668 100644
--- a/math/pure-rational/pkg-descr
+++ b/math/pure-rational/pkg-descr
@@ -1,4 +1,4 @@
 pure-rational provides additional operations on the rational number type
 provided by the math.pure module in the standard library.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-rational.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-rational.html
diff --git a/net/pure-sockets/Makefile b/net/pure-sockets/Makefile
index 9685ecf8c5a5..b6e162eea065 100644
--- a/net/pure-sockets/Makefile
+++ b/net/pure-sockets/Makefile
@@ -3,16 +3,39 @@
 
 PORTNAME=	pure-sockets
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	net
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Pure language interface to the Berkeley socket functions
 
-USE_PURE=	yes
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	dual
+
+USES=		pure
 
 PLIST_FILES=	lib/pure/sockets.pure \
 		lib/pure/sockets.so
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/pure-sockets/pkg-descr b/net/pure-sockets/pkg-descr
index 4e873af0e78c..aac7269743d1 100644
--- a/net/pure-sockets/pkg-descr
+++ b/net/pure-sockets/pkg-descr
@@ -3,4 +3,4 @@ functionality, so you can create sockets for both stream and datagram based
 protocols and use these to transmit messages. Unix-style file sockets are
 also available if the host system supports them.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-sockets.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-sockets.html
diff --git a/textproc/pure-csv/Makefile b/textproc/pure-csv/Makefile
index 1efcd6b3e0e5..839f4564be7e 100644
--- a/textproc/pure-csv/Makefile
+++ b/textproc/pure-csv/Makefile
@@ -3,17 +3,31 @@
 
 PORTNAME=	pure-csv
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	textproc
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	A CSV reading and writing module for the Pure language
+COMMENT=	CSV reading and writing module for the Pure language
 
-USE_PURE=	yes
-NO_PURE_EXAMPLES=	yes
+LICENSE=	BSD
+
+USES=		pure
 
 PLIST_FILES=	lib/pure/csv.pure \
 		lib/pure/csv.so
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/textproc/pure-csv/pkg-descr b/textproc/pure-csv/pkg-descr
index 7d76ed23a789..5f2d72490832 100644
--- a/textproc/pure-csv/pkg-descr
+++ b/textproc/pure-csv/pkg-descr
@@ -1,4 +1,4 @@
 pure-csv is a module for reading and writing Comma Separated Value (CSV)
 files from within Pure.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-csv.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-csv.html
diff --git a/textproc/pure-xml/Makefile b/textproc/pure-xml/Makefile
index 360523e70a3d..0e397b2f04f3 100644
--- a/textproc/pure-xml/Makefile
+++ b/textproc/pure-xml/Makefile
@@ -3,18 +3,40 @@
 
 PORTNAME=	pure-xml
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Pure language interface for libxml2 and libxslt
 
-USE_PURE=	yes
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	dual
+
+USES=		pure
 USE_GNOME=	libxml2 libxslt
 
 PLIST_FILES=	lib/pure/xml.pure \
 		lib/pure/xml.so
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/textproc/pure-xml/pkg-descr b/textproc/pure-xml/pkg-descr
index 897500b6b31d..7a4d040c5c7a 100644
--- a/textproc/pure-xml/pkg-descr
+++ b/textproc/pure-xml/pkg-descr
@@ -3,4 +3,4 @@ module provides a simplified interface to the Gnome libxml2 and libxslt
 libraries, and supplies all the necessary data structures and operations to
 inspect, create, modify and transform XML documents with ease.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-xml.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-xml.html
diff --git a/x11-toolkits/pure-gtk/Makefile b/x11-toolkits/pure-gtk/Makefile
index 53119582f326..7da976354dbe 100644
--- a/x11-toolkits/pure-gtk/Makefile
+++ b/x11-toolkits/pure-gtk/Makefile
@@ -3,17 +3,39 @@
 
 PORTNAME=	pure-gtk
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	A set of Pure language bindings for GTK+
+COMMENT=	Set of Pure language bindings for GTK+
+
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	dual
 
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
-USES=		pkgconfig
-USE_PURE=	ffi
+USES=		pkgconfig pure:ffi
 USE_GNOME=	glib20 gtk20 atk pango
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/pure-gtk/pkg-descr b/x11-toolkits/pure-gtk/pkg-descr
index fff29fc72f78..68a6976a92b2 100644
--- a/x11-toolkits/pure-gtk/pkg-descr
+++ b/x11-toolkits/pure-gtk/pkg-descr
@@ -2,4 +2,4 @@ pure-gtk is a collection of bindings to use the GTK+ GUI toolkit version 2.x
 with Pure. The bindings include the gtk (+gdk), glib, atk, cairo and pango
 libraries, each in their own Pure module.
 
-WWW:	http://docs.pure-lang.googlecode.com/hg/pure-gtk.html
+WWW: http://docs.pure-lang.googlecode.com/hg/pure-gtk.html
diff --git a/x11-toolkits/pure-tk/Makefile b/x11-toolkits/pure-tk/Makefile
index b4da0e9b1804..e9f818b1f854 100644
--- a/x11-toolkits/pure-tk/Makefile
+++ b/x11-toolkits/pure-tk/Makefile
@@ -2,14 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	pure-tk
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	x11-toolkits
+MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Basic interface between Pure and Tcl/Tk
 
-USE_PURE=	yes
-USE_TK=		yes
+LICENSE=	BSD
+
+USES=		pure
+USE_TK=		86+
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
 
 MAKE_ARGS+=	tclvers=${TCL_VER}
@@ -18,13 +22,30 @@ PLIST_FILES=	lib/pure/gnocl.pure \
 		lib/pure/tk.so \
 		lib/pure/tk.pure
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} \
- 		-e "s|/usr/include|${LOCALBASE}/include|g" \
- 		-e "s|-ltcl\$$(tclvers)|-ltcl${SHORT_TCL_VER}|" \
- 		-e "s|-ltk\$$(tclvers)|-ltk${SHORT_TCL_VER}|" \
+		-e "s|/usr/include|${LOCALBASE}/include|g" \
+		-e "s|-ltcl\$$(tclvers)|-ltcl${SHORT_TCL_VER}|" \
+		-e "s|-ltk\$$(tclvers)|-ltk${SHORT_TCL_VER}|" \
 		${WRKSRC}/Makefile
 
-.include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
+NO_STAGE=	yes
+
+PORTDOCS=	README
+
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/pure-tk/distinfo b/x11-toolkits/pure-tk/distinfo
index 01f91dd47678..1a447ebde494 100644
--- a/x11-toolkits/pure-tk/distinfo
+++ b/x11-toolkits/pure-tk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pure/pure-tk-0.3.tar.gz) = a1807441b4784b590b1fcd287d7750b66dd68f9e91bcddf710ccb3a4e9506a32
-SIZE (pure/pure-tk-0.3.tar.gz) = 31547
+SHA256 (pure/pure-tk-0.4.tar.gz) = 4d254af183974e307aaef73587e93e5f31df548a8f6824ef2db40bb5c46eede6
+SIZE (pure/pure-tk-0.4.tar.gz) = 33208