From owner-svn-ports-head@freebsd.org Tue Apr 5 16:27:15 2016 Return-Path: Delivered-To: svn-ports-head@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 656A7B0477A; Tue, 5 Apr 2016 16:27:15 +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 252F4158D; Tue, 5 Apr 2016 16:27:15 +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 u35GREls062988; Tue, 5 Apr 2016 16:27:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u35GRD0K062984; Tue, 5 Apr 2016 16:27:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604051627.u35GRD0K062984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 5 Apr 2016 16:27:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412568 - in head/mail/annoyance-filter: . 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-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2016 16:27:15 -0000 Author: amdmi3 Date: Tue Apr 5 16:27:13 2016 New Revision: 412568 URL: https://svnweb.freebsd.org/changeset/ports/412568 Log: - Add LICENSE - Switch to options helpers - Regenerate patches with `make makepatch` Deleted: head/mail/annoyance-filter/pkg-plist Modified: head/mail/annoyance-filter/Makefile head/mail/annoyance-filter/files/patch-Makefile.in head/mail/annoyance-filter/files/patch-annoyance-filter.cc head/mail/annoyance-filter/files/patch-statlib_test.cc Modified: head/mail/annoyance-filter/Makefile ============================================================================== --- head/mail/annoyance-filter/Makefile Tue Apr 5 15:56:55 2016 (r412567) +++ head/mail/annoyance-filter/Makefile Tue Apr 5 16:27:13 2016 (r412568) @@ -11,12 +11,19 @@ MASTER_SITES= SF/annoyancefilter/annoyan MAINTAINER= ports@FreeBSD.org COMMENT= Adaptive Bayesian Junk Mail Filter +LICENSE= PD GPLv2+ +LICENSE_COMB= multi +LICENSE_FILE_PD= ${WRKSRC}/COPYING +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.GNU + USE_GCC= yes GNU_CONFIGURE= yes -DOCS= COPYING INSTALL README *.pdf +PORTDOCS= INSTALL README *.pdf -CFLAGS= ${CPPFLAGS} +PLIST_FILES= bin/annoyance-filter \ + bin/annoyance-filter-run \ + man/man1/annoyance-filter.1.gz OPTIONS_DEFINE= DOCS @@ -24,7 +31,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-run ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/mail/annoyance-filter/files/patch-Makefile.in ============================================================================== --- head/mail/annoyance-filter/files/patch-Makefile.in Tue Apr 5 15:56:55 2016 (r412567) +++ head/mail/annoyance-filter/files/patch-Makefile.in Tue Apr 5 16:27:13 2016 (r412568) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Feb 18 15:57:20 2003 -+++ Makefile.in Fri Jan 2 02:56:16 2004 -@@ -83,11 +83,11 @@ +--- Makefile.in.orig 2004-08-04 14:42:56 UTC ++++ Makefile.in +@@ -83,11 +83,11 @@ ipmpar.o: DCDFlib/src/ipmpar.c # Annoyance filter program @@ -15,7 +15,7 @@ $(PRODUCT).cc: $(PRODUCT).w $(PRODUCT).tex: $(PRODUCT).w log.w $(TOOLS) $(PRODUCT).view: $(PRODUCT).dvi -@@ -97,8 +97,8 @@ +@@ -97,8 +97,8 @@ getopt1.o: getopt1.c getopt.h # Statistical library @@ -26,11 +26,10 @@ statlib.o: statlib.cc config.h getopt.h statlib.cc: statlib.w -@@ -275,14 +275,6 @@ - groff -man $(PRODUCT).1 | lp +@@ -276,14 +276,6 @@ printman: $(PRODUCT).1 # HTML edition of manual page -- + -$(PRODUCT)_man_raw.html: $(PRODUCT).1 - $(MAN2HTML) -H $(MAN2HTMLHOST) $(PRODUCT).1 \ - >$(PRODUCT)_man_raw.html @@ -38,6 +37,7 @@ -$(PRODUCT)_man.html: $(PRODUCT)_man_raw.html - $(PERL) docutil/fixman2html.pl $(PRODUCT)_man_raw.html \ - >$(PRODUCT)_man.html - +- manhtml: $(PRODUCT)_man.html + # Test it Modified: head/mail/annoyance-filter/files/patch-annoyance-filter.cc ============================================================================== --- head/mail/annoyance-filter/files/patch-annoyance-filter.cc Tue Apr 5 15:56:55 2016 (r412567) +++ head/mail/annoyance-filter/files/patch-annoyance-filter.cc Tue Apr 5 16:27:13 2016 (r412568) @@ -1,6 +1,6 @@ ---- annoyance-filter.cc.orig 2004-08-04 16:28:36.000000000 -0400 -+++ annoyance-filter.cc 2014-10-08 12:04:20.000000000 -0400 -@@ -114,7 +114,7 @@ +--- annoyance-filter.cc.orig 2004-08-04 20:28:36 UTC ++++ annoyance-filter.cc +@@ -114,7 +114,7 @@ using namespace std; #define __GNU_LIBRARY__ #undef __GETOPT_H__ #endif @@ -9,7 +9,7 @@ #include "statlib.h" /*237:*/ -@@ -2675,7 +2675,7 @@ +@@ -2675,7 +2675,7 @@ return false; fileLength= lseek(fileHandle,0,2); lseek(fileHandle,0,0); dp= static_cast (mmap((caddr_t)0,fileLength, @@ -18,7 +18,7 @@ fileHandle,0)); istrstream is(dp,fileLength); #else -@@ -7332,7 +7332,7 @@ +@@ -7332,7 +7332,7 @@ return 1; long fileLength= lseek(fileHandle,0,2); lseek(fileHandle,0,0); char*dp= static_cast (mmap((caddr_t)0,fileLength, Modified: head/mail/annoyance-filter/files/patch-statlib_test.cc ============================================================================== --- head/mail/annoyance-filter/files/patch-statlib_test.cc Tue Apr 5 15:56:55 2016 (r412567) +++ head/mail/annoyance-filter/files/patch-statlib_test.cc Tue Apr 5 16:27:13 2016 (r412568) @@ -1,6 +1,6 @@ ---- statlib_test.cc.orig Thu Sep 25 02:02:10 2003 -+++ statlib_test.cc Fri Jan 2 02:51:57 2004 -@@ -28,7 +28,7 @@ +--- statlib_test.cc.orig 2004-08-04 12:28:53 UTC ++++ statlib_test.cc +@@ -28,7 +28,7 @@ using namespace std; #include #endif #else