From owner-svn-ports-all@freebsd.org Mon Apr 10 11:35:14 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65288D36ACA; Mon, 10 Apr 2017 11:35:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 178FAFE2; Mon, 10 Apr 2017 11:35:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3ABZDYs098436; Mon, 10 Apr 2017 11:35:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3ABZDCD098434; Mon, 10 Apr 2017 11:35:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201704101135.v3ABZDCD098434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 10 Apr 2017 11:35:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438147 - in head/textproc/antiword: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2017 11:35:14 -0000 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 - -.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, }