Attachment 141705 Details for Bug 188584 – security_cfv_patch.txt

security_cfv_patch.txt

security_cfv_patch.txt (text/plain; charset="UTF-8"), 3.30 KB, created by Matthew Rezny on 2014-04-14 19:07:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2014-04-14 19:07:13 UTC

Size: 3.30 KB

patch

obsolete

>Index: security/cfv/Makefile
>===================================================================
>--- security/cfv/Makefile	(revision 350650)
>+++ security/cfv/Makefile	(working copy)
>@@ -6,20 +6,16 @@
> 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 <bsd.port.mk>
>Index: security/cfv/files/patch-Makefile
>===================================================================
>--- security/cfv/files/patch-Makefile	(revision 350650)
>+++ security/cfv/files/patch-Makefile	(working copy)
>@@ -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
>Index: security/cfv/pkg-plist
>===================================================================
>--- security/cfv/pkg-plist	(revision 350650)
>+++ security/cfv/pkg-plist	(working copy)
>@@ -2,3 +2,4 @@
> %%PYTHON_SITELIBDIR%%/cfv.py
> %%PYTHON_SITELIBDIR%%/cfv.pyc
> %%PYTHON_SITELIBDIR%%/cfv.pyo
>+man/man1/cfv.1.gz

Actions: View

Attachments on bug 188584: 141703 | 141704 | 141705