Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Dec 2016 09:00:43 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427547 - in head/lang/whitespace: . files
Message-ID:  <201612020900.uB290hFx014387@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Dec  2 09:00:43 2016
New Revision: 427547
URL: https://svnweb.freebsd.org/changeset/ports/427547

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers
  - Regenerate patches

Modified:
  head/lang/whitespace/Makefile
  head/lang/whitespace/files/patch-Makefile
  head/lang/whitespace/files/patch-VM.hs
  head/lang/whitespace/files/patch-main.hs

Modified: head/lang/whitespace/Makefile
==============================================================================
--- head/lang/whitespace/Makefile	Fri Dec  2 08:58:10 2016	(r427546)
+++ head/lang/whitespace/Makefile	Fri Dec  2 09:00:43 2016	(r427547)
@@ -11,7 +11,8 @@ DISTNAME=	wspace-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interpreter for the Whitespace programming language
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	ghc:lang/ghc
 LIB_DEPENDS=	libgmp.so:math/gmp \
@@ -19,20 +20,24 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 
 USES=		perl5 gmake tar:tgz
 USE_PERL5=	build
-WRKSRC=	${WRKDIR}/WSpace
+WRKSRC=		${WRKDIR}/WSpace
 ALL_TARGET=	${TARGET}
 
 PLIST_FILES=	bin/wspace
 PORTEXAMPLES=	*
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wspace ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/tutorial.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/lang/whitespace/files/patch-Makefile
==============================================================================
--- head/lang/whitespace/files/patch-Makefile	Fri Dec  2 08:58:10 2016	(r427546)
+++ head/lang/whitespace/files/patch-Makefile	Fri Dec  2 09:00:43 2016	(r427547)
@@ -1,6 +1,6 @@
---- Makefile.orig	2003-03-31 14:39:29.000000000 +0200
-+++ Makefile	2011-03-26 12:58:40.517004812 +0100
-@@ -2,13 +2,12 @@
+--- Makefile.orig	2003-03-31 12:39:29 UTC
++++ Makefile
+@@ -2,13 +2,12 @@ GHC = ghc
  GHCI = ghci
  
  SRCS = main.hs Input.hs VM.hs Tokens.hs
@@ -17,7 +17,7 @@
  
  ghci: 
  	${GHCI} ${OPTS} main.hs
-@@ -19,21 +18,3 @@
+@@ -19,21 +18,3 @@ depend:
  clean:
  	rm -f ${TARGET} ${OBJS}
  	rm -f *~ *.hi

Modified: head/lang/whitespace/files/patch-VM.hs
==============================================================================
--- head/lang/whitespace/files/patch-VM.hs	Fri Dec  2 08:58:10 2016	(r427546)
+++ head/lang/whitespace/files/patch-VM.hs	Fri Dec  2 09:00:43 2016	(r427547)
@@ -1,5 +1,5 @@
---- ./VM.hs.orig	2004-05-04 19:10:41.000000000 +0200
-+++ ./VM.hs	2012-05-12 21:52:19.000000000 +0200
+--- VM.hs.orig	2004-05-04 17:10:41 UTC
++++ VM.hs
 @@ -1,6 +1,6 @@
  module VM where
  

Modified: head/lang/whitespace/files/patch-main.hs
==============================================================================
--- head/lang/whitespace/files/patch-main.hs	Fri Dec  2 08:58:10 2016	(r427546)
+++ head/lang/whitespace/files/patch-main.hs	Fri Dec  2 09:00:43 2016	(r427547)
@@ -1,6 +1,6 @@
---- ./main.hs.orig	2003-03-31 17:33:44.000000000 +0200
-+++ ./main.hs	2012-05-12 21:52:07.000000000 +0200
-@@ -26,7 +26,7 @@
+--- main.hs.orig	2003-03-31 15:33:44 UTC
++++ main.hs
+@@ -26,7 +26,7 @@ import Input
  import VM
  import Tokens
  



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