Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Sep 2018 15:34:18 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478795 - head/textproc/ml1
Message-ID:  <201809021534.w82FYIrd059022@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sun Sep  2 15:34:17 2018
New Revision: 478795
URL: https://svnweb.freebsd.org/changeset/ports/478795

Log:
  textproc/ml1: upgrade to 4.12 and fix for amd64
  
  PR:		231095
  Submitted by:	bob@eager.cx (maintainer)

Added:
  head/textproc/ml1/pkg-plist   (contents, props changed)
Modified:
  head/textproc/ml1/Makefile   (contents, props changed)
  head/textproc/ml1/distinfo   (contents, props changed)
  head/textproc/ml1/pkg-message   (contents, props changed)

Modified: head/textproc/ml1/Makefile
==============================================================================
--- head/textproc/ml1/Makefile	Sun Sep  2 15:04:40 2018	(r478794)
+++ head/textproc/ml1/Makefile	Sun Sep  2 15:34:17 2018	(r478795)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ml1
-PORTVERSION=	4.11
+PORTVERSION=	4.12
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ml1.org.uk/distfiles/ \
 		http://www.ancientgeek.org.uk/distfiles/
@@ -12,11 +12,25 @@ COMMENT=	Original general purpose macro processor
 
 LICENSE=	BSD3CLAUSE
 
-PLIST_FILES=	bin/ml1 man/man1/ml1.1.gz
+OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ${ARCH} == amd64
+		@${REINPLACE_CMD} \
+		-e '/^#define	FBSD32/s/1/0/' \
+		-e '/^#define	FBSD64/s/0/1/'\
+		 ${WRKSRC}/ml1.h
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ml1 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ml1.1.gz \
 		${STAGEDIR}${MANPREFIX}/man/man1
 
-.include <bsd.port.mk>
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
+.include <bsd.port.post.mk>

Modified: head/textproc/ml1/distinfo
==============================================================================
--- head/textproc/ml1/distinfo	Sun Sep  2 15:04:40 2018	(r478794)
+++ head/textproc/ml1/distinfo	Sun Sep  2 15:34:17 2018	(r478795)
@@ -1,2 +1,3 @@
-SHA256 (ml1-4.11.tar.gz) = d52cf77df8340f944f9cfa7d3ed37d37f19ac648db86feceda2175c915d1615d
-SIZE (ml1-4.11.tar.gz) = 37706
+TIMESTAMP = 1535887237
+SHA256 (ml1-4.12.tar.gz) = 69d7d80b8f72f031412ac17e12ca54d8d962f6a297cbb9ca104594666678ad52
+SIZE (ml1-4.12.tar.gz) = 587730

Modified: head/textproc/ml1/pkg-message
==============================================================================
--- head/textproc/ml1/pkg-message	Sun Sep  2 15:04:40 2018	(r478794)
+++ head/textproc/ml1/pkg-message	Sun Sep  2 15:34:17 2018	(r478795)
@@ -1,7 +1,2 @@
-================================================================================
-
-	ML/I documentation (in HTML and PDF) can be found at:
-
-		http://www.ml1.org.uk
-
-================================================================================
+Additional ML/I documentation (in HTML and PDF) can be found at:
+	http://www.ml1.org.uk

Added: head/textproc/ml1/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/ml1/pkg-plist	Sun Sep  2 15:34:17 2018	(r478795)
@@ -0,0 +1,6 @@
+bin/ml1
+man/man1/ml1.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ml1sig.pdf
+%%PORTDOCS%%%%DOCSDIR%%/ml1tut.pdf
+%%PORTDOCS%%%%DOCSDIR%%/ml1user.pdf



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