From owner-svn-ports-all@FreeBSD.ORG Mon Apr 14 20:14:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2716192; Mon, 14 Apr 2014 20:14:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 072401620; Mon, 14 Apr 2014 20:14:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3EKE20T017221; Mon, 14 Apr 2014 20:14:02 GMT (envelope-from xmj@svn.freebsd.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3EKE2hV017214; Mon, 14 Apr 2014 20:14:02 GMT (envelope-from xmj@svn.freebsd.org) Message-Id: <201404142014.s3EKE2hV017214@svn.freebsd.org> From: Johannes Jost Meixner Date: Mon, 14 Apr 2014 20:14:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351286 - in head: . security security/cfv security/cfv/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.17 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, 14 Apr 2014 20:14:03 -0000 Author: xmj Date: Mon Apr 14 20:14:01 2014 New Revision: 351286 URL: http://svnweb.freebsd.org/changeset/ports/351286 QAT: https://qat.redports.org/buildarchive/r351286/ Log: security/cfv: Resurrection, stage, assign maintainer - Resurrection - Assign maintainer to matthew@reztek.cz - Stagify PR: ports/188584 PR: ports/188564 Submitted by: Matthew Rezny Approved by: swills (mentor) Added: head/security/cfv/ - copied from r350853, head/security/cfv/ Modified: head/MOVED head/security/Makefile head/security/cfv/Makefile head/security/cfv/files/patch-Makefile head/security/cfv/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Mon Apr 14 20:09:06 2014 (r351285) +++ head/MOVED Mon Apr 14 20:14:01 2014 (r351286) @@ -5992,7 +5992,6 @@ graphics/svg2swf||2014-04-13|Has expired devel/flick||2014-04-13|Has expired: Unmaintained since 2001 mail/smail||2014-04-13|Has expired: Unmaintained since 2001 net/net-http||2014-04-13|Has expired: Unmaintained since 2001 -security/cfv||2014-04-13|Has expired: Unmaintained since 2001 graphics/camediaplay||2014-04-13|Has expired: Unmaintained since 2001 math/umatrix||2014-04-13|Has expired: Unmaintained since 2001 lang/f77||2014-04-13|Has expired: Unmaintained since 2001 Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Mon Apr 14 20:09:06 2014 (r351285) +++ head/security/Makefile Mon Apr 14 20:14:01 2014 (r351286) @@ -54,6 +54,7 @@ SUBDIR += ccrypt SUBDIR += ccsrch SUBDIR += cfs + SUBDIR += cfv SUBDIR += chaosreader SUBDIR += checkpassword SUBDIR += checkpassword-pam Modified: head/security/cfv/Makefile ============================================================================== --- head/security/cfv/Makefile Thu Apr 10 20:57:50 2014 (r350853) +++ head/security/cfv/Makefile Mon Apr 14 20:14:01 2014 (r351286) @@ -6,20 +6,16 @@ PORTVERSION= 1.18.3 CATEGORIES= security MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= matthew@reztek.cz COMMENT= Utility to both test and create .sfv, .csv, and md5sum files -DEPRECATED= Unmaintained since 2001 -EXPIRATION_DATE= 2014-04-12 USE_PYTHON= 2 ALL_TARGET= cfv.wrapper INSTALL_TARGET= install-wrapper MAKE_ARGS= PYTHON=${PYTHON_CMD} -MAN1= cfv.1 - -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s,%%SITELIBDIR%%,${PYTHON_SITELIBDIR},g" \ + -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/Makefile .include Modified: head/security/cfv/files/patch-Makefile ============================================================================== --- head/security/cfv/files/patch-Makefile Thu Apr 10 20:57:50 2014 (r350853) +++ head/security/cfv/files/patch-Makefile Mon Apr 14 20:14:01 2014 (r351286) @@ -1,9 +1,37 @@ --- Makefile.orig Fri Dec 7 17:01:19 2001 +++ Makefile Fri Dec 7 17:01:56 2001 -@@ -1,5 +1,5 @@ +@@ -1,10 +1,7 @@ PYTHON=python -prefix=/usr/local +prefix=%%PREFIX%% exec_prefix=${prefix} +- +-#finds the site-packages dir that matches the selected prefix, or if none do, falls back to wherever it can find one.. +-pkgdir=`$(PYTHON) -c 'import sys,re; x=filter(lambda x: re.match("$(prefix).*site-packages",x),sys.path); y=filter(lambda y: re.search("site-packages",y),sys.path); x.sort(lambda x,y: cmp(len(x),len(y))); y.sort(lambda x,y: cmp(len(x),len(y))); x.extend(y); print x[0]'` +-#nice little expression, huh? ;) ++pkgdir=%%SITELIBDIR%% - #finds the site-packages dir that matches the selected prefix, or if none do, falls back to wherever it can find one.. + bindir=${exec_prefix}/bin + mandir=${prefix}/man +@@ -39,16 +36,16 @@ + cfv.wrapper: + $(PYTHON) -c 'import string,os; py=filter(lambda x: os.path.isfile(x),map(lambda x: os.path.join(x,"$(PYTHON)"),string.split(os.environ["PATH"],":"))); py.append(" /usr/bin/env $(PYTHON)"); open("cfv.wrapper","w").write("#!%s\nimport cfv\ncfv.main()\n"%py[0])' + +-$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(bindir): ++$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdir): + $(install_dir) $@ + +-install-wrapper-only: $(DESTDIR)$(bindir) cfv.wrapper install_man ++install-wrapper-only: $(DESTDIR)$(pkgdir) $(DESTDIR)$(bindir) cfv.wrapper + $(install_data) cfv $(DESTDIR)$(pkgdir)/cfv.py + $(install_script) cfv.wrapper $(DESTDIR)$(bindir)/cfv + +-install-wrapper: install-wrapper-only +- $(PYTHON) -c "import py_compile; py_compile.compile('$(DESTDIR)$(pkgdir)/cfv.py')" +- $(PYTHON) -O -c "import py_compile; py_compile.compile('$(DESTDIR)$(pkgdir)/cfv.py')" ++install-wrapper: install-wrapper-only install_man ++ $(PYTHON) -m compileall -d $(pkgdir) -l $(DESTDIR)$(pkgdir) ++ $(PYTHON) -O -m compileall -d $(pkgdir) -l $(DESTDIR)$(pkgdir) + + install: $(DESTDIR)$(bindir) install_man + $(install_script) cfv $(DESTDIR)$(bindir)/cfv Modified: head/security/cfv/pkg-plist ============================================================================== --- head/security/cfv/pkg-plist Thu Apr 10 20:57:50 2014 (r350853) +++ head/security/cfv/pkg-plist Mon Apr 14 20:14:01 2014 (r351286) @@ -2,3 +2,4 @@ bin/cfv %%PYTHON_SITELIBDIR%%/cfv.py %%PYTHON_SITELIBDIR%%/cfv.pyc %%PYTHON_SITELIBDIR%%/cfv.pyo +man/man1/cfv.1.gz