From owner-svn-ports-head@freebsd.org Sun Jan 17 12:46:44 2016 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 80242A8670E; Sun, 17 Jan 2016 12:46:44 +0000 (UTC) (envelope-from pawel@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 374BD1BB2; Sun, 17 Jan 2016 12:46:44 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HCkhCQ090694; Sun, 17 Jan 2016 12:46:43 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HCkhk6090693; Sun, 17 Jan 2016 12:46:43 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601171246.u0HCkhk6090693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 17 Jan 2016 12:46:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406312 - head/games/pysolfc X-SVN-Group: ports-head 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.20 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, 17 Jan 2016 12:46:44 -0000 Author: pawel Date: Sun Jan 17 12:46:43 2016 New Revision: 406312 URL: https://svnweb.freebsd.org/changeset/ports/406312 Log: - Remove deprecated @dirrm - Add NO_ARCH - Convert to options helpers Approved by: portmgr blanket Modified: head/games/pysolfc/Makefile Modified: head/games/pysolfc/Makefile ============================================================================== --- head/games/pysolfc/Makefile Sun Jan 17 12:45:50 2016 (r406311) +++ head/games/pysolfc/Makefile Sun Jan 17 12:46:43 2016 (r406312) @@ -19,6 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkin USES= python tar:bzip2 USE_PYTHON= autoplist distutils +NO_ARCH= yes PLIST_FILES= share/pixmaps/pysolfc.png DATADIR= ${PREFIX}/share/PySolFC @@ -37,26 +38,25 @@ OPTIONS_SUB= yes CARDSETS_DISTFILES= PySolFC-Cardsets-${DISTVERSION}${EXTRACT_SUFX}:cardsets NLS_USES= gettext -.include - post-patch: @${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc @${REINPLACE_CMD} -e 's|pysol.py|pysolfc|' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|^Icon.*|Icon=${PORTNAME}|' \ -e 's|^Exec.*|Exec=${PORTNAME}|' \ ${WRKSRC}/data/pysol.desktop -.if ! ${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} -e "s|for l in ('ru', 'ru_RU')|for l in ()|" \ - ${WRKSRC}/setup.py -.endif @${FIND} ${WRKDIR} -name .thumbnails -or -name .xvpics | \ ${XARGS} ${RM} -rf @${FIND} ${WRKSRC} -name "*.bak" -delete +post-patch-NLS-off: + @${REINPLACE_CMD} -e "s|for l in ('ru', 'ru_RU')|for l in ()|" \ + ${WRKSRC}/setup.py + post-install: ${LN} -s ${PREFIX}/share/icons/pysol01.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png -.if ${PORT_OPTIONS:MCARDSETS} + +post-install-CARDSETS-on: .for cdir in ${CARDSET_DUPS} @${RM} -rf ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION}/cardset-${cdir} .endfor @@ -64,10 +64,8 @@ post-install: ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR} @cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \ ${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST} - @cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \ - ${FIND} . -type d -mindepth 1 | ${SORT} -r | \ - ${SED} -e 's|^./|@dirrm ${DATADIR_REL}/|' >> ${TMPPLIST} -.endif + +post-install-DOCS-on: @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/