Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1468178873260140"
MIME-Version: 1.0
Date: Sun, 10 Jul 2016 19:27:53 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/misc/calibre
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20160710192753.0D790FBB5@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1468178873260140
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sun Jul 10 19:27:52 UTC 2016

Modified Files:
	pkgsrc/misc/calibre: Makefile

Log Message:
Fixed pkglint warnings.

Mainly renamed FIX_PYTHON_PATHS to FIX_PYTHON_FILES, since it is a list
of files and not related to the PATH variable; pkglint relies on this
naming convention.


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 pkgsrc/misc/calibre/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1468178873260140
Content-Disposition: inline
Content-Length: 2187
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.148 pkgsrc/misc/calibre/Makefile:1.149
--- pkgsrc/misc/calibre/Makefile:1.148	Sat Jul  9 13:03:56 2016
+++ pkgsrc/misc/calibre/Makefile	Sun Jul 10 19:27:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2016/07/09 13:03:56 wiz Exp $
+# $NetBSD: Makefile,v 1.149 2016/07/10 19:27:52 rillig Exp $
 
 DISTNAME=	calibre-2.62.0
 CATEGORIES=	misc
@@ -35,29 +35,29 @@ DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:..
 # dateutil>=1.4.1
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 
-EXTRACT_USING=  bsdtar
+EXTRACT_USING=	bsdtar
 
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config pax
+USE_LANGUAGES=			c c++
+USE_LIBTOOL=			yes
+USE_TOOLS+=			pkg-config pax
 PYTHON_VERSIONS_ACCEPTED=	27
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
-PYDISTUTILSPKG=	yes
-PYSETUPOPTARGS=	# empty
-PYSETUPINSTALLARGS=	--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
+PYDISTUTILSPKG=			yes
+PYSETUPOPTARGS=			# empty
+PYSETUPINSTALLARGS=		--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
 
 INSTALLATION_DIRS=	share/applications
 INSTALLATION_DIRS=	share/icons
 INSTALLATION_DIRS=	share/calibre/recipes
 
-FIX_PYTHON_PATHS+=	*.py
-FIX_PYTHON_PATHS+=	recipes/*.recipe
-FIX_PYTHON_PATHS+=	*/*.py
-FIX_PYTHON_PATHS+=	*/*/*.py
-FIX_PYTHON_PATHS+=	*/*/*/*.py
-FIX_PYTHON_PATHS+=	*/*/*/*/*.py
-FIX_PYTHON_PATHS+=	*/*/*/*/*/*.py
-FIX_PYTHON_PATHS+=	*/*/*/*/*/*/*.py
+FIX_PYTHON_FILES+=	*.py
+FIX_PYTHON_FILES+=	recipes/*.recipe
+FIX_PYTHON_FILES+=	*/*.py
+FIX_PYTHON_FILES+=	*/*/*.py
+FIX_PYTHON_FILES+=	*/*/*/*.py
+FIX_PYTHON_FILES+=	*/*/*/*/*.py
+FIX_PYTHON_FILES+=	*/*/*/*/*/*.py
+FIX_PYTHON_FILES+=	*/*/*/*/*/*/*.py
 
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt5/bin/qmake',"
@@ -70,7 +70,7 @@ SUBST_CLASSES+=		path
 SUBST_SED.path=		-e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
 SUBST_MESSAGE.path=	Fixing path to python.
 SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	${FIX_PYTHON_PATHS}
+SUBST_FILES.path=	${FIX_PYTHON_FILES}
 
 REPLACE_BASH+=		resources/calibre-portable.sh
 

--_----------=_1468178873260140--