cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update cdiff-1.0 to ydiff-1.2 (it has been renamed upstream) and switch to py3

Browse Source
This commit is contained in:
sthen 2021-02-28 13:46:58 +00:00
parent 2afb40ea2f
commit f1b65c2a0a
5 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1206 2021/02/27 17:49:20 daniel Exp $
# $OpenBSD: Makefile,v 1.1207 2021/02/28 13:46:58 sthen Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.593
PKGNAME = quirks-3.594
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1220 2021/02/27 17:49:20 daniel Exp $
# $OpenBSD: Quirks.pm,v 1.1221 2021/02/28 13:46:59 sthen Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -590,6 +590,7 @@ my $stem_extensions = {
'py-pygal' => 'py3-pygal',
'py-wtforms' => 'py3-wtforms',
'py-apsw' => 'py3-apsw',
'cdiff' => 'ydiff',
};
my $obsolete_reason = {

32
textproc/cdiff/Makefile
View File

@ -1,32 +1,36 @@
# $OpenBSD: Makefile,v 1.6 2021/02/23 19:39:44 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2021/02/28 13:46:59 sthen Exp $
COMMENT= inline and side-by-side colored and incremental diff
COMMENT= inline and side-by-side colored and incremental diff
MODPY_EGG_VERSION= 1.0
DISTNAME= cdiff-${MODPY_EGG_VERSION}
# was renamed cdiff->ydiff
MODPY_EGG_VERSION= 1.2
DISTNAME= ydiff-${MODPY_EGG_VERSION}
CATEGORIES= textproc
CATEGORIES= textproc
HOMEPAGE= https://github.com/ymattw/cdiff
HOMEPAGE= https://github.com/ymattw/ydiff
# BSD
PERMIT_PACKAGE= Yes
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODULES= lang/python
MODPY_PI= Yes
MODPY_PI= Yes
TEST_DEPENDS= devel/git \
devel/py-coverage \
textproc/py-docutils
TEST_DEPENDS= devel/git \
devel/py-codestyle${MODPY_FLAVOR} \
devel/py-coverage${MODPY_FLAVOR} \
shells/bash \
textproc/py-docutils${MODPY_FLAVOR}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdiff
${INSTALL_DATA} ${WRKSRC}/README.rst ${PREFIX}/share/doc/cdiff/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ydiff
${INSTALL_DATA} ${WRKSRC}/README.rst ${PREFIX}/share/doc/ydiff/
pre-test:
ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
ln -sf ${LOCALBASE}/bin/rst2html ${WRKDIR}/bin/rst2html.py
ln -sf ${LOCALBASE}/bin/pycodestyle ${WRKDIR}/bin/pep8
ln -sf ${LOCALBASE}/bin/coverage-${MODPY_VERSION} ${WRKDIR}/bin/coverage
.include <bsd.port.mk>

4
textproc/cdiff/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cdiff-1.0.tar.gz) = +lNIvfVjVis4ZAfX/oFeUMvYD+eMbAjGuYghNhMJQdM=
SIZE (cdiff-1.0.tar.gz) = 33599
SHA256 (ydiff-1.2.tar.gz) = 9UMFd+zTCXTXZu6bgzPgbcdqlHtKrjbTlhKgeHhloSE=
SIZE (ydiff-1.2.tar.gz) = 42808

16
textproc/cdiff/pkg/PLIST
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/04/29 12:01:32 ajacoutot Exp $
@conflict colordiff-*
bin/cdiff
lib/python${MODPY_VERSION}/site-packages/cdiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/cdiff.py
lib/python${MODPY_VERSION}/site-packages/cdiff.pyc
share/doc/cdiff/
share/doc/cdiff/README.rst
@comment $OpenBSD: PLIST,v 1.2 2021/02/28 13:46:59 sthen Exp $
bin/ydiff
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ydiff.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ydiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/ydiff.py
share/doc/ydiff/
share/doc/ydiff/README.rst