4 files changed, 66 insertions, 64 deletions
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