Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Apr 2017 11:35:13 +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: r438147 - in head/textproc/antiword: . files
Message-ID:  <201704101135.v3ABZDCD098434@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Apr 10 11:35:12 2017
New Revision: 438147
URL: https://svnweb.freebsd.org/changeset/ports/438147

Log:
  - Fix LICENSE
  - Don't install COPYING with docs
  - Switch to options helpers

Modified:
  head/textproc/antiword/Makefile
  head/textproc/antiword/files/patch-wordole.c

Modified: head/textproc/antiword/Makefile
==============================================================================
--- head/textproc/antiword/Makefile	Mon Apr 10 11:34:48 2017	(r438146)
+++ head/textproc/antiword/Makefile	Mon Apr 10 11:35:12 2017	(r438147)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.winfield.demon.
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application for displaying Microsoft(R) Word documents
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Docs/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:print/gsfonts
@@ -23,18 +23,13 @@ SHEBANG_FILES=	kantiword Unix-only/fonti
 MAKE_JOBS_UNSAFE=yes
 INSTALL_TARGET=	global_install
 
-PORTDOCS=	COPYING ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \
+PORTDOCS=	ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \
 		QandA ReadMe antiword.1 antiword.man antiword.php testdoc.doc
 
-OPTIONS_DEFINE=	DEBUG
+OPTIONS_DEFINE=	DOCS DEBUG
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+=	-DDEBUG
-.else
-CFLAGS+=	-DNDEBUG
-.endif
+DEBUG_CFLAGS=		-DDEBUG
+DEBUG_CFLAGS_OFF=	-DNDEBUG
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,/usr/share,${LOCALBASE}/share,g; s,fonts2,fonts,' ${WRKSRC}/Unix-only/fontinfo.pl
@@ -43,6 +38,8 @@ post-patch:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/Docs && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 

Modified: head/textproc/antiword/files/patch-wordole.c
==============================================================================
--- head/textproc/antiword/files/patch-wordole.c	Mon Apr 10 11:34:48 2017	(r438146)
+++ head/textproc/antiword/files/patch-wordole.c	Mon Apr 10 11:35:12 2017	(r438147)
@@ -1,4 +1,4 @@
---- wordole.c
+--- wordole.c.orig	2005-08-26 19:49:57 UTC
 +++ wordole.c
 @@ -259,6 +259,11 @@ bGetPPS(FILE *pFile,
  		}



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