Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Sep 2014 17:40:11 +0000 (UTC)
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368667 - in head/devel/eric4: . files
Message-ID:  <201409201740.s8KHeBsS021112@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bsam
Date: Sat Sep 20 17:40:11 2014
New Revision: 368667
URL: http://svnweb.freebsd.org/changeset/ports/368667
QAT: https://qat.redports.org/buildarchive/r368667/

Log:
  devel/eric4: remove conflicts with future eric5 port
  
  . rename eric.png to eric4.png;
  . claim using puthon v.2 only.

Modified:
  head/devel/eric4/Makefile
  head/devel/eric4/Makefile.inc
  head/devel/eric4/files/eric4.desktop.in
  head/devel/eric4/pkg-plist

Modified: head/devel/eric4/Makefile
==============================================================================
--- head/devel/eric4/Makefile	Sat Sep 20 17:25:14 2014	(r368666)
+++ head/devel/eric4/Makefile	Sat Sep 20 17:40:11 2014	(r368667)
@@ -1,7 +1,7 @@
 # Created by: Boris Samorodov <bsam@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
@@ -32,7 +32,7 @@ do-configure:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/eric4.desktop ${STAGEDIR}${PREFIX}/share/applications/
-	${LN} -sf ${DATADIR}/icons/default/eric.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+	${LN} -sf ${DATADIR}/icons/default/eric.png ${STAGEDIR}${PREFIX}/share/pixmaps/eric4.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
 
 .include "${.CURDIR}/../../devel/eric4/Makefile.inc"

Modified: head/devel/eric4/Makefile.inc
==============================================================================
--- head/devel/eric4/Makefile.inc	Sat Sep 20 17:25:14 2014	(r368666)
+++ head/devel/eric4/Makefile.inc	Sat Sep 20 17:40:11 2014	(r368667)
@@ -22,7 +22,7 @@ I18N_LANG?=	ru
 INSTALL_CMD?=	install-i18n.py -p ${STAGEDIR}
 MAKE_ENV+=	"HOME=${WRKDIR}"
 
-USE_PYTHON=	yes
+USES+=		python:2
 NO_BUILD=	yes
 PLIST_FILES?=	%%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm
 EXTRA_PATCHES?=	${.CURDIR}/../../devel/eric4/files/extra-patch-install-i18n.py

Modified: head/devel/eric4/files/eric4.desktop.in
==============================================================================
--- head/devel/eric4/files/eric4.desktop.in	Sat Sep 20 17:25:14 2014	(r368666)
+++ head/devel/eric4/files/eric4.desktop.in	Sat Sep 20 17:40:11 2014	(r368667)
@@ -4,7 +4,7 @@ GenericName=Python and Ruby IDE
 Comment=Full featured Python and Ruby editor and IDE based on Qt4
 Type=Application
 Exec=eric4
-Icon=eric
+Icon=eric4
 MimeType=application/x-python;application/x-eric;
 Categories=Development;TextEditor;Qt;Application;
 Terminal=false

Modified: head/devel/eric4/pkg-plist
==============================================================================
--- head/devel/eric4/pkg-plist	Sat Sep 20 17:25:14 2014	(r368666)
+++ head/devel/eric4/pkg-plist	Sat Sep 20 17:40:11 2014	(r368667)
@@ -3025,7 +3025,7 @@ share/applications/eric4.desktop
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modpython_dbg.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rhallo.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rhallo.pyc
-share/pixmaps/eric.png
+share/pixmaps/eric4.png
 share/qt4/qsci/api/python/eric4.api
 share/qt4/qsci/api/python/zope-2.10.7.api
 share/qt4/qsci/api/python/zope-2.11.2.api



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409201740.s8KHeBsS021112>