Attachment 134686 Details for Bug 179390 – pure.diff

[patch] pure.diff

pure.diff (text/x-diff; charset=us-ascii), 8.62 KB, created by Rusmir Dusko on 2013-10-16 16:26:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rusmir Dusko

Created: 2013-10-16 16:26:50 UTC

Size: 8.62 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 330462)
>+++ Makefile	(working copy)
>@@ -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 @@
> 
> 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
> 
>-OPTIONS_DEFINE=	EMACS
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
>+
>+OPTIONS_DEFINE=	DOCS EMACS ETC EXAMPLES
>+
> 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
> 
>-NO_STAGE=	yes
>+OPTIONS_SUB=	yes
>+
>+EMACS_CONFIGURE_ENABLE=		--with-elisp
>+EMACS_CONFIGURE_DISABLE=	--without-elisp
>+
> .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_TARGET=	x86_64-portbld-freebsd
> .endif
> 
>-PORTDATA=	*
>-PORTEXAMPLES=	*
>-PORTDOCS=	*
>-
>-.if !defined(NOPORTDATA)
>-SUB_LIST+=	ETC=""
>-.else
>-SUB_LIST+=	ETC="@comment "
>+post-install:
>+.if ${PORT_OPTIONS:METC}
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/etc/
>+	@(cd ${WRKSRC} && ${RM} -f etc/*.in && ${COPYTREE_SHARE} etc/ ${STAGEDIR}${DATADIR})
> .endif
> 
>-.if !defined(NOPORTDOCS)
>-PLIST_SUB+=	DOCS=""
>-.else
>-PLIST_SUB+=	DOCS="@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
> 
>-.if ${OSVERSION} < 900014
>-SUB_LIST+=	NOCLANG=""
>-.else
>-SUB_LIST+=	NOCLANG="@comment "
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
> .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
>-.endif
>-	@${ECHO_MSG}
>-	@${CAT} ${PKGMESSAGE}
>-	@${ECHO_MSG}
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: bsd.pure.mk
>===================================================================
>--- bsd.pure.mk	(revision 330462)
>+++ bsd.pure.mk	(working copy)
>@@ -1,96 +0,0 @@
>-# ex:ts=8
>-#
>-# $FreeBSD$
>-#
>-# bsd.pure.mk - Support for the Pure language packages
>-#
>-# Author: Zhihao Yuan <lichray@gmail.com>
>-#
>-# USE_PURE		-	Set it to 'yes' to use libpure.so.
>-# 					Others are regarded as a list of *RUN_DEPENDS*
>-# 					to pure-* addons. For example,
>-# USE_PURE=	ffi 	makes the port depends on pure-ffi at runtime.
>-# USE_PURE_BUILD	-	Set it to 'yes' to change the addons in USE_PURE
>-# 						list to *BUILD_DEPENDS*.
>-# NO_PURE_EXAMPLES	-	Don't automatically install examples/.
>-
>-.if !defined(PURE_include)
>-
>-PURE_MAINTAINER=lichray@gmail.com
>-PURE_include=	bsd.pure.mk
>-
>-MASTER_SITES?=	http://pure-lang.googlecode.com/files/
>-DIST_SUBDIR=	pure
>-
>-USES+=		gmake
>-
>-_PURE_audio_cat=	audio
>-_PURE_csv_cat=		textproc
>-_PURE_ffi_cat=		devel
>-_PURE_gen_cat=		devel
>-_PURE_gen_util=		pure-gen
>-_PURE_gl_cat=		graphics
>-_PURE_gl_fn=		GL
>-_PURE_gtk_cat=		x11-toolkits
>-_PURE_mpfr_cat=		math
>-_PURE_readline_cat=	devel
>-_PURE_sockets_cat=	net
>-_PURE_sql3_cat=		databases
>-_PURE_tk_cat=		x11-toolkits
>-_PURE_xml_cat=		textproc
>-
>-.ifdef _PURE_${PORTNAME}_cat
>-CATEGORIES=		_PURE_${PORTNAME}_cat
>-.endif
>-
>-.if ${PORTNAME} != pure
>-
>-.if ${USE_PURE} == yes
>-LIB_DEPENDS+=	libpure.so.8:${PORTSDIR}/lang/pure
>-.else
>-. for dep in ${USE_PURE}
>-_PURE_LIBDIR=	${LOCALBASE}/lib/pure
>-_PURE_PORTDIR=	${PORTSDIR}/${_PURE_${dep}_cat}/pure-${dep}
>-.  ifdef _PURE_${dep}_cat
>-.   ifdef _PURE_${dep}_util
>-BUILD_DEPENDS+=	${_PURE_${dep}_util}:${_PURE_PORTDIR}
>-.   else
>-.    ifdef USE_PURE_BUILD
>-.     ifdef _PURE_${dep}_fn
>-BUILD_DEPENDS+=	${_PURE_LIBDIR}/${_PURE_${dep}_fn}.pure:${_PURE_PORTDIR}
>-.     else
>-BUILD_DEPENDS+=	${_PURE_LIBDIR}/${dep}.pure:${_PURE_PORTDIR}
>-.     endif
>-.    endif
>-.     ifdef _PURE_${dep}_fn
>-RUN_DEPENDS+=	${_PURE_LIBDIR}/${_PURE_${dep}_fn}.pure:${_PURE_PORTDIR}
>-.     else
>-RUN_DEPENDS+=	${_PURE_LIBDIR}/${dep}.pure:${_PURE_PORTDIR}
>-.     endif
>-.   endif
>-.  else
>-.   error pure-${dep} is not supported by "bsd.pure.mk"
>-.  endif
>-. endfor
>-.endif
>-
>-.endif # PORTNAME != pure
>-
>-MAKE_ARGS+=	prefix=${PREFIX} mandir=${PREFIX}/man \
>-		CC=${CC} CFLAGS="${CFLAGS}" \
>-		CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
>-		CPPFLAGS+=-I${LOCALBASE}/include \
>-		LDFLAGS+=-L${LOCALBASE}/lib
>-
>-.if ${PORTNAME:Mpure-*} !="" && !defined(NO_PURE_EXAMPLES)
>-PORTEXAMPLES=	*
>-
>-post-install:
>-.if !defined(NOPORTEXAMPLES)
>-	@${MKDIR} ${EXAMPLESDIR}
>-	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
>-.endif
>-
>-.endif
>-
>-.endif #!defined(PURE_include)
>Index: distinfo
>===================================================================
>--- distinfo	(revision 330462)
>+++ distinfo	(working copy)
>@@ -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
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 330462)
>+++ pkg-descr	(working copy)
>@@ -5,4 +5,4 @@
> 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/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 330462)
>+++ pkg-plist	(working copy)
>@@ -6,6 +6,8 @@
> 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,7 +20,6 @@
> 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
>@@ -25,8 +26,20 @@
> 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

Actions: View | Diff

Attachments on bug 179390: 134685 | 134686 | 134687