svn commit: r338787 - in head/lang/ficl: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun Jan  5 15:43:27 2014
New Revision: 338787
URL: http://svnweb.freebsd.org/changeset/ports/338787

Log:
  - Update maintainer's email address
  - Add stage support
  - Cleaning the warnings during compilation
  
  PR:		ports/185489
  Submitted by:	Pavel I Volkov <pavelivolkov at gmail.com> (maintainer)

Added:
  head/lang/ficl/files/patch-primitives.c   (contents, props changed)
Modified:
  head/lang/ficl/Makefile

Modified: head/lang/ficl/Makefile
==============================================================================
--- head/lang/ficl/Makefile	Sun Jan  5 15:39:53 2014	(r338786)
+++ head/lang/ficl/Makefile	Sun Jan  5 15:43:27 2014	(r338787)
@@ -6,7 +6,7 @@ PORTVERSION=	4.1.0
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION:C/([[:digit:]]+\.[[:digit:]]+)\.0/\1/}
 
-MAINTAINER=	pavelivolkov at googlemail.com
+MAINTAINER=	pavelivolkov at gmail.com
 COMMENT=	Forth Inspired Command Language
 
 LICENSE=	unknown
@@ -14,6 +14,8 @@ LICENSE_NAME=	BSD-style
 LICENSE_TEXT=	Description of the license can be obtained from the following URL: http://ficl.sourceforge.net/license.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+OPTIONS_DEFINE=	DOCS
+
 MAKE_JOBS_UNSAFE=	YES
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -27,17 +29,20 @@ PLIST_FILES=	bin/${PORTNAME} lib/lib${PO
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.a ${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so.${PORTVERSION} ${PREFIX}/lib
-	cd ${PREFIX}/lib && ${LN} -sf lib${PORTNAME}.so.${PORTVERSION} lib${PORTNAME}.so
-.if !defined(NOPORTDOCS)
-	${INSTALL_DATA} -d -m 0755 ${DOCSDIR} ${DOCSDIR}/articles ${DOCSDIR}/graphics
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.ico ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/articles/* ${DOCSDIR}/articles
-	${INSTALL_DATA} ${WRKSRC}/doc/graphics/* ${DOCSDIR}/graphics
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
+	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${PORTNAME}.so.${PORTVERSION} lib${PORTNAME}.so
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/articles ${STAGEDIR}${DOCSDIR}/graphics; \
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.ico ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/articles/* ${STAGEDIR}${DOCSDIR}/articles
+	${INSTALL_DATA} ${WRKSRC}/doc/graphics/* ${STAGEDIR}${DOCSDIR}/graphics
 .endif
 
 .include <bsd.port.mk>

Added: head/lang/ficl/files/patch-primitives.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ficl/files/patch-primitives.c	Sun Jan  5 15:43:27 2014	(r338787)
@@ -0,0 +1,20 @@
+--- primitives.c.orig	2014-01-05 15:25:11.000000000 +0400
++++ primitives.c	2014-01-05 16:00:30.000000000 +0400
+@@ -487,7 +487,7 @@
+ 
+ 	ficlStackPushPointer(vm->dataStack, bufferStart);
+ 	ficlStackPushInteger(vm->dataStack, buffer - bufferStart);
+-	ficlStackPushInteger(vm->dataStack, append && FICL_TRUE);
++	ficlStackPushInteger(vm->dataStack, FICL_BOOL(!append));
+ }
+ 
+ 
+@@ -1350,7 +1350,7 @@
+ 
+ static void ficlPrimitiveIsObject(ficlVm *vm)
+ {
+-    int flag;
++    ficlInteger flag;
+     ficlWord *word = (ficlWord *)ficlStackPopPointer(vm->dataStack);
+     
+     flag = ((word != NULL) && (word->flags & FICL_WORD_OBJECT)) ? FICL_TRUE : FICL_FALSE;