Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 May 2015 11:30:58 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r386853 - in head/devel/neotoma: . files
Message-ID:  <201505201130.t4KBUwU8015853@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Wed May 20 11:30:58 2015
New Revision: 386853
URL: https://svnweb.freebsd.org/changeset/ports/386853

Log:
  Provide a working "neotoma" script in bin/.
  
  The script in bin/ has to be linked to the original script in
  erlang/lib, because escript will use the original script path to
  locate the necessary data files and it does not handle symlinks.

Added:
  head/devel/neotoma/files/neotoma.in   (contents, props changed)
  head/devel/neotoma/files/patch-Makefile   (contents, props changed)
Modified:
  head/devel/neotoma/Makefile
  head/devel/neotoma/pkg-plist

Modified: head/devel/neotoma/Makefile
==============================================================================
--- head/devel/neotoma/Makefile	Wed May 20 09:16:40 2015	(r386852)
+++ head/devel/neotoma/Makefile	Wed May 20 11:30:58 2015	(r386853)
@@ -2,6 +2,7 @@
 
 PORTNAME=	neotoma
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -12,6 +13,10 @@ LICENSE=	MIT
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+SUB_FILES+=	neotoma
+SUB_LIST+=	PORTNAME=${PORTNAME} \
+		PORTVERSION=${PORTVERSION}
+
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
@@ -30,8 +35,12 @@ do-install:
 .endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
+	${INSTALL_DATA} ${WRKSRC}/priv/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv
 	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
+	${INSTALL_SCRIPT} ${WRKSRC}/neotoma ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
+	${INSTALL_SCRIPT} ${WRKDIR}/neotoma ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Added: head/devel/neotoma/files/neotoma.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/neotoma/files/neotoma.in	Wed May 20 11:30:58 2015	(r386853)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec %%LOCALBASE%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/neotoma "$@"

Added: head/devel/neotoma/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/neotoma/files/patch-Makefile	Wed May 20 11:30:58 2015	(r386853)
@@ -0,0 +1,10 @@
+--- Makefile.orig	2015-05-20 09:55:39 UTC
++++ Makefile
+@@ -1,6 +1,6 @@
+ .PHONY: test compile clean dialyzer bootstrap escript
+ 
+-all: compile
++all: compile escript
+ 
+ compile:
+ 	@./rebar compile

Modified: head/devel/neotoma/pkg-plist
==============================================================================
--- head/devel/neotoma/pkg-plist	Wed May 20 09:16:40 2015	(r386852)
+++ head/devel/neotoma/pkg-plist	Wed May 20 11:30:58 2015	(r386853)
@@ -1,6 +1,10 @@
+bin/neotoma
 lib/erlang/lib/neotoma-%%VERSION%%/ebin/neotoma.app
 lib/erlang/lib/neotoma-%%VERSION%%/ebin/neotoma.beam
 lib/erlang/lib/neotoma-%%VERSION%%/ebin/neotoma_parse.beam
+lib/erlang/lib/neotoma-%%VERSION%%/neotoma
+lib/erlang/lib/neotoma-%%VERSION%%/priv/neotoma_parse.peg
+lib/erlang/lib/neotoma-%%VERSION%%/priv/peg_includes.hrl
 lib/erlang/lib/neotoma-%%VERSION%%/src/neotoma.app.src
 lib/erlang/lib/neotoma-%%VERSION%%/src/neotoma.erl
 lib/erlang/lib/neotoma-%%VERSION%%/src/neotoma_parse.erl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505201130.t4KBUwU8015853>