Created
February 28, 2018 04:35
-
-
Save nonakap/2cd48060d660a63356d4a8716cb1b2ec to your computer and use it in GitHub Desktop.
pkgsrc/devel/talloc: resolve conflict with samba-4.6.8nb4.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| devel/talloc: resolve conflict with samba-4.6.8nb4. | |
| Bump PKGREVISION. | |
| Index: devel/talloc/Makefile | |
| =================================================================== | |
| RCS file: /cvsroot/pkgsrc/devel/talloc/Makefile,v | |
| retrieving revision 1.23 | |
| diff -u -p -r1.23 Makefile | |
| --- devel/talloc/Makefile 28 Jan 2018 16:41:33 -0000 1.23 | |
| +++ devel/talloc/Makefile 28 Feb 2018 04:32:38 -0000 | |
| @@ -1,6 +1,7 @@ | |
| # $NetBSD: Makefile,v 1.23 2018/01/28 16:41:33 wiz Exp $ | |
| DISTNAME= talloc-2.1.11 | |
| +PKGREVISION= 1 | |
| CATEGORIES= devel | |
| MASTER_SITES= http://www.samba.org/ftp/talloc/ | |
| @@ -20,7 +21,7 @@ PY_PATCHPLIST= yes | |
| PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.1.0 | |
| # include/talloc.h | |
| -CONFLICTS+= samba-[0-9]* | |
| +CONFLICTS+= samba<=4.6.8nb3 | |
| REPLACE_PYTHON+= buildtools/bin/waf | |
| REPLACE_PYTHON+= buildtools/wafsamba/__init__.py |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment