From owner-svn-ports-head@freebsd.org Sun Jul 9 10:13:50 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC9C5DAF52F; Sun, 9 Jul 2017 10:13:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8315A7FBF6; Sun, 9 Jul 2017 10:13:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v69ADnYB029030; Sun, 9 Jul 2017 10:13:49 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v69ADnGE029028; Sun, 9 Jul 2017 10:13:49 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201707091013.v69ADnGE029028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 9 Jul 2017 10:13:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445400 - in head/deskutils/calibre: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/deskutils/calibre: . files X-SVN-Commit-Revision: 445400 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jul 2017 10:13:50 -0000 Author: madpilot Date: Sun Jul 9 10:13:49 2017 New Revision: 445400 URL: https://svnweb.freebsd.org/changeset/ports/445400 Log: - Fix python shebangs [1] While here: - Remove unneeded include bsd.port.pre/post.mk - Use PREFIX and LOCALBASE substitutions in startup script PR: 220574 [1] Submitted by: Igor Pavlov Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/files/calibre.in Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Sun Jul 9 10:07:37 2017 (r445399) +++ head/deskutils/calibre/Makefile Sun Jul 9 10:13:49 2017 (r445400) @@ -3,6 +3,7 @@ PORTNAME= calibre PORTVERSION= 3.3.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ @@ -50,10 +51,9 @@ EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \ python:2 pyqt:5 shared-mime-info shebangfix ssl tar:xz -SHEBANG_FILES= resources/calibre-portable.sh \ - src/calibre/ebooks/metadata/odt.py \ - src/calibre/utils/*.py \ - src/odf/*.py +SHEBANG_GLOB= *.sh *.py +python_OLD_CMD= "/usr/bin/env python" /bin/python /usr/bin/python /usr/local/bin/python \ + "/usr/bin/env python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2 USE_PYQT= core gui network sip svg webkit widgets webkitwidgets xmlpatterns USE_QT5= buildtools_build core dbus gui qmake_build widgets USE_GL= egl gl @@ -73,7 +73,9 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig XDG_UTILS_INSTALL_MODE=system \ QMAKE=${QMAKE} -.include +post-patch: + @${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \ + ${WRKSRC}/setup/install.py do-build: @${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config @@ -96,4 +98,4 @@ do-install: @${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/* -.include +.include Modified: head/deskutils/calibre/files/calibre.in ============================================================================== --- head/deskutils/calibre/files/calibre.in Sun Jul 9 10:07:37 2017 (r445399) +++ head/deskutils/calibre/files/calibre.in Sun Jul 9 10:13:49 2017 (r445400) @@ -43,8 +43,8 @@ load_rc_config $name : ${calibre_logsize:=10} pidfile=/var/run/${name}/${name}.pid -command=/usr/local/bin/calibre-server -command_interpreter=python2 +command=%%PREFIX%%/bin/calibre-server +command_interpreter=%%LOCALBASE%%/bin/python2.7 required_dirs=${calibre_library} start_precmd=calibre_prestart